New upstream version 0.25.0upstream/0.25.0

106 files changed, 36443 insertions, 32564 deletions

diff --git a/src/AppDirs.c b/src/AppDirs.c
index 5112938..74a188b 100644
--- a/src/AppDirs.c
+++ b/src/AppDirs.c
@@ -394,11 +394,11 @@ void app_dirs_try_migrate_data (void) {
 #line 44 "/home/jens/Source/shotwell/src/AppDirs.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 397 "AppDirs.c"
-				goto __catch432_g_error;
+				goto __catch445_g_error;
 			}
 		}
-		goto __finally432;
-		__catch432_g_error:
+		goto __finally445;
+		__catch445_g_error:
 		{
 			GError* err = NULL;
 #line 43 "/home/jens/Source/shotwell/src/AppDirs.vala"
@@ -409,7 +409,7 @@ void app_dirs_try_migrate_data (void) {
 			_g_error_free0 (err);
 #line 411 "AppDirs.c"
 		}
-		__finally432:
+		__finally445:
 #line 43 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 43 "/home/jens/Source/shotwell/src/AppDirs.vala"
@@ -437,11 +437,11 @@ void app_dirs_try_migrate_data (void) {
 #line 49 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 440 "AppDirs.c"
-			goto __catch433_g_error;
+			goto __catch446_g_error;
 		}
 	}
-	goto __finally433;
-	__catch433_g_error:
+	goto __finally446;
+	__catch446_g_error:
 	{
 		GError* err = NULL;
 #line 48 "/home/jens/Source/shotwell/src/AppDirs.vala"
@@ -452,7 +452,7 @@ void app_dirs_try_migrate_data (void) {
 		_g_error_free0 (err);
 #line 454 "AppDirs.c"
 	}
-	__finally433:
+	__finally446:
 #line 48 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 48 "/home/jens/Source/shotwell/src/AppDirs.vala"
@@ -539,11 +539,11 @@ void app_dirs_try_migrate_data (void) {
 #line 62 "/home/jens/Source/shotwell/src/AppDirs.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 542 "AppDirs.c"
-				goto __catch434_g_error;
+				goto __catch447_g_error;
 			}
 		}
-		goto __finally434;
-		__catch434_g_error:
+		goto __finally447;
+		__catch447_g_error:
 		{
 			GError* err = NULL;
 			const gchar* _tmp35_ = NULL;
@@ -584,7 +584,7 @@ void app_dirs_try_migrate_data (void) {
 			_g_error_free0 (err);
 #line 586 "AppDirs.c"
 		}
-		__finally434:
+		__finally447:
 #line 61 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 61 "/home/jens/Source/shotwell/src/AppDirs.vala"
@@ -666,11 +666,11 @@ void app_dirs_try_migrate_data (void) {
 #line 72 "/home/jens/Source/shotwell/src/AppDirs.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 669 "AppDirs.c"
-				goto __catch435_g_error;
+				goto __catch448_g_error;
 			}
 		}
-		goto __finally435;
-		__catch435_g_error:
+		goto __finally448;
+		__catch448_g_error:
 		{
 			GError* err = NULL;
 			const gchar* _tmp61_ = NULL;
@@ -719,7 +719,7 @@ void app_dirs_try_migrate_data (void) {
 			_g_error_free0 (err);
 #line 721 "AppDirs.c"
 		}
-		__finally435:
+		__finally448:
 #line 71 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 71 "/home/jens/Source/shotwell/src/AppDirs.vala"
@@ -895,12 +895,12 @@ void app_dirs_verify_data_dir (void) {
 #line 102 "/home/jens/Source/shotwell/src/AppDirs.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 898 "AppDirs.c"
-				goto __catch436_g_error;
+				goto __catch449_g_error;
 			}
 		}
 	}
-	goto __finally436;
-	__catch436_g_error:
+	goto __finally449;
+	__catch449_g_error:
 	{
 		GError* err = NULL;
 		const gchar* _tmp4_ = NULL;
@@ -941,7 +941,7 @@ void app_dirs_verify_data_dir (void) {
 		_g_error_free0 (err);
 #line 943 "AppDirs.c"
 	}
-	__finally436:
+	__finally449:
 #line 100 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 100 "/home/jens/Source/shotwell/src/AppDirs.vala"
@@ -987,12 +987,12 @@ void app_dirs_verify_cache_dir (void) {
 #line 113 "/home/jens/Source/shotwell/src/AppDirs.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 990 "AppDirs.c"
-				goto __catch437_g_error;
+				goto __catch450_g_error;
 			}
 		}
 	}
-	goto __finally437;
-	__catch437_g_error:
+	goto __finally450;
+	__catch450_g_error:
 	{
 		GError* err = NULL;
 		const gchar* _tmp4_ = NULL;
@@ -1033,7 +1033,7 @@ void app_dirs_verify_cache_dir (void) {
 		_g_error_free0 (err);
 #line 1035 "AppDirs.c"
 	}
-	__finally437:
+	__finally450:
 #line 111 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 111 "/home/jens/Source/shotwell/src/AppDirs.vala"
@@ -1591,12 +1591,12 @@ GFile* app_dirs_get_temp_dir (void) {
 #line 204 "/home/jens/Source/shotwell/src/AppDirs.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1594 "AppDirs.c"
-					goto __catch438_g_error;
+					goto __catch451_g_error;
 				}
 			}
 		}
-		goto __finally438;
-		__catch438_g_error:
+		goto __finally451;
+		__catch451_g_error:
 		{
 			GError* err = NULL;
 			const gchar* _tmp9_ = NULL;
@@ -1637,7 +1637,7 @@ GFile* app_dirs_get_temp_dir (void) {
 			_g_error_free0 (err);
 #line 1639 "AppDirs.c"
 		}
-		__finally438:
+		__finally451:
 #line 202 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 202 "/home/jens/Source/shotwell/src/AppDirs.vala"
@@ -1725,12 +1725,12 @@ GFile* app_dirs_get_data_subdir (const gchar* name, const gchar* subname) {
 #line 221 "/home/jens/Source/shotwell/src/AppDirs.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1728 "AppDirs.c"
-				goto __catch439_g_error;
+				goto __catch452_g_error;
 			}
 		}
 	}
-	goto __finally439;
-	__catch439_g_error:
+	goto __finally452;
+	__catch452_g_error:
 	{
 		GError* err = NULL;
 		const gchar* _tmp12_ = NULL;
@@ -1771,7 +1771,7 @@ GFile* app_dirs_get_data_subdir (const gchar* name, const gchar* subname) {
 		_g_error_free0 (err);
 #line 1773 "AppDirs.c"
 	}
-	__finally439:
+	__finally452:
 #line 219 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 219 "/home/jens/Source/shotwell/src/AppDirs.vala"
@@ -1825,7 +1825,7 @@ void app_dirs_ensure_writable (GFile* dir) {
 #line 233 "/home/jens/Source/shotwell/src/AppDirs.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1828 "AppDirs.c"
-				goto __catch440_g_error;
+				goto __catch453_g_error;
 			}
 #line 234 "/home/jens/Source/shotwell/src/AppDirs.vala"
 			_tmp4_ = info;
@@ -1846,7 +1846,7 @@ void app_dirs_ensure_writable (GFile* dir) {
 #line 235 "/home/jens/Source/shotwell/src/AppDirs.vala"
 				_g_object_unref0 (info);
 #line 1849 "AppDirs.c"
-				goto __catch440_g_error;
+				goto __catch453_g_error;
 			}
 #line 235 "/home/jens/Source/shotwell/src/AppDirs.vala"
 			if (!_tmp6_) {
@@ -1881,8 +1881,8 @@ void app_dirs_ensure_writable (GFile* dir) {
 			_g_object_unref0 (info);
 #line 1883 "AppDirs.c"
 		}
-		goto __finally440;
-		__catch440_g_error:
+		goto __finally453;
+		__catch453_g_error:
 		{
 			GError* err = NULL;
 			const gchar* _tmp16_ = NULL;
@@ -1923,7 +1923,7 @@ void app_dirs_ensure_writable (GFile* dir) {
 			_g_error_free0 (err);
 #line 1925 "AppDirs.c"
 		}
-		__finally440:
+		__finally453:
 #line 232 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 232 "/home/jens/Source/shotwell/src/AppDirs.vala"
@@ -2008,12 +2008,12 @@ GFile* app_dirs_get_cache_subdir (const gchar* name, const gchar* subname) {
 #line 252 "/home/jens/Source/shotwell/src/AppDirs.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 2011 "AppDirs.c"
-				goto __catch441_g_error;
+				goto __catch454_g_error;
 			}
 		}
 	}
-	goto __finally441;
-	__catch441_g_error:
+	goto __finally454;
+	__catch454_g_error:
 	{
 		GError* err = NULL;
 		const gchar* _tmp13_ = NULL;
@@ -2054,7 +2054,7 @@ GFile* app_dirs_get_cache_subdir (const gchar* name, const gchar* subname) {
 		_g_error_free0 (err);
 #line 2056 "AppDirs.c"
 	}
-	__finally441:
+	__finally454:
 #line 250 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 250 "/home/jens/Source/shotwell/src/AppDirs.vala"
diff --git a/src/AppWindow.c b/src/AppWindow.c
index 0c84f41..eda3ce5 100644
--- a/src/AppWindow.c
+++ b/src/AppWindow.c
@@ -759,11 +759,11 @@ FullscreenWindow* fullscreen_window_construct (GType object_type, Page* page) {
 #line 28 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 734 "AppWindow.c"
-			goto __catch211_g_error;
+			goto __catch224_g_error;
 		}
 	}
-	goto __finally211;
-	__catch211_g_error:
+	goto __finally224;
+	__catch224_g_error:
 	{
 		GError* err = NULL;
 		gchar* _tmp5_ = NULL;
@@ -787,7 +787,7 @@ FullscreenWindow* fullscreen_window_construct (GType object_type, Page* page) {
 		_g_error_free0 (err);
 #line 761 "AppWindow.c"
 	}
-	__finally211:
+	__finally224:
 #line 27 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 27 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -2717,11 +2717,11 @@ AppWindow* app_window_construct (GType object_type) {
 #line 462 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 2692 "AppWindow.c"
-			goto __catch212_g_error;
+			goto __catch225_g_error;
 		}
 	}
-	goto __finally212;
-	__catch212_g_error:
+	goto __finally225;
+	__catch225_g_error:
 	{
 		GError* err = NULL;
 		const gchar* _tmp28_ = NULL;
@@ -2737,7 +2737,7 @@ AppWindow* app_window_construct (GType object_type) {
 		_g_error_free0 (err);
 #line 2711 "AppWindow.c"
 	}
-	__finally212:
+	__finally225:
 #line 461 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 461 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -2770,7 +2770,7 @@ AppWindow* app_window_construct (GType object_type) {
 #line 472 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 2745 "AppWindow.c"
-			goto __catch213_g_error;
+			goto __catch226_g_error;
 		}
 #line 473 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp33_ = gdk_screen_get_default ();
@@ -2778,8 +2778,8 @@ AppWindow* app_window_construct (GType object_type) {
 		gtk_style_context_add_provider_for_screen (_tmp33_, G_TYPE_CHECK_INSTANCE_CAST (provider, GTK_TYPE_STYLE_PROVIDER, GtkStyleProvider), (guint) GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
 #line 2752 "AppWindow.c"
 	}
-	goto __finally213;
-	__catch213_g_error:
+	goto __finally226;
+	__catch226_g_error:
 	{
 		GError* err = NULL;
 		GError* _tmp34_ = NULL;
@@ -2798,7 +2798,7 @@ AppWindow* app_window_construct (GType object_type) {
 		_g_error_free0 (err);
 #line 2772 "AppWindow.c"
 	}
-	__finally213:
+	__finally226:
 #line 471 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 471 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -3276,7 +3276,7 @@ static GtkActionEntry* app_window_create_common_actions (AppWindow* self, int* r
 #line 507 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	help_report_problem = _tmp18_;
 #line 509 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp19_ = _ ("_Report a Problem...");
+	_tmp19_ = _ ("_Report a Problem…");
 #line 509 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	help_report_problem.label = _tmp19_;
 #line 510 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -3540,11 +3540,11 @@ GtkBuilder* app_window_create_builder (const gchar* glade_filename, void* user)
 #line 556 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 3515 "AppWindow.c"
-			goto __catch214_g_error;
+			goto __catch227_g_error;
 		}
 	}
-	goto __finally214;
-	__catch214_g_error:
+	goto __finally227;
+	__catch227_g_error:
 	{
 		GError* _error_ = NULL;
 		GError* _tmp10_ = NULL;
@@ -3563,7 +3563,7 @@ GtkBuilder* app_window_create_builder (const gchar* glade_filename, void* user)
 		_g_error_free0 (_error_);
 #line 3537 "AppWindow.c"
 	}
-	__finally214:
+	__finally227:
 #line 555 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 555 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -4166,8 +4166,8 @@ void app_window_database_error (GError* err) {
 	gchar* _tmp3_ = NULL;
 	gchar* _tmp4_ = NULL;
 #line 656 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp0_ = _ ("A fatal error occurred when accessing Shotwell's library.  Shotwell ca" \
-"nnot continue.\n" \
+	_tmp0_ = _ ("A fatal error occurred when accessing Shotwell’s library. Shotwell can" \
+"not continue.\n" \
 "\n" \
 "%s");
 #line 656 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -4276,11 +4276,11 @@ static void app_window_on_help_contents (AppWindow* self) {
 #line 686 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 4248 "AppWindow.c"
-			goto __catch215_g_error;
+			goto __catch228_g_error;
 		}
 	}
-	goto __finally215;
-	__catch215_g_error:
+	goto __finally228;
+	__catch228_g_error:
 	{
 		GError* err = NULL;
 		const gchar* _tmp1_ = NULL;
@@ -4310,7 +4310,7 @@ static void app_window_on_help_contents (AppWindow* self) {
 		_g_error_free0 (err);
 #line 4281 "AppWindow.c"
 	}
-	__finally215:
+	__finally228:
 #line 685 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 685 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -4335,11 +4335,11 @@ static void app_window_on_help_report_problem (AppWindow* self) {
 #line 694 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 4307 "AppWindow.c"
-			goto __catch216_g_error;
+			goto __catch229_g_error;
 		}
 	}
-	goto __finally216;
-	__catch216_g_error:
+	goto __finally229;
+	__catch229_g_error:
 	{
 		GError* err = NULL;
 		const gchar* _tmp0_ = NULL;
@@ -4369,7 +4369,7 @@ static void app_window_on_help_report_problem (AppWindow* self) {
 		_g_error_free0 (err);
 #line 4340 "AppWindow.c"
 	}
-	__finally216:
+	__finally229:
 #line 693 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 693 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -4394,11 +4394,11 @@ static void app_window_on_help_faq (AppWindow* self) {
 #line 702 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 4366 "AppWindow.c"
-			goto __catch217_g_error;
+			goto __catch230_g_error;
 		}
 	}
-	goto __finally217;
-	__catch217_g_error:
+	goto __finally230;
+	__catch230_g_error:
 	{
 		GError* err = NULL;
 		const gchar* _tmp0_ = NULL;
@@ -4428,7 +4428,7 @@ static void app_window_on_help_faq (AppWindow* self) {
 		_g_error_free0 (err);
 #line 4399 "AppWindow.c"
 	}
-	__finally217:
+	__finally230:
 #line 701 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 701 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -4576,11 +4576,11 @@ void app_window_on_jump_to_file (AppWindow* self) {
 #line 722 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 4548 "AppWindow.c"
-			goto __catch218_g_error;
+			goto __catch231_g_error;
 		}
 	}
-	goto __finally218;
-	__catch218_g_error:
+	goto __finally231;
+	__catch231_g_error:
 	{
 		GError* err = NULL;
 		GError* _tmp21_ = NULL;
@@ -4604,7 +4604,7 @@ void app_window_on_jump_to_file (AppWindow* self) {
 		_g_error_free0 (err);
 #line 4575 "AppWindow.c"
 	}
-	__finally218:
+	__finally231:
 #line 721 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 721 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -4674,7 +4674,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 4646 "AppWindow.c"
-				goto __catch219_g_regex_error;
+				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);
@@ -4699,7 +4699,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 4671 "AppWindow.c"
-				goto __catch219_g_regex_error;
+				goto __catch232_g_regex_error;
 			}
 #line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			_g_regex_unref0 (regex);
@@ -4725,8 +4725,8 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		return result;
 #line 4696 "AppWindow.c"
 	}
-	goto __finally219;
-	__catch219_g_regex_error:
+	goto __finally232;
+	__catch232_g_regex_error:
 	{
 		GError* e = NULL;
 #line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -4739,7 +4739,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		_g_error_free0 (e);
 #line 4710 "AppWindow.c"
 	}
-	__finally219:
+	__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"
diff --git a/src/AppWindow.vala b/src/AppWindow.vala
index b979d9e..0103300 100644
--- a/src/AppWindow.vala
+++ b/src/AppWindow.vala
@@ -506,7 +506,7 @@ public abstract class AppWindow : PageWindow {
         
         Gtk.ActionEntry help_report_problem = { "CommonHelpReportProblem", null, TRANSLATABLE, null, 
             TRANSLATABLE, on_help_report_problem };
-        help_report_problem.label = _("_Report a Problem...");
+        help_report_problem.label = _("_Report a Problem…");
         actions += help_report_problem;
 
         Gtk.ActionEntry undo = { "CommonUndo", Resources.UNDO_MENU, TRANSLATABLE, "<Ctrl>Z",
@@ -653,7 +653,7 @@ public abstract class AppWindow : PageWindow {
     }
     
     public static void database_error(DatabaseError err) {
-        panic(_("A fatal error occurred when accessing Shotwell's library.  Shotwell cannot continue.\n\n%s").printf(
+        panic(_("A fatal error occurred when accessing Shotwell’s library. Shotwell cannot continue.\n\n%s").printf(
             err.message));
     }
     
diff --git a/src/Application.c b/src/Application.c
index c0dcecf..45b19e4 100644
--- a/src/Application.c
+++ b/src/Application.c
@@ -237,11 +237,11 @@ static Application* application_construct (GType object_type, gboolean is_direct
 #line 53 "/home/jens/Source/shotwell/src/Application.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 240 "Application.c"
-			goto __catch547_g_error;
+			goto __catch560_g_error;
 		}
 	}
-	goto __finally547;
-	__catch547_g_error:
+	goto __finally560;
+	__catch560_g_error:
 	{
 		GError* e = NULL;
 #line 52 "/home/jens/Source/shotwell/src/Application.vala"
@@ -254,7 +254,7 @@ static Application* application_construct (GType object_type, gboolean is_direct
 		_g_error_free0 (e);
 #line 256 "Application.c"
 	}
-	__finally547:
+	__finally560:
 #line 52 "/home/jens/Source/shotwell/src/Application.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 52 "/home/jens/Source/shotwell/src/Application.vala"
diff --git a/src/BatchImport.c b/src/BatchImport.c
index 33f0fff..9a5e5bc 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 __catch397_g_error;
+					goto __catch410_g_error;
 				}
 #line 557 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				filesize = _tmp11_;
 #line 5778 "BatchImport.c"
 			}
-			goto __finally397;
-			__catch397_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"
 			}
-			__finally397:
+			__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 __catch398_g_error;
+						goto __catch411_g_error;
 					}
 				}
-				goto __finally398;
-				__catch398_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"
 				}
-				__finally398:
+				__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 __catch399_g_error;
+					goto __catch412_g_error;
 				}
 			}
-			goto __finally399;
-			__catch399_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"
 			}
-			__finally399:
+			__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 __catch400_g_error;
+					goto __catch413_g_error;
 				}
 			}
-			goto __finally400;
-			__catch400_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"
 			}
-			__finally400:
+			__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 __catch401_g_error;
+				goto __catch414_g_error;
 			}
 		}
-		goto __finally401;
-		__catch401_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"
 		}
-		__finally401:
+		__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 __catch402_g_error;
+					goto __catch415_g_error;
 				}
 			}
-			goto __finally402;
-			__catch402_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"
 			}
-			__finally402:
+			__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 __catch403_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 __finally403;
-	__catch403_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"
 	}
-	__finally403:
+	__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 __catch404_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 __finally404;
-	__catch404_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"
 	}
-	__finally404:
+	__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 __catch405_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 __finally405;
-		__catch405_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"
 		}
-		__finally405:
+		__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 __catch406_g_error;
+			goto __catch419_g_error;
 		}
 #line 1850 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		filesize = _tmp69_;
 #line 15374 "BatchImport.c"
 	}
-	goto __finally406;
-	__catch406_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"
 	}
-	__finally406:
+	__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 __catch407_g_error;
+				goto __catch420_g_error;
 			}
 		}
-		goto __finally407;
-		__catch407_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"
 		}
-		__finally407:
+		__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 __catch408_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 __catch408_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 __finally408;
-		__catch408_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"
 		}
-		__finally408:
+		__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 __catch409_g_error;
+				goto __catch422_g_error;
 			}
 		}
-		goto __finally409;
-		__catch409_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"
 		}
-		__finally409:
+		__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 __catch410_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 __finally410;
-	__catch410_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"
 	}
-	__finally410:
+	__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/CheckerboardLayout.c b/src/CheckerboardLayout.c
index d73f031..005707b 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 __catch229_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 __catch229_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 __finally229;
-	__catch229_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"
 	}
-	__finally229:
+	__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 84e0b3f..b1e09ea 100644
--- a/src/CollectionPage.c
+++ b/src/CollectionPage.c
@@ -1149,12 +1149,12 @@ GtkActionEntry* page_init_collect_action_entries (Page* self, int* result_length
 #define TRANSLATABLE "translatable"
 static void collection_page_on_print (CollectionPage* self);
 static void _collection_page_on_print_gtk_action_callback (GtkAction* action, gpointer self);
-#define RESOURCES_PRINT_MENU _ ("_Print...")
+#define RESOURCES_PRINT_MENU _ ("_Print…")
 static void _vala_array_add171 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
 #define RESOURCES_PUBLISH "applications-internet"
 static void collection_page_on_publish (CollectionPage* self);
 static void _collection_page_on_publish_gtk_action_callback (GtkAction* action, gpointer self);
-#define RESOURCES_PUBLISH_MENU _ ("Pu_blish...")
+#define RESOURCES_PUBLISH_MENU _ ("Pu_blish…")
 #define RESOURCES_PUBLISH_TOOLTIP _ ("Publish to various websites")
 static void _vala_array_add172 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
 #define RESOURCES_CLOCKWISE "object-rotate-right"
@@ -1183,7 +1183,7 @@ static void _vala_array_add176 (GtkActionEntry** array, int* length, int* size,
 static void collection_page_on_enhance (CollectionPage* self);
 static void _collection_page_on_enhance_gtk_action_callback (GtkAction* action, gpointer self);
 #define RESOURCES_ENHANCE_MENU _ ("_Enhance")
-#define RESOURCES_ENHANCE_TOOLTIP _ ("Automatically improve the photo's appearance")
+#define RESOURCES_ENHANCE_TOOLTIP _ ("Automatically improve the photo’s appearance")
 static void _vala_array_add177 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
 void collection_page_on_copy_adjustments (CollectionPage* self);
 static void _collection_page_on_copy_adjustments_gtk_action_callback (GtkAction* action, gpointer self);
@@ -1211,7 +1211,7 @@ static void _collection_page_on_duplicate_photo_gtk_action_callback (GtkAction*
 static void _vala_array_add182 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
 static void collection_page_on_adjust_date_time (CollectionPage* self);
 static void _collection_page_on_adjust_date_time_gtk_action_callback (GtkAction* action, gpointer self);
-#define RESOURCES_ADJUST_DATE_TIME_MENU _ ("_Adjust Date and Time...")
+#define RESOURCES_ADJUST_DATE_TIME_MENU _ ("_Adjust Date and Time…")
 static void _vala_array_add183 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
 #define RESOURCES_EDIT_LABEL _ ("_Edit")
 static void collection_page_on_external_edit (CollectionPage* self);
@@ -1268,7 +1268,7 @@ static gboolean collection_page_can_revert_selected (CollectionPage* self);
 gboolean photo_has_color_adjustments (Photo* self);
 gboolean pixel_transformation_bundle_has_copied_color_adjustments (void);
 GtkAction* page_get_action (Page* self, const gchar* name);
-#define RESOURCES_SET_BACKGROUND_SLIDESHOW_MENU _ ("Set as _Desktop Slideshow...")
+#define RESOURCES_SET_BACKGROUND_SLIDESHOW_MENU _ ("Set as _Desktop Slideshow…")
 gboolean data_view_is_selected (DataView* self);
 gboolean alteration_has_subject (Alteration* self, const gchar* subject);
 GType library_photo_get_type (void) G_GNUC_CONST;
@@ -4710,7 +4710,7 @@ static void collection_page_real_on_export (MediaPage* base) {
 #line 494 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 4713 "CollectionPage.c"
-				goto __catch220_g_error;
+				goto __catch233_g_error;
 			}
 #line 497 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp76_ = app_window_get_instance ();
@@ -4722,8 +4722,8 @@ static void collection_page_real_on_export (MediaPage* base) {
 			_g_object_unref0 (_tmp77_);
 #line 4724 "CollectionPage.c"
 		}
-		goto __finally220;
-		__catch220_g_error:
+		goto __finally233;
+		__catch233_g_error:
 		{
 			GError* err = NULL;
 			AppWindow* _tmp78_ = NULL;
@@ -4749,7 +4749,7 @@ static void collection_page_real_on_export (MediaPage* base) {
 			_g_error_free0 (err);
 #line 4751 "CollectionPage.c"
 		}
-		__finally220:
+		__finally233:
 #line 492 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 492 "/home/jens/Source/shotwell/src/CollectionPage.vala"
@@ -6288,7 +6288,7 @@ static void collection_page_on_external_edit (CollectionPage* self) {
 #line 673 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 6291 "CollectionPage.c"
-			goto __catch221_g_error;
+			goto __catch234_g_error;
 		}
 #line 674 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp13_ = app_window_get_instance ();
@@ -6300,8 +6300,8 @@ static void collection_page_on_external_edit (CollectionPage* self) {
 		_g_object_unref0 (_tmp14_);
 #line 6302 "CollectionPage.c"
 	}
-	goto __finally221;
-	__catch221_g_error:
+	goto __finally234;
+	__catch234_g_error:
 	{
 		GError* err = NULL;
 		AppWindow* _tmp15_ = NULL;
@@ -6330,7 +6330,7 @@ static void collection_page_on_external_edit (CollectionPage* self) {
 		_g_error_free0 (err);
 #line 6332 "CollectionPage.c"
 	}
-	__finally221:
+	__finally234:
 #line 671 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 671 "/home/jens/Source/shotwell/src/CollectionPage.vala"
@@ -6433,7 +6433,7 @@ static void collection_page_on_external_edit_raw (CollectionPage* self) {
 #line 691 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 6436 "CollectionPage.c"
-			goto __catch222_g_error;
+			goto __catch235_g_error;
 		}
 #line 692 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp15_ = app_window_get_instance ();
@@ -6445,8 +6445,8 @@ static void collection_page_on_external_edit_raw (CollectionPage* self) {
 		_g_object_unref0 (_tmp16_);
 #line 6447 "CollectionPage.c"
 	}
-	goto __finally222;
-	__catch222_g_error:
+	goto __finally235;
+	__catch235_g_error:
 	{
 		GError* err = NULL;
 		AppWindow* _tmp17_ = NULL;
@@ -6480,7 +6480,7 @@ static void collection_page_on_external_edit_raw (CollectionPage* self) {
 		_g_error_free0 (err);
 #line 6482 "CollectionPage.c"
 	}
-	__finally222:
+	__finally235:
 #line 689 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 689 "/home/jens/Source/shotwell/src/CollectionPage.vala"
diff --git a/src/ColorTransformation.c b/src/ColorTransformation.c
index 245e71c..d4df675 100644
--- a/src/ColorTransformation.c
+++ b/src/ColorTransformation.c
@@ -146,6 +146,16 @@ typedef struct _SaturationTransformationClass SaturationTransformationClass;
 typedef struct _ExposureTransformation ExposureTransformation;
 typedef struct _ExposureTransformationClass ExposureTransformationClass;
 
+#define TYPE_CONTRAST_TRANSFORMATION (contrast_transformation_get_type ())
+#define CONTRAST_TRANSFORMATION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_CONTRAST_TRANSFORMATION, ContrastTransformation))
+#define CONTRAST_TRANSFORMATION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_CONTRAST_TRANSFORMATION, ContrastTransformationClass))
+#define IS_CONTRAST_TRANSFORMATION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_CONTRAST_TRANSFORMATION))
+#define IS_CONTRAST_TRANSFORMATION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_CONTRAST_TRANSFORMATION))
+#define CONTRAST_TRANSFORMATION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_CONTRAST_TRANSFORMATION, ContrastTransformationClass))
+
+typedef struct _ContrastTransformation ContrastTransformation;
+typedef struct _ContrastTransformationClass ContrastTransformationClass;
+
 #define TYPE_KEY_VALUE_MAP (key_value_map_get_type ())
 #define KEY_VALUE_MAP(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_KEY_VALUE_MAP, KeyValueMap))
 #define KEY_VALUE_MAP_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_KEY_VALUE_MAP, KeyValueMapClass))
@@ -177,6 +187,7 @@ typedef struct _TintTransformationPrivate TintTransformationPrivate;
 typedef struct _TemperatureTransformationPrivate TemperatureTransformationPrivate;
 typedef struct _SaturationTransformationPrivate SaturationTransformationPrivate;
 typedef struct _ExposureTransformationPrivate ExposureTransformationPrivate;
+typedef struct _ContrastTransformationPrivate ContrastTransformationPrivate;
 typedef struct _PixelTransformerPrivate PixelTransformerPrivate;
 typedef struct _ParamSpecPixelTransformer ParamSpecPixelTransformer;
 
@@ -254,7 +265,8 @@ typedef enum  {
 	PIXEL_TRANSFORMATION_TYPE_TEMPERATURE,
 	PIXEL_TRANSFORMATION_TYPE_TINT,
 	PIXEL_TRANSFORMATION_TYPE_SATURATION,
-	PIXEL_TRANSFORMATION_TYPE_EXPOSURE
+	PIXEL_TRANSFORMATION_TYPE_EXPOSURE,
+	PIXEL_TRANSFORMATION_TYPE_CONTRAST
 } PixelTransformationType;
 
 struct _PixelTransformationBundle {
@@ -376,6 +388,19 @@ struct _ExposureTransformationPrivate {
 	gfloat parameter;
 };
 
+struct _ContrastTransformation {
+	RGBTransformation parent_instance;
+	ContrastTransformationPrivate * priv;
+};
+
+struct _ContrastTransformationClass {
+	RGBTransformationClass parent_class;
+};
+
+struct _ContrastTransformationPrivate {
+	gfloat parameter;
+};
+
 struct _PixelTransformer {
 	GTypeInstance parent_instance;
 	volatile int ref_count;
@@ -543,6 +568,7 @@ static gpointer tint_transformation_parent_class = NULL;
 static gpointer temperature_transformation_parent_class = NULL;
 static gpointer saturation_transformation_parent_class = NULL;
 static gpointer exposure_transformation_parent_class = NULL;
+static gpointer contrast_transformation_parent_class = NULL;
 static gpointer pixel_transformer_parent_class = NULL;
 static gpointer rgb_histogram_parent_class = NULL;
 static gpointer intensity_histogram_parent_class = NULL;
@@ -628,6 +654,9 @@ GType saturation_transformation_get_type (void) G_GNUC_CONST;
 ExposureTransformation* exposure_transformation_new (gfloat client_parameter);
 ExposureTransformation* exposure_transformation_construct (GType object_type, gfloat client_parameter);
 GType exposure_transformation_get_type (void) G_GNUC_CONST;
+ContrastTransformation* contrast_transformation_new (gfloat client_parameter);
+ContrastTransformation* contrast_transformation_construct (GType object_type, gfloat client_parameter);
+GType contrast_transformation_get_type (void) G_GNUC_CONST;
 gpointer key_value_map_ref (gpointer instance);
 void key_value_map_unref (gpointer instance);
 GParamSpec* param_spec_key_value_map (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
@@ -653,6 +682,7 @@ gfloat temperature_transformation_get_parameter (TemperatureTransformation* self
 gfloat tint_transformation_get_parameter (TintTransformation* self);
 gfloat saturation_transformation_get_parameter (SaturationTransformation* self);
 gfloat exposure_transformation_get_parameter (ExposureTransformation* self);
+gfloat contrast_transformation_get_parameter (ContrastTransformation* self);
 gint pixel_transformation_bundle_get_count (PixelTransformationBundle* self);
 GeeIterable* pixel_transformation_bundle_get_transformations (PixelTransformationBundle* self);
 gboolean pixel_transformation_bundle_is_identity (PixelTransformationBundle* self);
@@ -740,6 +770,14 @@ enum  {
 #define EXPOSURE_TRANSFORMATION_MIN_PARAMETER (-16.0f)
 #define EXPOSURE_TRANSFORMATION_MAX_PARAMETER 16.0f
 static void exposure_transformation_finalize (PixelTransformation* obj);
+#define CONTRAST_TRANSFORMATION_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_CONTRAST_TRANSFORMATION, ContrastTransformationPrivate))
+enum  {
+	CONTRAST_TRANSFORMATION_DUMMY_PROPERTY
+};
+#define CONTRAST_TRANSFORMATION_MIN_PARAMETER (-16.0f)
+#define CONTRAST_TRANSFORMATION_MAX_PARAMETER 16.0f
+#define CONTRAST_TRANSFORMATION_MAX_CONTRAST_ADJUSTMENT 0.5f
+static void contrast_transformation_finalize (PixelTransformation* obj);
 #define PIXEL_TRANSFORMER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_PIXEL_TRANSFORMER, PixelTransformerPrivate))
 enum  {
 	PIXEL_TRANSFORMER_DUMMY_PROPERTY
@@ -871,7 +909,7 @@ void rgb_analytic_pixel_init (RGBAnalyticPixel *self) {
 	(*self).green = 0.0f;
 #line 17 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	(*self).blue = 0.0f;
-#line 875 "ColorTransformation.c"
+#line 913 "ColorTransformation.c"
 }
 
 
@@ -902,7 +940,7 @@ void rgb_analytic_pixel_init_from_components (RGBAnalyticPixel *self, gfloat red
 	_tmp5_ = CLAMP (_tmp4_, 0.0f, 1.0f);
 #line 24 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	(*self).blue = _tmp5_;
-#line 906 "ColorTransformation.c"
+#line 944 "ColorTransformation.c"
 }
 
 
@@ -924,7 +962,7 @@ void rgb_analytic_pixel_init_from_quantized_components (RGBAnalyticPixel *self,
 	_tmp2_ = blue_quantized;
 #line 31 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	(*self).blue = ((gfloat) _tmp2_) * RGB_ANALYTIC_PIXEL_INV_255;
-#line 928 "ColorTransformation.c"
+#line 966 "ColorTransformation.c"
 }
 
 
@@ -963,7 +1001,7 @@ void rgb_analytic_pixel_init_from_hsv (RGBAnalyticPixel *self, HSVAnalyticPixel*
 	_tmp6_ = _tmp5_.blue;
 #line 38 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	(*self).blue = _tmp6_;
-#line 967 "ColorTransformation.c"
+#line 1005 "ColorTransformation.c"
 }
 
 
@@ -976,7 +1014,7 @@ guchar rgb_analytic_pixel_quantized_red (RGBAnalyticPixel *self) {
 	result = (guchar) (_tmp0_ * 255.0f);
 #line 42 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return result;
-#line 980 "ColorTransformation.c"
+#line 1018 "ColorTransformation.c"
 }
 
 
@@ -989,7 +1027,7 @@ guchar rgb_analytic_pixel_quantized_green (RGBAnalyticPixel *self) {
 	result = (guchar) (_tmp0_ * 255.0f);
 #line 46 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return result;
-#line 993 "ColorTransformation.c"
+#line 1031 "ColorTransformation.c"
 }
 
 
@@ -1002,7 +1040,7 @@ guchar rgb_analytic_pixel_quantized_blue (RGBAnalyticPixel *self) {
 	result = (guchar) (_tmp0_ * 255.0f);
 #line 50 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return result;
-#line 1006 "ColorTransformation.c"
+#line 1044 "ColorTransformation.c"
 }
 
 
@@ -1021,7 +1059,7 @@ gboolean rgb_analytic_pixel_equals (RGBAnalyticPixel *self, RGBAnalyticPixel* rh
 	_tmp4_ = (*_tmp3_).red;
 #line 54 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (_tmp2_ == _tmp4_) {
-#line 1025 "ColorTransformation.c"
+#line 1063 "ColorTransformation.c"
 		gfloat _tmp5_ = 0.0F;
 		RGBAnalyticPixel* _tmp6_ = NULL;
 		gfloat _tmp7_ = 0.0F;
@@ -1033,15 +1071,15 @@ gboolean rgb_analytic_pixel_equals (RGBAnalyticPixel *self, RGBAnalyticPixel* rh
 		_tmp7_ = (*_tmp6_).green;
 #line 54 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp1_ = _tmp5_ == _tmp7_;
-#line 1037 "ColorTransformation.c"
+#line 1075 "ColorTransformation.c"
 	} else {
 #line 54 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp1_ = FALSE;
-#line 1041 "ColorTransformation.c"
+#line 1079 "ColorTransformation.c"
 	}
 #line 54 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (_tmp1_) {
-#line 1045 "ColorTransformation.c"
+#line 1083 "ColorTransformation.c"
 		gfloat _tmp8_ = 0.0F;
 		RGBAnalyticPixel* _tmp9_ = NULL;
 		gfloat _tmp10_ = 0.0F;
@@ -1053,17 +1091,17 @@ gboolean rgb_analytic_pixel_equals (RGBAnalyticPixel *self, RGBAnalyticPixel* rh
 		_tmp10_ = (*_tmp9_).blue;
 #line 54 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp0_ = _tmp8_ == _tmp10_;
-#line 1057 "ColorTransformation.c"
+#line 1095 "ColorTransformation.c"
 	} else {
 #line 54 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp0_ = FALSE;
-#line 1061 "ColorTransformation.c"
+#line 1099 "ColorTransformation.c"
 	}
 #line 54 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	result = _tmp0_;
 #line 54 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return result;
-#line 1067 "ColorTransformation.c"
+#line 1105 "ColorTransformation.c"
 }
 
 
@@ -1082,7 +1120,7 @@ guint rgb_analytic_pixel_hash_code (RGBAnalyticPixel *self) {
 	result = ((((guint) (_tmp0_ * 255.0f)) << 16) + (((guint) (_tmp1_ * 255.0f)) << 8)) + ((guint) (_tmp2_ * 255.0f));
 #line 58 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return result;
-#line 1086 "ColorTransformation.c"
+#line 1124 "ColorTransformation.c"
 }
 
 
@@ -1094,7 +1132,7 @@ void rgb_analytic_pixel_to_hsv (RGBAnalyticPixel *self, HSVAnalyticPixel* result
 	*result = _tmp0_;
 #line 63 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return;
-#line 1098 "ColorTransformation.c"
+#line 1136 "ColorTransformation.c"
 }
 
 
@@ -1106,14 +1144,14 @@ RGBAnalyticPixel* rgb_analytic_pixel_dup (const RGBAnalyticPixel* self) {
 	memcpy (dup, self, sizeof (RGBAnalyticPixel));
 #line 7 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return dup;
-#line 1110 "ColorTransformation.c"
+#line 1148 "ColorTransformation.c"
 }
 
 
 void rgb_analytic_pixel_free (RGBAnalyticPixel* self) {
 #line 7 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_free (self);
-#line 1117 "ColorTransformation.c"
+#line 1155 "ColorTransformation.c"
 }
 
 
@@ -1137,7 +1175,7 @@ void hsv_analytic_pixel_init (HSVAnalyticPixel *self) {
 	(*self).saturation = 0.0f;
 #line 77 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	(*self).light_value = 0.0f;
-#line 1141 "ColorTransformation.c"
+#line 1179 "ColorTransformation.c"
 }
 
 
@@ -1168,7 +1206,7 @@ void hsv_analytic_pixel_init_from_components (HSVAnalyticPixel *self, gfloat hue
 	_tmp5_ = CLAMP (_tmp4_, 0.0f, 1.0f);
 #line 84 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	(*self).light_value = _tmp5_;
-#line 1172 "ColorTransformation.c"
+#line 1210 "ColorTransformation.c"
 }
 
 
@@ -1190,7 +1228,7 @@ void hsv_analytic_pixel_init_from_quantized_components (HSVAnalyticPixel *self,
 	_tmp2_ = light_value_quantized;
 #line 91 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	(*self).light_value = ((gfloat) _tmp2_) * HSV_ANALYTIC_PIXEL_INV_255;
-#line 1194 "ColorTransformation.c"
+#line 1232 "ColorTransformation.c"
 }
 
 
@@ -1271,7 +1309,7 @@ void hsv_analytic_pixel_init_from_rgb (HSVAnalyticPixel *self, RGBAnalyticPixel*
 	_tmp18_ = max_component;
 #line 99 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (_tmp18_ != 0.0f) {
-#line 1275 "ColorTransformation.c"
+#line 1313 "ColorTransformation.c"
 		gfloat _tmp19_ = 0.0F;
 		gfloat _tmp20_ = 0.0F;
 		gfloat _tmp21_ = 0.0F;
@@ -1283,11 +1321,11 @@ void hsv_analytic_pixel_init_from_rgb (HSVAnalyticPixel *self, RGBAnalyticPixel*
 		_tmp21_ = max_component;
 #line 99 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp17_ = (_tmp19_ - _tmp20_) / _tmp21_;
-#line 1287 "ColorTransformation.c"
+#line 1325 "ColorTransformation.c"
 	} else {
 #line 100 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp17_ = 0.0f;
-#line 1291 "ColorTransformation.c"
+#line 1329 "ColorTransformation.c"
 	}
 #line 99 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	(*self).saturation = _tmp17_;
@@ -1297,7 +1335,7 @@ void hsv_analytic_pixel_init_from_rgb (HSVAnalyticPixel *self, RGBAnalyticPixel*
 	if (_tmp22_ == 0.0f) {
 #line 103 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		(*self).hue = 0.0f;
-#line 1301 "ColorTransformation.c"
+#line 1339 "ColorTransformation.c"
 	} else {
 		gfloat delta = 0.0F;
 		gfloat _tmp23_ = 0.0F;
@@ -1322,7 +1360,7 @@ void hsv_analytic_pixel_init_from_rgb (HSVAnalyticPixel *self, RGBAnalyticPixel*
 		_tmp27_ = max_component;
 #line 106 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		if (_tmp26_ == _tmp27_) {
-#line 1326 "ColorTransformation.c"
+#line 1364 "ColorTransformation.c"
 			RGBAnalyticPixel _tmp28_ = {0};
 			gfloat _tmp29_ = 0.0F;
 			RGBAnalyticPixel _tmp30_ = {0};
@@ -1340,7 +1378,7 @@ void hsv_analytic_pixel_init_from_rgb (HSVAnalyticPixel *self, RGBAnalyticPixel*
 			_tmp32_ = delta;
 #line 107 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			(*self).hue = (_tmp29_ - _tmp31_) / _tmp32_;
-#line 1344 "ColorTransformation.c"
+#line 1382 "ColorTransformation.c"
 		} else {
 			RGBAnalyticPixel _tmp33_ = {0};
 			gfloat _tmp34_ = 0.0F;
@@ -1353,7 +1391,7 @@ void hsv_analytic_pixel_init_from_rgb (HSVAnalyticPixel *self, RGBAnalyticPixel*
 			_tmp35_ = max_component;
 #line 108 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			if (_tmp34_ == _tmp35_) {
-#line 1357 "ColorTransformation.c"
+#line 1395 "ColorTransformation.c"
 				RGBAnalyticPixel _tmp36_ = {0};
 				gfloat _tmp37_ = 0.0F;
 				RGBAnalyticPixel _tmp38_ = {0};
@@ -1371,7 +1409,7 @@ void hsv_analytic_pixel_init_from_rgb (HSVAnalyticPixel *self, RGBAnalyticPixel*
 				_tmp40_ = delta;
 #line 109 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				(*self).hue = 2.0f + ((_tmp37_ - _tmp39_) / _tmp40_);
-#line 1375 "ColorTransformation.c"
+#line 1413 "ColorTransformation.c"
 			} else {
 				RGBAnalyticPixel _tmp41_ = {0};
 				gfloat _tmp42_ = 0.0F;
@@ -1384,7 +1422,7 @@ void hsv_analytic_pixel_init_from_rgb (HSVAnalyticPixel *self, RGBAnalyticPixel*
 				_tmp43_ = max_component;
 #line 110 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				if (_tmp42_ == _tmp43_) {
-#line 1388 "ColorTransformation.c"
+#line 1426 "ColorTransformation.c"
 					RGBAnalyticPixel _tmp44_ = {0};
 					gfloat _tmp45_ = 0.0F;
 					RGBAnalyticPixel _tmp46_ = {0};
@@ -1402,7 +1440,7 @@ void hsv_analytic_pixel_init_from_rgb (HSVAnalyticPixel *self, RGBAnalyticPixel*
 					_tmp48_ = delta;
 #line 111 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					(*self).hue = 4.0f + ((_tmp45_ - _tmp47_) / _tmp48_);
-#line 1406 "ColorTransformation.c"
+#line 1444 "ColorTransformation.c"
 				}
 			}
 		}
@@ -1414,19 +1452,19 @@ void hsv_analytic_pixel_init_from_rgb (HSVAnalyticPixel *self, RGBAnalyticPixel*
 		_tmp50_ = (*self).hue;
 #line 115 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		if (_tmp50_ < 0.0f) {
-#line 1418 "ColorTransformation.c"
+#line 1456 "ColorTransformation.c"
 			gfloat _tmp51_ = 0.0F;
 #line 116 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp51_ = (*self).hue;
 #line 116 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			(*self).hue = _tmp51_ + 360.0f;
-#line 1424 "ColorTransformation.c"
+#line 1462 "ColorTransformation.c"
 		}
 #line 118 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp52_ = (*self).hue;
 #line 118 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		(*self).hue = _tmp52_ / 360.0f;
-#line 1430 "ColorTransformation.c"
+#line 1468 "ColorTransformation.c"
 	}
 #line 121 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp53_ = (*self).hue;
@@ -1446,7 +1484,7 @@ void hsv_analytic_pixel_init_from_rgb (HSVAnalyticPixel *self, RGBAnalyticPixel*
 	_tmp58_ = CLAMP (_tmp57_, 0.0f, 1.0f);
 #line 123 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	(*self).light_value = _tmp58_;
-#line 1450 "ColorTransformation.c"
+#line 1488 "ColorTransformation.c"
 }
 
 
@@ -1459,7 +1497,7 @@ void hsv_analytic_pixel_to_rgb (HSVAnalyticPixel *self, RGBAnalyticPixel* result
 	_tmp0_ = (*self).saturation;
 #line 129 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (_tmp0_ == 0.0f) {
-#line 1463 "ColorTransformation.c"
+#line 1501 "ColorTransformation.c"
 		gfloat _tmp1_ = 0.0F;
 		gfloat _tmp2_ = 0.0F;
 		gfloat _tmp3_ = 0.0F;
@@ -1475,7 +1513,7 @@ void hsv_analytic_pixel_to_rgb (HSVAnalyticPixel *self, RGBAnalyticPixel* result
 		_tmp3_ = (*self).light_value;
 #line 132 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_result_.blue = _tmp3_;
-#line 1479 "ColorTransformation.c"
+#line 1517 "ColorTransformation.c"
 	} else {
 		gfloat hue_denorm = 0.0F;
 		gfloat _tmp4_ = 0.0F;
@@ -1509,7 +1547,7 @@ void hsv_analytic_pixel_to_rgb (HSVAnalyticPixel *self, RGBAnalyticPixel* result
 		if (_tmp5_ == 360.0f) {
 #line 136 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			hue_denorm = 0.0f;
-#line 1513 "ColorTransformation.c"
+#line 1551 "ColorTransformation.c"
 		}
 #line 138 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp6_ = hue_denorm;
@@ -1553,7 +1591,7 @@ void hsv_analytic_pixel_to_rgb (HSVAnalyticPixel *self, RGBAnalyticPixel* result
 		switch (_tmp18_) {
 #line 148 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			case 0:
-#line 1557 "ColorTransformation.c"
+#line 1595 "ColorTransformation.c"
 			{
 				gfloat _tmp19_ = 0.0F;
 				gfloat _tmp20_ = 0.0F;
@@ -1572,11 +1610,11 @@ void hsv_analytic_pixel_to_rgb (HSVAnalyticPixel *self, RGBAnalyticPixel* result
 				_result_.blue = _tmp21_;
 #line 162 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				break;
-#line 1576 "ColorTransformation.c"
+#line 1614 "ColorTransformation.c"
 			}
 #line 148 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			case 1:
-#line 1580 "ColorTransformation.c"
+#line 1618 "ColorTransformation.c"
 			{
 				gfloat _tmp22_ = 0.0F;
 				gfloat _tmp23_ = 0.0F;
@@ -1595,11 +1633,11 @@ void hsv_analytic_pixel_to_rgb (HSVAnalyticPixel *self, RGBAnalyticPixel* result
 				_result_.blue = _tmp24_;
 #line 168 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				break;
-#line 1599 "ColorTransformation.c"
+#line 1637 "ColorTransformation.c"
 			}
 #line 148 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			case 2:
-#line 1603 "ColorTransformation.c"
+#line 1641 "ColorTransformation.c"
 			{
 				gfloat _tmp25_ = 0.0F;
 				gfloat _tmp26_ = 0.0F;
@@ -1618,11 +1656,11 @@ void hsv_analytic_pixel_to_rgb (HSVAnalyticPixel *self, RGBAnalyticPixel* result
 				_result_.blue = _tmp27_;
 #line 174 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				break;
-#line 1622 "ColorTransformation.c"
+#line 1660 "ColorTransformation.c"
 			}
 #line 148 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			case 3:
-#line 1626 "ColorTransformation.c"
+#line 1664 "ColorTransformation.c"
 			{
 				gfloat _tmp28_ = 0.0F;
 				gfloat _tmp29_ = 0.0F;
@@ -1641,11 +1679,11 @@ void hsv_analytic_pixel_to_rgb (HSVAnalyticPixel *self, RGBAnalyticPixel* result
 				_result_.blue = _tmp30_;
 #line 180 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				break;
-#line 1645 "ColorTransformation.c"
+#line 1683 "ColorTransformation.c"
 			}
 #line 148 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			case 4:
-#line 1649 "ColorTransformation.c"
+#line 1687 "ColorTransformation.c"
 			{
 				gfloat _tmp31_ = 0.0F;
 				gfloat _tmp32_ = 0.0F;
@@ -1664,11 +1702,11 @@ void hsv_analytic_pixel_to_rgb (HSVAnalyticPixel *self, RGBAnalyticPixel* result
 				_result_.blue = _tmp33_;
 #line 186 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				break;
-#line 1668 "ColorTransformation.c"
+#line 1706 "ColorTransformation.c"
 			}
 #line 148 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			case 5:
-#line 1672 "ColorTransformation.c"
+#line 1710 "ColorTransformation.c"
 			{
 				gfloat _tmp34_ = 0.0F;
 				gfloat _tmp35_ = 0.0F;
@@ -1687,14 +1725,14 @@ void hsv_analytic_pixel_to_rgb (HSVAnalyticPixel *self, RGBAnalyticPixel* result
 				_result_.blue = _tmp36_;
 #line 192 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				break;
-#line 1691 "ColorTransformation.c"
+#line 1729 "ColorTransformation.c"
 			}
 			default:
 			{
 #line 195 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				g_error ("ColorTransformation.vala:195: bad color hexant in HSV-to-RGB conversio" \
 "n");
-#line 1697 "ColorTransformation.c"
+#line 1735 "ColorTransformation.c"
 			}
 		}
 	}
@@ -1702,7 +1740,7 @@ void hsv_analytic_pixel_to_rgb (HSVAnalyticPixel *self, RGBAnalyticPixel* result
 	*result = _result_;
 #line 199 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return;
-#line 1705 "ColorTransformation.c"
+#line 1743 "ColorTransformation.c"
 }
 
 
@@ -1723,7 +1761,7 @@ gboolean hsv_analytic_pixel_equals (HSVAnalyticPixel *self, HSVAnalyticPixel* rh
 	_tmp4_ = _tmp3_.hue;
 #line 203 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (_tmp2_ == _tmp4_) {
-#line 1726 "ColorTransformation.c"
+#line 1764 "ColorTransformation.c"
 		gfloat _tmp5_ = 0.0F;
 		HSVAnalyticPixel _tmp6_ = {0};
 		gfloat _tmp7_ = 0.0F;
@@ -1735,15 +1773,15 @@ gboolean hsv_analytic_pixel_equals (HSVAnalyticPixel *self, HSVAnalyticPixel* rh
 		_tmp7_ = _tmp6_.saturation;
 #line 203 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp1_ = _tmp5_ == _tmp7_;
-#line 1738 "ColorTransformation.c"
+#line 1776 "ColorTransformation.c"
 	} else {
 #line 203 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp1_ = FALSE;
-#line 1742 "ColorTransformation.c"
+#line 1780 "ColorTransformation.c"
 	}
 #line 203 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (_tmp1_) {
-#line 1746 "ColorTransformation.c"
+#line 1784 "ColorTransformation.c"
 		gfloat _tmp8_ = 0.0F;
 		HSVAnalyticPixel _tmp9_ = {0};
 		gfloat _tmp10_ = 0.0F;
@@ -1755,17 +1793,17 @@ gboolean hsv_analytic_pixel_equals (HSVAnalyticPixel *self, HSVAnalyticPixel* rh
 		_tmp10_ = _tmp9_.light_value;
 #line 204 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp0_ = _tmp8_ == _tmp10_;
-#line 1758 "ColorTransformation.c"
+#line 1796 "ColorTransformation.c"
 	} else {
 #line 203 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp0_ = FALSE;
-#line 1762 "ColorTransformation.c"
+#line 1800 "ColorTransformation.c"
 	}
 #line 203 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	result = _tmp0_;
 #line 203 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return result;
-#line 1768 "ColorTransformation.c"
+#line 1806 "ColorTransformation.c"
 }
 
 
@@ -1784,7 +1822,7 @@ guint hsv_analytic_pixel_hash_code (HSVAnalyticPixel *self) {
 	result = ((((guint) (_tmp0_ * 255.0f)) << 16) + (((guint) (_tmp1_ * 255.0f)) << 8)) + ((guint) (_tmp2_ * 255.0f));
 #line 208 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return result;
-#line 1787 "ColorTransformation.c"
+#line 1825 "ColorTransformation.c"
 }
 
 
@@ -1796,14 +1834,14 @@ HSVAnalyticPixel* hsv_analytic_pixel_dup (const HSVAnalyticPixel* self) {
 	memcpy (dup, self, sizeof (HSVAnalyticPixel));
 #line 67 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return dup;
-#line 1799 "ColorTransformation.c"
+#line 1837 "ColorTransformation.c"
 }
 
 
 void hsv_analytic_pixel_free (HSVAnalyticPixel* self) {
 #line 67 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_free (self);
-#line 1806 "ColorTransformation.c"
+#line 1844 "ColorTransformation.c"
 }
 
 
@@ -1845,7 +1883,7 @@ GType pixel_format_get_type (void) {
 GType pixel_transformation_type_get_type (void) {
 	static volatile gsize pixel_transformation_type_type_id__volatile = 0;
 	if (g_once_init_enter (&pixel_transformation_type_type_id__volatile)) {
-		static const GEnumValue values[] = {{PIXEL_TRANSFORMATION_TYPE_TONE_EXPANSION, "PIXEL_TRANSFORMATION_TYPE_TONE_EXPANSION", "tone-expansion"}, {PIXEL_TRANSFORMATION_TYPE_SHADOWS, "PIXEL_TRANSFORMATION_TYPE_SHADOWS", "shadows"}, {PIXEL_TRANSFORMATION_TYPE_HIGHLIGHTS, "PIXEL_TRANSFORMATION_TYPE_HIGHLIGHTS", "highlights"}, {PIXEL_TRANSFORMATION_TYPE_TEMPERATURE, "PIXEL_TRANSFORMATION_TYPE_TEMPERATURE", "temperature"}, {PIXEL_TRANSFORMATION_TYPE_TINT, "PIXEL_TRANSFORMATION_TYPE_TINT", "tint"}, {PIXEL_TRANSFORMATION_TYPE_SATURATION, "PIXEL_TRANSFORMATION_TYPE_SATURATION", "saturation"}, {PIXEL_TRANSFORMATION_TYPE_EXPOSURE, "PIXEL_TRANSFORMATION_TYPE_EXPOSURE", "exposure"}, {0, NULL, NULL}};
+		static const GEnumValue values[] = {{PIXEL_TRANSFORMATION_TYPE_TONE_EXPANSION, "PIXEL_TRANSFORMATION_TYPE_TONE_EXPANSION", "tone-expansion"}, {PIXEL_TRANSFORMATION_TYPE_SHADOWS, "PIXEL_TRANSFORMATION_TYPE_SHADOWS", "shadows"}, {PIXEL_TRANSFORMATION_TYPE_HIGHLIGHTS, "PIXEL_TRANSFORMATION_TYPE_HIGHLIGHTS", "highlights"}, {PIXEL_TRANSFORMATION_TYPE_TEMPERATURE, "PIXEL_TRANSFORMATION_TYPE_TEMPERATURE", "temperature"}, {PIXEL_TRANSFORMATION_TYPE_TINT, "PIXEL_TRANSFORMATION_TYPE_TINT", "tint"}, {PIXEL_TRANSFORMATION_TYPE_SATURATION, "PIXEL_TRANSFORMATION_TYPE_SATURATION", "saturation"}, {PIXEL_TRANSFORMATION_TYPE_EXPOSURE, "PIXEL_TRANSFORMATION_TYPE_EXPOSURE", "exposure"}, {PIXEL_TRANSFORMATION_TYPE_CONTRAST, "PIXEL_TRANSFORMATION_TYPE_CONTRAST", "contrast"}, {0, NULL, NULL}};
 		GType pixel_transformation_type_type_id;
 		pixel_transformation_type_type_id = g_enum_register_static ("PixelTransformationType", values);
 		g_once_init_leave (&pixel_transformation_type_type_id__volatile, pixel_transformation_type_type_id);
@@ -1856,25 +1894,25 @@ GType pixel_transformation_type_get_type (void) {
 
 PixelTransformationBundle* pixel_transformation_bundle_construct (GType object_type) {
 	PixelTransformationBundle* self = NULL;
-#line 239 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 240 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self = (PixelTransformationBundle*) g_type_create_instance (object_type);
-#line 239 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 240 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return self;
-#line 1863 "ColorTransformation.c"
+#line 1901 "ColorTransformation.c"
 }
 
 
 PixelTransformationBundle* pixel_transformation_bundle_new (void) {
-#line 239 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 240 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return pixel_transformation_bundle_construct (TYPE_PIXEL_TRANSFORMATION_BUNDLE);
-#line 1870 "ColorTransformation.c"
+#line 1908 "ColorTransformation.c"
 }
 
 
 static gpointer _pixel_transformation_bundle_ref0 (gpointer self) {
-#line 243 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 244 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return self ? pixel_transformation_bundle_ref (self) : NULL;
-#line 1877 "ColorTransformation.c"
+#line 1915 "ColorTransformation.c"
 }
 
 
@@ -1882,45 +1920,45 @@ PixelTransformationBundle* pixel_transformation_bundle_get_copied_color_adjustme
 	PixelTransformationBundle* result = NULL;
 	PixelTransformationBundle* _tmp0_ = NULL;
 	PixelTransformationBundle* _tmp1_ = NULL;
-#line 243 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 244 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp0_ = pixel_transformation_bundle_copied_color_adjustments;
-#line 243 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 244 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp1_ = _pixel_transformation_bundle_ref0 (_tmp0_);
-#line 243 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 244 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	result = _tmp1_;
-#line 243 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 244 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return result;
-#line 1893 "ColorTransformation.c"
+#line 1931 "ColorTransformation.c"
 }
 
 
 void pixel_transformation_bundle_set_copied_color_adjustments (PixelTransformationBundle* adjustments) {
 	PixelTransformationBundle* _tmp0_ = NULL;
 	PixelTransformationBundle* _tmp1_ = NULL;
-#line 246 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	g_return_if_fail (IS_PIXEL_TRANSFORMATION_BUNDLE (adjustments));
 #line 247 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	g_return_if_fail (IS_PIXEL_TRANSFORMATION_BUNDLE (adjustments));
+#line 248 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp0_ = adjustments;
-#line 247 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 248 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp1_ = _pixel_transformation_bundle_ref0 (_tmp0_);
-#line 247 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 248 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_pixel_transformation_bundle_unref0 (pixel_transformation_bundle_copied_color_adjustments);
-#line 247 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 248 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	pixel_transformation_bundle_copied_color_adjustments = _tmp1_;
-#line 1910 "ColorTransformation.c"
+#line 1948 "ColorTransformation.c"
 }
 
 
 gboolean pixel_transformation_bundle_has_copied_color_adjustments (void) {
 	gboolean result = FALSE;
 	PixelTransformationBundle* _tmp0_ = NULL;
-#line 251 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 252 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp0_ = pixel_transformation_bundle_copied_color_adjustments;
-#line 251 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 252 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	result = _tmp0_ != NULL;
-#line 251 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 252 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return result;
-#line 1923 "ColorTransformation.c"
+#line 1961 "ColorTransformation.c"
 }
 
 
@@ -1929,21 +1967,21 @@ void pixel_transformation_bundle_set (PixelTransformationBundle* self, PixelTran
 	PixelTransformation* _tmp1_ = NULL;
 	PixelTransformationType _tmp2_ = 0;
 	PixelTransformation* _tmp3_ = NULL;
-#line 254 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 255 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_return_if_fail (IS_PIXEL_TRANSFORMATION_BUNDLE (self));
-#line 254 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	g_return_if_fail (IS_PIXEL_TRANSFORMATION (transformation));
 #line 255 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	g_return_if_fail (IS_PIXEL_TRANSFORMATION (transformation));
+#line 256 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp0_ = self->priv->map;
-#line 255 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 256 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp1_ = transformation;
-#line 255 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 256 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp2_ = pixel_transformation_get_transformation_type (_tmp1_);
-#line 255 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 256 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp3_ = transformation;
-#line 255 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 256 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), (gpointer) ((gintptr) ((gint) _tmp2_)), _tmp3_);
-#line 1946 "ColorTransformation.c"
+#line 1984 "ColorTransformation.c"
 }
 
 
@@ -1962,65 +2000,75 @@ void pixel_transformation_bundle_set_to_identity (PixelTransformationBundle* sel
 	SaturationTransformation* _tmp11_ = NULL;
 	ExposureTransformation* _tmp12_ = NULL;
 	ExposureTransformation* _tmp13_ = NULL;
-#line 258 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	g_return_if_fail (IS_PIXEL_TRANSFORMATION_BUNDLE (self));
+	ContrastTransformation* _tmp14_ = NULL;
+	ContrastTransformation* _tmp15_ = NULL;
 #line 259 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	g_return_if_fail (IS_PIXEL_TRANSFORMATION_BUNDLE (self));
+#line 260 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp0_ = expansion_transformation_new_from_extrema (0, 255);
-#line 259 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 260 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp1_ = _tmp0_;
-#line 259 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 260 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	pixel_transformation_bundle_set (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PIXEL_TRANSFORMATION, PixelTransformation));
-#line 259 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	_pixel_transformation_unref0 (_tmp1_);
 #line 260 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	_pixel_transformation_unref0 (_tmp1_);
+#line 261 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp2_ = shadow_detail_transformation_new (0.0f);
-#line 260 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 261 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp3_ = _tmp2_;
-#line 260 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 261 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	pixel_transformation_bundle_set (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_PIXEL_TRANSFORMATION, PixelTransformation));
-#line 260 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	_pixel_transformation_unref0 (_tmp3_);
 #line 261 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	_pixel_transformation_unref0 (_tmp3_);
+#line 262 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp4_ = highlight_detail_transformation_new (0.0f);
-#line 261 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 262 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp5_ = _tmp4_;
-#line 261 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 262 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	pixel_transformation_bundle_set (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_PIXEL_TRANSFORMATION, PixelTransformation));
-#line 261 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	_pixel_transformation_unref0 (_tmp5_);
 #line 262 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	_pixel_transformation_unref0 (_tmp5_);
+#line 263 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp6_ = temperature_transformation_new (0.0f);
-#line 262 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 263 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp7_ = _tmp6_;
-#line 262 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 263 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	pixel_transformation_bundle_set (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_PIXEL_TRANSFORMATION, PixelTransformation));
-#line 262 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	_pixel_transformation_unref0 (_tmp7_);
 #line 263 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	_pixel_transformation_unref0 (_tmp7_);
+#line 264 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp8_ = tint_transformation_new (0.0f);
-#line 263 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 264 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp9_ = _tmp8_;
-#line 263 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 264 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	pixel_transformation_bundle_set (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_PIXEL_TRANSFORMATION, PixelTransformation));
-#line 263 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	_pixel_transformation_unref0 (_tmp9_);
 #line 264 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	_pixel_transformation_unref0 (_tmp9_);
+#line 265 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp10_ = saturation_transformation_new (0.0f);
-#line 264 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 265 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp11_ = _tmp10_;
-#line 264 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 265 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	pixel_transformation_bundle_set (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_PIXEL_TRANSFORMATION, PixelTransformation));
-#line 264 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	_pixel_transformation_unref0 (_tmp11_);
 #line 265 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	_pixel_transformation_unref0 (_tmp11_);
+#line 266 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp12_ = exposure_transformation_new (0.0f);
-#line 265 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 266 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp13_ = _tmp12_;
-#line 265 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 266 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	pixel_transformation_bundle_set (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_PIXEL_TRANSFORMATION, PixelTransformation));
-#line 265 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 266 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_pixel_transformation_unref0 (_tmp13_);
-#line 2023 "ColorTransformation.c"
+#line 267 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	_tmp14_ = contrast_transformation_new (0.0f);
+#line 267 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	_tmp15_ = _tmp14_;
+#line 267 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	pixel_transformation_bundle_set (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_PIXEL_TRANSFORMATION, PixelTransformation));
+#line 267 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	_pixel_transformation_unref0 (_tmp15_);
+#line 2071 "ColorTransformation.c"
 }
 
 
@@ -2053,123 +2101,139 @@ void pixel_transformation_bundle_load (PixelTransformationBundle* self, KeyValue
 	gfloat _tmp29_ = 0.0F;
 	ExposureTransformation* _tmp30_ = NULL;
 	ExposureTransformation* _tmp31_ = NULL;
-#line 268 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	KeyValueMap* _tmp32_ = NULL;
+	gfloat _tmp33_ = 0.0F;
+	ContrastTransformation* _tmp34_ = NULL;
+	ContrastTransformation* _tmp35_ = NULL;
+#line 270 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_return_if_fail (IS_PIXEL_TRANSFORMATION_BUNDLE (self));
-#line 268 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 270 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_return_if_fail (IS_KEY_VALUE_MAP (store));
-#line 269 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 271 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp0_ = store;
-#line 269 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 271 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp1_ = key_value_map_get_string (_tmp0_, "expansion", "-");
-#line 269 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 271 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	expansion_params_encoded = _tmp1_;
-#line 270 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 272 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp2_ = expansion_params_encoded;
-#line 270 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 272 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (g_strcmp0 (_tmp2_, "-") == 0) {
-#line 2070 "ColorTransformation.c"
+#line 2122 "ColorTransformation.c"
 		ExpansionTransformation* _tmp3_ = NULL;
 		ExpansionTransformation* _tmp4_ = NULL;
-#line 271 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 273 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp3_ = expansion_transformation_new_from_extrema (0, 255);
-#line 271 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 273 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp4_ = _tmp3_;
-#line 271 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 273 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		pixel_transformation_bundle_set (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_PIXEL_TRANSFORMATION, PixelTransformation));
-#line 271 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 273 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_pixel_transformation_unref0 (_tmp4_);
-#line 2081 "ColorTransformation.c"
+#line 2133 "ColorTransformation.c"
 	} else {
 		const gchar* _tmp5_ = NULL;
 		ExpansionTransformation* _tmp6_ = NULL;
 		ExpansionTransformation* _tmp7_ = NULL;
-#line 273 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 275 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp5_ = expansion_params_encoded;
-#line 273 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 275 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp6_ = expansion_transformation_new_from_string (_tmp5_);
-#line 273 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 275 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp7_ = _tmp6_;
-#line 273 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 275 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		pixel_transformation_bundle_set (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_PIXEL_TRANSFORMATION, PixelTransformation));
-#line 273 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 275 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_pixel_transformation_unref0 (_tmp7_);
-#line 2096 "ColorTransformation.c"
+#line 2148 "ColorTransformation.c"
 	}
-#line 275 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 277 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp8_ = store;
-#line 275 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 277 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp9_ = key_value_map_get_float (_tmp8_, "shadows", 0.0f);
-#line 275 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 277 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp10_ = shadow_detail_transformation_new (_tmp9_);
-#line 275 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 277 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp11_ = _tmp10_;
-#line 275 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 277 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	pixel_transformation_bundle_set (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_PIXEL_TRANSFORMATION, PixelTransformation));
-#line 275 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 277 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_pixel_transformation_unref0 (_tmp11_);
-#line 276 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 278 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp12_ = store;
-#line 276 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 278 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp13_ = key_value_map_get_float (_tmp12_, "highlights", 0.0f);
-#line 276 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 278 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp14_ = highlight_detail_transformation_new (_tmp13_);
-#line 276 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 278 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp15_ = _tmp14_;
-#line 276 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 278 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	pixel_transformation_bundle_set (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_PIXEL_TRANSFORMATION, PixelTransformation));
-#line 276 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 278 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_pixel_transformation_unref0 (_tmp15_);
-#line 277 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 279 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp16_ = store;
-#line 277 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 279 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp17_ = key_value_map_get_float (_tmp16_, "temperature", 0.0f);
-#line 277 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 279 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp18_ = temperature_transformation_new (_tmp17_);
-#line 277 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 279 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp19_ = _tmp18_;
-#line 277 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 279 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	pixel_transformation_bundle_set (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, TYPE_PIXEL_TRANSFORMATION, PixelTransformation));
-#line 277 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 279 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_pixel_transformation_unref0 (_tmp19_);
-#line 278 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 280 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp20_ = store;
-#line 278 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 280 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp21_ = key_value_map_get_float (_tmp20_, "tint", 0.0f);
-#line 278 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 280 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp22_ = tint_transformation_new (_tmp21_);
-#line 278 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 280 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp23_ = _tmp22_;
-#line 278 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 280 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	pixel_transformation_bundle_set (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, TYPE_PIXEL_TRANSFORMATION, PixelTransformation));
-#line 278 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 280 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_pixel_transformation_unref0 (_tmp23_);
-#line 279 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 281 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp24_ = store;
-#line 279 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 281 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp25_ = key_value_map_get_float (_tmp24_, "saturation", 0.0f);
-#line 279 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 281 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp26_ = saturation_transformation_new (_tmp25_);
-#line 279 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 281 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp27_ = _tmp26_;
-#line 279 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 281 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	pixel_transformation_bundle_set (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, TYPE_PIXEL_TRANSFORMATION, PixelTransformation));
-#line 279 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 281 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_pixel_transformation_unref0 (_tmp27_);
-#line 280 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 282 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp28_ = store;
-#line 280 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 282 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp29_ = key_value_map_get_float (_tmp28_, "exposure", 0.0f);
-#line 280 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 282 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp30_ = exposure_transformation_new (_tmp29_);
-#line 280 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 282 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp31_ = _tmp30_;
-#line 280 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 282 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	pixel_transformation_bundle_set (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, TYPE_PIXEL_TRANSFORMATION, PixelTransformation));
-#line 280 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 282 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_pixel_transformation_unref0 (_tmp31_);
-#line 268 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 283 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	_tmp32_ = store;
+#line 283 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	_tmp33_ = key_value_map_get_float (_tmp32_, "contrast", 0.0f);
+#line 283 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	_tmp34_ = contrast_transformation_new (_tmp33_);
+#line 283 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	_tmp35_ = _tmp34_;
+#line 283 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	pixel_transformation_bundle_set (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, TYPE_PIXEL_TRANSFORMATION, PixelTransformation));
+#line 283 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	_pixel_transformation_unref0 (_tmp35_);
+#line 270 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_g_free0 (expansion_params_encoded);
-#line 2172 "ColorTransformation.c"
+#line 2236 "ColorTransformation.c"
 }
 
 
@@ -2200,109 +2264,124 @@ KeyValueMap* pixel_transformation_bundle_save (PixelTransformationBundle* self,
 	ExposureTransformation* new_exposure_trans = NULL;
 	PixelTransformation* _tmp15_ = NULL;
 	gfloat _tmp16_ = 0.0F;
-#line 283 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	ContrastTransformation* new_contrast_trans = NULL;
+	PixelTransformation* _tmp17_ = NULL;
+	gfloat _tmp18_ = 0.0F;
+#line 286 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_return_val_if_fail (IS_PIXEL_TRANSFORMATION_BUNDLE (self), NULL);
-#line 283 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 286 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_return_val_if_fail (group != NULL, NULL);
-#line 284 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 287 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp0_ = group;
-#line 284 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 287 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp1_ = key_value_map_new (_tmp0_);
-#line 284 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 287 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	store = _tmp1_;
-#line 286 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 289 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp2_ = pixel_transformation_bundle_get_transformation (self, PIXEL_TRANSFORMATION_TYPE_TONE_EXPANSION);
-#line 286 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 289 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	new_expansion_trans = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_EXPANSION_TRANSFORMATION, ExpansionTransformation);
-#line 288 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 291 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_vala_assert (new_expansion_trans != NULL, "new_expansion_trans != null");
-#line 289 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 292 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp3_ = pixel_transformation_to_string (G_TYPE_CHECK_INSTANCE_CAST (new_expansion_trans, TYPE_PIXEL_TRANSFORMATION, PixelTransformation));
-#line 289 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 292 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp4_ = _tmp3_;
-#line 289 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 292 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	key_value_map_set_string (store, "expansion", _tmp4_);
-#line 289 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 292 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_g_free0 (_tmp4_);
-#line 291 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 294 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp5_ = pixel_transformation_bundle_get_transformation (self, PIXEL_TRANSFORMATION_TYPE_SHADOWS);
-#line 291 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 294 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	new_shadows_trans = G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_SHADOW_DETAIL_TRANSFORMATION, ShadowDetailTransformation);
-#line 293 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 296 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_vala_assert (new_shadows_trans != NULL, "new_shadows_trans != null");
-#line 294 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 297 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp6_ = shadow_detail_transformation_get_parameter (new_shadows_trans);
-#line 294 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 297 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	key_value_map_set_float (store, "shadows", _tmp6_);
-#line 296 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 299 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp7_ = pixel_transformation_bundle_get_transformation (self, PIXEL_TRANSFORMATION_TYPE_HIGHLIGHTS);
-#line 296 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 299 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	new_highlight_trans = G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_HIGHLIGHT_DETAIL_TRANSFORMATION, HighlightDetailTransformation);
-#line 298 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 301 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_vala_assert (new_highlight_trans != NULL, "new_highlight_trans != null");
-#line 299 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 302 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp8_ = highlight_detail_transformation_get_parameter (new_highlight_trans);
-#line 299 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 302 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	key_value_map_set_float (store, "highlights", _tmp8_);
-#line 301 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 304 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp9_ = pixel_transformation_bundle_get_transformation (self, PIXEL_TRANSFORMATION_TYPE_TEMPERATURE);
-#line 301 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 304 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	new_temp_trans = G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_TEMPERATURE_TRANSFORMATION, TemperatureTransformation);
-#line 303 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 306 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_vala_assert (new_temp_trans != NULL, "new_temp_trans != null");
-#line 304 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 307 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp10_ = temperature_transformation_get_parameter (new_temp_trans);
-#line 304 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 307 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	key_value_map_set_float (store, "temperature", _tmp10_);
-#line 306 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 309 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp11_ = pixel_transformation_bundle_get_transformation (self, PIXEL_TRANSFORMATION_TYPE_TINT);
-#line 306 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 309 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	new_tint_trans = G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_TINT_TRANSFORMATION, TintTransformation);
-#line 308 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 311 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_vala_assert (new_tint_trans != NULL, "new_tint_trans != null");
-#line 309 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 312 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp12_ = tint_transformation_get_parameter (new_tint_trans);
-#line 309 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 312 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	key_value_map_set_float (store, "tint", _tmp12_);
-#line 311 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 314 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp13_ = pixel_transformation_bundle_get_transformation (self, PIXEL_TRANSFORMATION_TYPE_SATURATION);
-#line 311 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 314 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	new_sat_trans = G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_SATURATION_TRANSFORMATION, SaturationTransformation);
-#line 313 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 316 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_vala_assert (new_sat_trans != NULL, "new_sat_trans != null");
-#line 314 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 317 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp14_ = saturation_transformation_get_parameter (new_sat_trans);
-#line 314 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 317 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	key_value_map_set_float (store, "saturation", _tmp14_);
-#line 316 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 319 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp15_ = pixel_transformation_bundle_get_transformation (self, PIXEL_TRANSFORMATION_TYPE_EXPOSURE);
-#line 316 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 319 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	new_exposure_trans = G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_EXPOSURE_TRANSFORMATION, ExposureTransformation);
-#line 318 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 321 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_vala_assert (new_exposure_trans != NULL, "new_exposure_trans != null");
-#line 319 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 322 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp16_ = exposure_transformation_get_parameter (new_exposure_trans);
-#line 319 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 322 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	key_value_map_set_float (store, "exposure", _tmp16_);
-#line 321 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 324 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	_tmp17_ = pixel_transformation_bundle_get_transformation (self, PIXEL_TRANSFORMATION_TYPE_CONTRAST);
+#line 324 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	new_contrast_trans = G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, TYPE_CONTRAST_TRANSFORMATION, ContrastTransformation);
+#line 326 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	_vala_assert (new_contrast_trans != NULL, "new_contrast_trans != null");
+#line 327 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	_tmp18_ = contrast_transformation_get_parameter (new_contrast_trans);
+#line 327 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	key_value_map_set_float (store, "contrast", _tmp18_);
+#line 329 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	result = store;
-#line 321 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 329 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	_pixel_transformation_unref0 (new_contrast_trans);
+#line 329 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_pixel_transformation_unref0 (new_exposure_trans);
-#line 321 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 329 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_pixel_transformation_unref0 (new_sat_trans);
-#line 321 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 329 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_pixel_transformation_unref0 (new_tint_trans);
-#line 321 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 329 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_pixel_transformation_unref0 (new_temp_trans);
-#line 321 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 329 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_pixel_transformation_unref0 (new_highlight_trans);
-#line 321 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 329 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_pixel_transformation_unref0 (new_shadows_trans);
-#line 321 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 329 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_pixel_transformation_unref0 (new_expansion_trans);
-#line 321 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 329 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return result;
-#line 2305 "ColorTransformation.c"
+#line 2384 "ColorTransformation.c"
 }
 
 
@@ -2311,19 +2390,19 @@ gint pixel_transformation_bundle_get_count (PixelTransformationBundle* self) {
 	GeeHashMap* _tmp0_ = NULL;
 	gint _tmp1_ = 0;
 	gint _tmp2_ = 0;
-#line 324 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 332 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_return_val_if_fail (IS_PIXEL_TRANSFORMATION_BUNDLE (self), 0);
-#line 325 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 333 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp0_ = self->priv->map;
-#line 325 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 333 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp1_ = gee_abstract_map_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_MAP, GeeMap));
-#line 325 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 333 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp2_ = _tmp1_;
-#line 325 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 333 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	result = _tmp2_;
-#line 325 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 333 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return result;
-#line 2326 "ColorTransformation.c"
+#line 2405 "ColorTransformation.c"
 }
 
 
@@ -2332,19 +2411,19 @@ PixelTransformation* pixel_transformation_bundle_get_transformation (PixelTransf
 	GeeHashMap* _tmp0_ = NULL;
 	PixelTransformationType _tmp1_ = 0;
 	gpointer _tmp2_ = NULL;
-#line 328 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 336 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_return_val_if_fail (IS_PIXEL_TRANSFORMATION_BUNDLE (self), NULL);
-#line 329 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 337 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp0_ = self->priv->map;
-#line 329 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 337 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp1_ = type;
-#line 329 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 337 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp2_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), (gpointer) ((gintptr) ((gint) _tmp1_)));
-#line 329 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 337 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	result = (PixelTransformation*) _tmp2_;
-#line 329 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 337 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return result;
-#line 2347 "ColorTransformation.c"
+#line 2426 "ColorTransformation.c"
 }
 
 
@@ -2353,48 +2432,48 @@ GeeIterable* pixel_transformation_bundle_get_transformations (PixelTransformatio
 	GeeHashMap* _tmp0_ = NULL;
 	GeeCollection* _tmp1_ = NULL;
 	GeeCollection* _tmp2_ = NULL;
-#line 332 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 340 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_return_val_if_fail (IS_PIXEL_TRANSFORMATION_BUNDLE (self), NULL);
-#line 333 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 341 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp0_ = self->priv->map;
-#line 333 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 341 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp1_ = gee_abstract_map_get_values (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_MAP, GeeMap));
-#line 333 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 341 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp2_ = _tmp1_;
-#line 333 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 341 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ITERABLE, GeeIterable);
-#line 333 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 341 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return result;
-#line 2368 "ColorTransformation.c"
+#line 2447 "ColorTransformation.c"
 }
 
 
 gboolean pixel_transformation_bundle_is_identity (PixelTransformationBundle* self) {
 	gboolean result = FALSE;
-#line 336 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 344 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_return_val_if_fail (IS_PIXEL_TRANSFORMATION_BUNDLE (self), FALSE);
-#line 2376 "ColorTransformation.c"
+#line 2455 "ColorTransformation.c"
 	{
 		GeeIterator* _adjustment_it = NULL;
 		GeeIterable* _tmp0_ = NULL;
 		GeeIterable* _tmp1_ = NULL;
 		GeeIterator* _tmp2_ = NULL;
 		GeeIterator* _tmp3_ = NULL;
-#line 337 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 345 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp0_ = pixel_transformation_bundle_get_transformations (self);
-#line 337 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 345 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp1_ = _tmp0_;
-#line 337 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 345 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp2_ = gee_iterable_iterator (_tmp1_);
-#line 337 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 345 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp3_ = _tmp2_;
-#line 337 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 345 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_g_object_unref0 (_tmp1_);
-#line 337 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 345 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_adjustment_it = _tmp3_;
-#line 337 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 345 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		while (TRUE) {
-#line 2397 "ColorTransformation.c"
+#line 2476 "ColorTransformation.c"
 			GeeIterator* _tmp4_ = NULL;
 			gboolean _tmp5_ = FALSE;
 			PixelTransformation* adjustment = NULL;
@@ -2402,51 +2481,51 @@ gboolean pixel_transformation_bundle_is_identity (PixelTransformationBundle* sel
 			gpointer _tmp7_ = NULL;
 			PixelTransformation* _tmp8_ = NULL;
 			gboolean _tmp9_ = FALSE;
-#line 337 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 345 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp4_ = _adjustment_it;
-#line 337 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 345 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp5_ = gee_iterator_next (_tmp4_);
-#line 337 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 345 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			if (!_tmp5_) {
-#line 337 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 345 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				break;
-#line 2413 "ColorTransformation.c"
+#line 2492 "ColorTransformation.c"
 			}
-#line 337 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 345 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp6_ = _adjustment_it;
-#line 337 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 345 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp7_ = gee_iterator_get (_tmp6_);
-#line 337 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 345 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			adjustment = (PixelTransformation*) _tmp7_;
-#line 338 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 346 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp8_ = adjustment;
-#line 338 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 346 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp9_ = pixel_transformation_is_identity (_tmp8_);
-#line 338 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 346 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			if (!_tmp9_) {
-#line 339 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 347 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				result = FALSE;
-#line 339 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 347 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_pixel_transformation_unref0 (adjustment);
-#line 339 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 347 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_g_object_unref0 (_adjustment_it);
-#line 339 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 347 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				return result;
-#line 2435 "ColorTransformation.c"
+#line 2514 "ColorTransformation.c"
 			}
-#line 337 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 345 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_pixel_transformation_unref0 (adjustment);
-#line 2439 "ColorTransformation.c"
+#line 2518 "ColorTransformation.c"
 		}
-#line 337 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 345 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_g_object_unref0 (_adjustment_it);
-#line 2443 "ColorTransformation.c"
+#line 2522 "ColorTransformation.c"
 	}
-#line 342 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 350 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	result = TRUE;
-#line 342 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 350 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return result;
-#line 2449 "ColorTransformation.c"
+#line 2528 "ColorTransformation.c"
 }
 
 
@@ -2454,34 +2533,34 @@ PixelTransformer* pixel_transformation_bundle_generate_transformer (PixelTransfo
 	PixelTransformer* result = NULL;
 	PixelTransformer* transformer = NULL;
 	PixelTransformer* _tmp0_ = NULL;
-#line 345 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 353 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_return_val_if_fail (IS_PIXEL_TRANSFORMATION_BUNDLE (self), NULL);
-#line 346 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 354 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp0_ = pixel_transformer_new ();
-#line 346 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 354 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	transformer = _tmp0_;
-#line 2463 "ColorTransformation.c"
+#line 2542 "ColorTransformation.c"
 	{
 		GeeIterator* _transformation_it = NULL;
 		GeeIterable* _tmp1_ = NULL;
 		GeeIterable* _tmp2_ = NULL;
 		GeeIterator* _tmp3_ = NULL;
 		GeeIterator* _tmp4_ = NULL;
-#line 347 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 355 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp1_ = pixel_transformation_bundle_get_transformations (self);
-#line 347 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 355 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp2_ = _tmp1_;
-#line 347 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 355 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp3_ = gee_iterable_iterator (_tmp2_);
-#line 347 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 355 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp4_ = _tmp3_;
-#line 347 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 355 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_g_object_unref0 (_tmp2_);
-#line 347 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 355 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_transformation_it = _tmp4_;
-#line 347 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 355 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		while (TRUE) {
-#line 2484 "ColorTransformation.c"
+#line 2563 "ColorTransformation.c"
 			GeeIterator* _tmp5_ = NULL;
 			gboolean _tmp6_ = FALSE;
 			PixelTransformation* transformation = NULL;
@@ -2489,41 +2568,41 @@ PixelTransformer* pixel_transformation_bundle_generate_transformer (PixelTransfo
 			gpointer _tmp8_ = NULL;
 			PixelTransformer* _tmp9_ = NULL;
 			PixelTransformation* _tmp10_ = NULL;
-#line 347 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 355 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp5_ = _transformation_it;
-#line 347 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 355 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp6_ = gee_iterator_next (_tmp5_);
-#line 347 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 355 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			if (!_tmp6_) {
-#line 347 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 355 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				break;
-#line 2500 "ColorTransformation.c"
+#line 2579 "ColorTransformation.c"
 			}
-#line 347 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 355 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp7_ = _transformation_it;
-#line 347 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 355 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp8_ = gee_iterator_get (_tmp7_);
-#line 347 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 355 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			transformation = (PixelTransformation*) _tmp8_;
-#line 348 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 356 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp9_ = transformer;
-#line 348 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 356 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp10_ = transformation;
-#line 348 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 356 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			pixel_transformer_attach_transformation (_tmp9_, _tmp10_);
-#line 347 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 355 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_pixel_transformation_unref0 (transformation);
-#line 2516 "ColorTransformation.c"
+#line 2595 "ColorTransformation.c"
 		}
-#line 347 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 355 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_g_object_unref0 (_transformation_it);
-#line 2520 "ColorTransformation.c"
+#line 2599 "ColorTransformation.c"
 	}
-#line 350 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 358 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	result = transformer;
-#line 350 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 358 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return result;
-#line 2526 "ColorTransformation.c"
+#line 2605 "ColorTransformation.c"
 }
 
 
@@ -2531,34 +2610,34 @@ PixelTransformationBundle* pixel_transformation_bundle_copy (PixelTransformation
 	PixelTransformationBundle* result = NULL;
 	PixelTransformationBundle* bundle = NULL;
 	PixelTransformationBundle* _tmp0_ = NULL;
-#line 353 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 361 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_return_val_if_fail (IS_PIXEL_TRANSFORMATION_BUNDLE (self), NULL);
-#line 354 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 362 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp0_ = pixel_transformation_bundle_new ();
-#line 354 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 362 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	bundle = _tmp0_;
-#line 2540 "ColorTransformation.c"
+#line 2619 "ColorTransformation.c"
 	{
 		GeeIterator* _transformation_it = NULL;
 		GeeIterable* _tmp1_ = NULL;
 		GeeIterable* _tmp2_ = NULL;
 		GeeIterator* _tmp3_ = NULL;
 		GeeIterator* _tmp4_ = NULL;
-#line 355 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 363 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp1_ = pixel_transformation_bundle_get_transformations (self);
-#line 355 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 363 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp2_ = _tmp1_;
-#line 355 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 363 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp3_ = gee_iterable_iterator (_tmp2_);
-#line 355 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 363 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp4_ = _tmp3_;
-#line 355 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 363 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_g_object_unref0 (_tmp2_);
-#line 355 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 363 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_transformation_it = _tmp4_;
-#line 355 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 363 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		while (TRUE) {
-#line 2561 "ColorTransformation.c"
+#line 2640 "ColorTransformation.c"
 			GeeIterator* _tmp5_ = NULL;
 			gboolean _tmp6_ = FALSE;
 			PixelTransformation* transformation = NULL;
@@ -2566,232 +2645,232 @@ PixelTransformationBundle* pixel_transformation_bundle_copy (PixelTransformation
 			gpointer _tmp8_ = NULL;
 			PixelTransformationBundle* _tmp9_ = NULL;
 			PixelTransformation* _tmp10_ = NULL;
-#line 355 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 363 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp5_ = _transformation_it;
-#line 355 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 363 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp6_ = gee_iterator_next (_tmp5_);
-#line 355 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 363 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			if (!_tmp6_) {
-#line 355 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 363 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				break;
-#line 2577 "ColorTransformation.c"
+#line 2656 "ColorTransformation.c"
 			}
-#line 355 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 363 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp7_ = _transformation_it;
-#line 355 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 363 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp8_ = gee_iterator_get (_tmp7_);
-#line 355 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 363 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			transformation = (PixelTransformation*) _tmp8_;
-#line 356 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 364 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp9_ = bundle;
-#line 356 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 364 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp10_ = transformation;
-#line 356 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 364 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			pixel_transformation_bundle_set (_tmp9_, _tmp10_);
-#line 355 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 363 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_pixel_transformation_unref0 (transformation);
-#line 2593 "ColorTransformation.c"
+#line 2672 "ColorTransformation.c"
 		}
-#line 355 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 363 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_g_object_unref0 (_transformation_it);
-#line 2597 "ColorTransformation.c"
+#line 2676 "ColorTransformation.c"
 	}
-#line 358 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 366 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	result = bundle;
-#line 358 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 366 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return result;
-#line 2603 "ColorTransformation.c"
+#line 2682 "ColorTransformation.c"
 }
 
 
 static void value_pixel_transformation_bundle_init (GValue* value) {
-#line 233 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 234 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	value->data[0].v_pointer = NULL;
-#line 2610 "ColorTransformation.c"
+#line 2689 "ColorTransformation.c"
 }
 
 
 static void value_pixel_transformation_bundle_free_value (GValue* value) {
-#line 233 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 234 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (value->data[0].v_pointer) {
-#line 233 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 234 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		pixel_transformation_bundle_unref (value->data[0].v_pointer);
-#line 2619 "ColorTransformation.c"
+#line 2698 "ColorTransformation.c"
 	}
 }
 
 
 static void value_pixel_transformation_bundle_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 233 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 234 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (src_value->data[0].v_pointer) {
-#line 233 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 234 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		dest_value->data[0].v_pointer = pixel_transformation_bundle_ref (src_value->data[0].v_pointer);
-#line 2629 "ColorTransformation.c"
+#line 2708 "ColorTransformation.c"
 	} else {
-#line 233 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 234 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 2633 "ColorTransformation.c"
+#line 2712 "ColorTransformation.c"
 	}
 }
 
 
 static gpointer value_pixel_transformation_bundle_peek_pointer (const GValue* value) {
-#line 233 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 234 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return value->data[0].v_pointer;
-#line 2641 "ColorTransformation.c"
+#line 2720 "ColorTransformation.c"
 }
 
 
 static gchar* value_pixel_transformation_bundle_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 233 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 234 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (collect_values[0].v_pointer) {
-#line 2648 "ColorTransformation.c"
+#line 2727 "ColorTransformation.c"
 		PixelTransformationBundle* object;
 		object = collect_values[0].v_pointer;
-#line 233 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 234 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		if (object->parent_instance.g_class == NULL) {
-#line 233 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 234 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 2655 "ColorTransformation.c"
+#line 2734 "ColorTransformation.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 233 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 234 "/home/jens/Source/shotwell/src/ColorTransformation.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 2659 "ColorTransformation.c"
+#line 2738 "ColorTransformation.c"
 		}
-#line 233 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 234 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		value->data[0].v_pointer = pixel_transformation_bundle_ref (object);
-#line 2663 "ColorTransformation.c"
+#line 2742 "ColorTransformation.c"
 	} else {
-#line 233 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 234 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		value->data[0].v_pointer = NULL;
-#line 2667 "ColorTransformation.c"
+#line 2746 "ColorTransformation.c"
 	}
-#line 233 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 234 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return NULL;
-#line 2671 "ColorTransformation.c"
+#line 2750 "ColorTransformation.c"
 }
 
 
 static gchar* value_pixel_transformation_bundle_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 	PixelTransformationBundle** object_p;
 	object_p = collect_values[0].v_pointer;
-#line 233 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 234 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (!object_p) {
-#line 233 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 234 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 2682 "ColorTransformation.c"
+#line 2761 "ColorTransformation.c"
 	}
-#line 233 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 234 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (!value->data[0].v_pointer) {
-#line 233 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 234 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		*object_p = NULL;
-#line 2688 "ColorTransformation.c"
+#line 2767 "ColorTransformation.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 233 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 234 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		*object_p = value->data[0].v_pointer;
-#line 2692 "ColorTransformation.c"
+#line 2771 "ColorTransformation.c"
 	} else {
-#line 233 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 234 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		*object_p = pixel_transformation_bundle_ref (value->data[0].v_pointer);
-#line 2696 "ColorTransformation.c"
+#line 2775 "ColorTransformation.c"
 	}
-#line 233 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 234 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return NULL;
-#line 2700 "ColorTransformation.c"
+#line 2779 "ColorTransformation.c"
 }
 
 
 GParamSpec* param_spec_pixel_transformation_bundle (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
 	ParamSpecPixelTransformationBundle* spec;
-#line 233 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 234 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, TYPE_PIXEL_TRANSFORMATION_BUNDLE), NULL);
-#line 233 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 234 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 233 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 234 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 233 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 234 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return G_PARAM_SPEC (spec);
-#line 2714 "ColorTransformation.c"
+#line 2793 "ColorTransformation.c"
 }
 
 
 gpointer value_get_pixel_transformation_bundle (const GValue* value) {
-#line 233 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 234 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PIXEL_TRANSFORMATION_BUNDLE), NULL);
-#line 233 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 234 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return value->data[0].v_pointer;
-#line 2723 "ColorTransformation.c"
+#line 2802 "ColorTransformation.c"
 }
 
 
 void value_set_pixel_transformation_bundle (GValue* value, gpointer v_object) {
 	PixelTransformationBundle* old;
-#line 233 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 234 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PIXEL_TRANSFORMATION_BUNDLE));
-#line 233 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 234 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	old = value->data[0].v_pointer;
-#line 233 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 234 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (v_object) {
-#line 233 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 234 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_PIXEL_TRANSFORMATION_BUNDLE));
-#line 233 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 234 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 233 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 234 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		value->data[0].v_pointer = v_object;
-#line 233 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 234 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		pixel_transformation_bundle_ref (value->data[0].v_pointer);
-#line 2743 "ColorTransformation.c"
+#line 2822 "ColorTransformation.c"
 	} else {
-#line 233 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 234 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		value->data[0].v_pointer = NULL;
-#line 2747 "ColorTransformation.c"
+#line 2826 "ColorTransformation.c"
 	}
-#line 233 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 234 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (old) {
-#line 233 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 234 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		pixel_transformation_bundle_unref (old);
-#line 2753 "ColorTransformation.c"
+#line 2832 "ColorTransformation.c"
 	}
 }
 
 
 void value_take_pixel_transformation_bundle (GValue* value, gpointer v_object) {
 	PixelTransformationBundle* old;
-#line 233 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 234 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PIXEL_TRANSFORMATION_BUNDLE));
-#line 233 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 234 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	old = value->data[0].v_pointer;
-#line 233 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 234 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (v_object) {
-#line 233 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 234 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_PIXEL_TRANSFORMATION_BUNDLE));
-#line 233 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 234 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 233 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 234 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		value->data[0].v_pointer = v_object;
-#line 2772 "ColorTransformation.c"
+#line 2851 "ColorTransformation.c"
 	} else {
-#line 233 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 234 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		value->data[0].v_pointer = NULL;
-#line 2776 "ColorTransformation.c"
+#line 2855 "ColorTransformation.c"
 	}
-#line 233 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 234 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (old) {
-#line 233 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 234 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		pixel_transformation_bundle_unref (old);
-#line 2782 "ColorTransformation.c"
+#line 2861 "ColorTransformation.c"
 	}
 }
 
 
 static void pixel_transformation_bundle_class_init (PixelTransformationBundleClass * klass) {
-#line 233 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 234 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	pixel_transformation_bundle_parent_class = g_type_class_peek_parent (klass);
-#line 233 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 234 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	((PixelTransformationBundleClass *) klass)->finalize = pixel_transformation_bundle_finalize;
-#line 233 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 234 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_type_class_add_private (klass, sizeof (PixelTransformationBundlePrivate));
-#line 2794 "ColorTransformation.c"
+#line 2873 "ColorTransformation.c"
 }
 
 
@@ -2803,31 +2882,31 @@ static void pixel_transformation_bundle_instance_init (PixelTransformationBundle
 	GDestroyNotify _tmp4_ = NULL;
 	GeeEqualDataFunc _tmp5_ = NULL;
 	GeeHashMap* _tmp6_ = NULL;
-#line 233 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 234 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv = PIXEL_TRANSFORMATION_BUNDLE_GET_PRIVATE (self);
-#line 236 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 237 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp2_ = gee_functions_get_hash_func_for (G_TYPE_INT, &_tmp0_, &_tmp1_);
-#line 236 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 237 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp5_ = gee_functions_get_equal_func_for (G_TYPE_INT, &_tmp3_, &_tmp4_);
-#line 236 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 237 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp6_ = gee_hash_map_new (G_TYPE_INT, NULL, NULL, TYPE_PIXEL_TRANSFORMATION, (GBoxedCopyFunc) pixel_transformation_ref, pixel_transformation_unref, _tmp2_, _tmp0_, _tmp1_, _tmp5_, _tmp3_, _tmp4_, NULL, NULL, NULL);
-#line 236 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 237 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv->map = _tmp6_;
-#line 233 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 234 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->ref_count = 1;
-#line 2818 "ColorTransformation.c"
+#line 2897 "ColorTransformation.c"
 }
 
 
 static void pixel_transformation_bundle_finalize (PixelTransformationBundle* obj) {
 	PixelTransformationBundle * self;
-#line 233 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 234 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PIXEL_TRANSFORMATION_BUNDLE, PixelTransformationBundle);
-#line 233 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 234 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_signal_handlers_destroy (self);
-#line 236 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 237 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_g_object_unref0 (self->priv->map);
-#line 2830 "ColorTransformation.c"
+#line 2909 "ColorTransformation.c"
 }
 
 
@@ -2848,24 +2927,24 @@ GType pixel_transformation_bundle_get_type (void) {
 gpointer pixel_transformation_bundle_ref (gpointer instance) {
 	PixelTransformationBundle* self;
 	self = instance;
-#line 233 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 234 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_atomic_int_inc (&self->ref_count);
-#line 233 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 234 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return instance;
-#line 2855 "ColorTransformation.c"
+#line 2934 "ColorTransformation.c"
 }
 
 
 void pixel_transformation_bundle_unref (gpointer instance) {
 	PixelTransformationBundle* self;
 	self = instance;
-#line 233 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 234 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 233 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 234 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		PIXEL_TRANSFORMATION_BUNDLE_GET_CLASS (self)->finalize (self);
-#line 233 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 234 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 2868 "ColorTransformation.c"
+#line 2947 "ColorTransformation.c"
 	}
 }
 
@@ -2873,416 +2952,416 @@ void pixel_transformation_bundle_unref (gpointer instance) {
 PixelTransformation* pixel_transformation_construct (GType object_type, PixelTransformationType type) {
 	PixelTransformation* self = NULL;
 	PixelTransformationType _tmp0_ = 0;
-#line 365 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 373 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self = (PixelTransformation*) g_type_create_instance (object_type);
-#line 366 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 374 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp0_ = type;
-#line 366 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 374 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv->type = _tmp0_;
-#line 365 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 373 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return self;
-#line 2884 "ColorTransformation.c"
+#line 2963 "ColorTransformation.c"
 }
 
 
 PixelTransformationType pixel_transformation_get_transformation_type (PixelTransformation* self) {
 	PixelTransformationType result = 0;
 	PixelTransformationType _tmp0_ = 0;
-#line 369 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 377 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_return_val_if_fail (IS_PIXEL_TRANSFORMATION (self), 0);
-#line 370 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 378 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp0_ = self->priv->type;
-#line 370 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 378 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	result = _tmp0_;
-#line 370 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 378 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return result;
-#line 2899 "ColorTransformation.c"
+#line 2978 "ColorTransformation.c"
 }
 
 
 static PixelFormat pixel_transformation_real_get_preferred_format (PixelTransformation* self) {
-#line 373 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 381 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_critical ("Type `%s' does not implement abstract method `pixel_transformation_get_preferred_format'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
-#line 373 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 381 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return 0;
-#line 2908 "ColorTransformation.c"
+#line 2987 "ColorTransformation.c"
 }
 
 
 PixelFormat pixel_transformation_get_preferred_format (PixelTransformation* self) {
-#line 373 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 381 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_return_val_if_fail (IS_PIXEL_TRANSFORMATION (self), 0);
-#line 373 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 381 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return PIXEL_TRANSFORMATION_GET_CLASS (self)->get_preferred_format (self);
-#line 2917 "ColorTransformation.c"
+#line 2996 "ColorTransformation.c"
 }
 
 
 static CompositionMode pixel_transformation_real_get_composition_mode (PixelTransformation* self) {
 	CompositionMode result = 0;
-#line 376 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 384 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	result = COMPOSITION_MODE_NONE;
-#line 376 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 384 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return result;
-#line 2927 "ColorTransformation.c"
+#line 3006 "ColorTransformation.c"
 }
 
 
 CompositionMode pixel_transformation_get_composition_mode (PixelTransformation* self) {
-#line 375 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 383 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_return_val_if_fail (IS_PIXEL_TRANSFORMATION (self), 0);
-#line 375 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 383 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return PIXEL_TRANSFORMATION_GET_CLASS (self)->get_composition_mode (self);
-#line 2936 "ColorTransformation.c"
+#line 3015 "ColorTransformation.c"
 }
 
 
 static void pixel_transformation_real_compose_with (PixelTransformation* self, PixelTransformation* other) {
-#line 379 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 387 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_return_if_fail (IS_PIXEL_TRANSFORMATION (other));
-#line 380 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	g_error ("ColorTransformation.vala:380: %s", "PixelTransformation: compose_with( ): this type of pixel " "transformation doesn't support composition.");
-#line 2945 "ColorTransformation.c"
+#line 388 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	g_error ("ColorTransformation.vala:388: %s", "PixelTransformation: compose_with( ): this type of pixel " "transformation doesn't support composition.");
+#line 3024 "ColorTransformation.c"
 }
 
 
 void pixel_transformation_compose_with (PixelTransformation* self, PixelTransformation* other) {
-#line 379 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 387 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_return_if_fail (IS_PIXEL_TRANSFORMATION (self));
-#line 379 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 387 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	PIXEL_TRANSFORMATION_GET_CLASS (self)->compose_with (self, other);
-#line 2954 "ColorTransformation.c"
+#line 3033 "ColorTransformation.c"
 }
 
 
 static gboolean pixel_transformation_real_is_identity (PixelTransformation* self) {
 	gboolean result = FALSE;
-#line 385 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 393 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	result = TRUE;
-#line 385 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 393 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return result;
-#line 2964 "ColorTransformation.c"
+#line 3043 "ColorTransformation.c"
 }
 
 
 gboolean pixel_transformation_is_identity (PixelTransformation* self) {
-#line 384 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 392 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_return_val_if_fail (IS_PIXEL_TRANSFORMATION (self), FALSE);
-#line 384 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 392 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return PIXEL_TRANSFORMATION_GET_CLASS (self)->is_identity (self);
-#line 2973 "ColorTransformation.c"
+#line 3052 "ColorTransformation.c"
 }
 
 
 static void pixel_transformation_real_transform_pixel_hsv (PixelTransformation* self, HSVAnalyticPixel* p, HSVAnalyticPixel* result) {
 	HSVAnalyticPixel _tmp0_ = {0};
-#line 388 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 396 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_return_if_fail (p != NULL);
-#line 389 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 397 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp0_ = *p;
-#line 389 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 397 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	*result = _tmp0_;
-#line 389 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 397 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return;
-#line 2987 "ColorTransformation.c"
+#line 3066 "ColorTransformation.c"
 }
 
 
 void pixel_transformation_transform_pixel_hsv (PixelTransformation* self, HSVAnalyticPixel* p, HSVAnalyticPixel* result) {
-#line 388 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 396 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_return_if_fail (IS_PIXEL_TRANSFORMATION (self));
-#line 388 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 396 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	PIXEL_TRANSFORMATION_GET_CLASS (self)->transform_pixel_hsv (self, p, result);
-#line 2996 "ColorTransformation.c"
+#line 3075 "ColorTransformation.c"
 }
 
 
 static void pixel_transformation_real_transform_pixel_rgb (PixelTransformation* self, RGBAnalyticPixel* p, RGBAnalyticPixel* result) {
 	RGBAnalyticPixel _tmp0_ = {0};
-#line 392 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 400 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_return_if_fail (p != NULL);
-#line 393 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 401 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp0_ = *p;
-#line 393 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 401 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	*result = _tmp0_;
-#line 393 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 401 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return;
-#line 3010 "ColorTransformation.c"
+#line 3089 "ColorTransformation.c"
 }
 
 
 void pixel_transformation_transform_pixel_rgb (PixelTransformation* self, RGBAnalyticPixel* p, RGBAnalyticPixel* result) {
-#line 392 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 400 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_return_if_fail (IS_PIXEL_TRANSFORMATION (self));
-#line 392 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 400 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	PIXEL_TRANSFORMATION_GET_CLASS (self)->transform_pixel_rgb (self, p, result);
-#line 3019 "ColorTransformation.c"
+#line 3098 "ColorTransformation.c"
 }
 
 
 static gchar* pixel_transformation_real_to_string (PixelTransformation* self) {
 	gchar* result = NULL;
 	gchar* _tmp0_ = NULL;
-#line 397 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 405 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp0_ = g_strdup ("PixelTransformation");
-#line 397 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 405 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	result = _tmp0_;
-#line 397 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 405 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return result;
-#line 3032 "ColorTransformation.c"
+#line 3111 "ColorTransformation.c"
 }
 
 
 gchar* pixel_transformation_to_string (PixelTransformation* self) {
-#line 396 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 404 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_return_val_if_fail (IS_PIXEL_TRANSFORMATION (self), NULL);
-#line 396 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 404 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return PIXEL_TRANSFORMATION_GET_CLASS (self)->to_string (self);
-#line 3041 "ColorTransformation.c"
+#line 3120 "ColorTransformation.c"
 }
 
 
 static PixelTransformation* pixel_transformation_real_copy (PixelTransformation* self) {
-#line 400 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 408 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_critical ("Type `%s' does not implement abstract method `pixel_transformation_copy'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
-#line 400 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 408 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return NULL;
-#line 3050 "ColorTransformation.c"
+#line 3129 "ColorTransformation.c"
 }
 
 
 PixelTransformation* pixel_transformation_copy (PixelTransformation* self) {
-#line 400 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 408 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_return_val_if_fail (IS_PIXEL_TRANSFORMATION (self), NULL);
-#line 400 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 408 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return PIXEL_TRANSFORMATION_GET_CLASS (self)->copy (self);
-#line 3059 "ColorTransformation.c"
+#line 3138 "ColorTransformation.c"
 }
 
 
 static void value_pixel_transformation_init (GValue* value) {
-#line 362 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 370 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	value->data[0].v_pointer = NULL;
-#line 3066 "ColorTransformation.c"
+#line 3145 "ColorTransformation.c"
 }
 
 
 static void value_pixel_transformation_free_value (GValue* value) {
-#line 362 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 370 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (value->data[0].v_pointer) {
-#line 362 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 370 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		pixel_transformation_unref (value->data[0].v_pointer);
-#line 3075 "ColorTransformation.c"
+#line 3154 "ColorTransformation.c"
 	}
 }
 
 
 static void value_pixel_transformation_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 362 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 370 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (src_value->data[0].v_pointer) {
-#line 362 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 370 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		dest_value->data[0].v_pointer = pixel_transformation_ref (src_value->data[0].v_pointer);
-#line 3085 "ColorTransformation.c"
+#line 3164 "ColorTransformation.c"
 	} else {
-#line 362 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 370 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 3089 "ColorTransformation.c"
+#line 3168 "ColorTransformation.c"
 	}
 }
 
 
 static gpointer value_pixel_transformation_peek_pointer (const GValue* value) {
-#line 362 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 370 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return value->data[0].v_pointer;
-#line 3097 "ColorTransformation.c"
+#line 3176 "ColorTransformation.c"
 }
 
 
 static gchar* value_pixel_transformation_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 362 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 370 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (collect_values[0].v_pointer) {
-#line 3104 "ColorTransformation.c"
+#line 3183 "ColorTransformation.c"
 		PixelTransformation* object;
 		object = collect_values[0].v_pointer;
-#line 362 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 370 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		if (object->parent_instance.g_class == NULL) {
-#line 362 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 370 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 3111 "ColorTransformation.c"
+#line 3190 "ColorTransformation.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 362 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 370 "/home/jens/Source/shotwell/src/ColorTransformation.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 3115 "ColorTransformation.c"
+#line 3194 "ColorTransformation.c"
 		}
-#line 362 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 370 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		value->data[0].v_pointer = pixel_transformation_ref (object);
-#line 3119 "ColorTransformation.c"
+#line 3198 "ColorTransformation.c"
 	} else {
-#line 362 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 370 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		value->data[0].v_pointer = NULL;
-#line 3123 "ColorTransformation.c"
+#line 3202 "ColorTransformation.c"
 	}
-#line 362 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 370 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return NULL;
-#line 3127 "ColorTransformation.c"
+#line 3206 "ColorTransformation.c"
 }
 
 
 static gchar* value_pixel_transformation_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 	PixelTransformation** object_p;
 	object_p = collect_values[0].v_pointer;
-#line 362 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 370 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (!object_p) {
-#line 362 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 370 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 3138 "ColorTransformation.c"
+#line 3217 "ColorTransformation.c"
 	}
-#line 362 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 370 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (!value->data[0].v_pointer) {
-#line 362 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 370 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		*object_p = NULL;
-#line 3144 "ColorTransformation.c"
+#line 3223 "ColorTransformation.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 362 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 370 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		*object_p = value->data[0].v_pointer;
-#line 3148 "ColorTransformation.c"
+#line 3227 "ColorTransformation.c"
 	} else {
-#line 362 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 370 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		*object_p = pixel_transformation_ref (value->data[0].v_pointer);
-#line 3152 "ColorTransformation.c"
+#line 3231 "ColorTransformation.c"
 	}
-#line 362 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 370 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return NULL;
-#line 3156 "ColorTransformation.c"
+#line 3235 "ColorTransformation.c"
 }
 
 
 GParamSpec* param_spec_pixel_transformation (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
 	ParamSpecPixelTransformation* spec;
-#line 362 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 370 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, TYPE_PIXEL_TRANSFORMATION), NULL);
-#line 362 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 370 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 362 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 370 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 362 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 370 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return G_PARAM_SPEC (spec);
-#line 3170 "ColorTransformation.c"
+#line 3249 "ColorTransformation.c"
 }
 
 
 gpointer value_get_pixel_transformation (const GValue* value) {
-#line 362 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 370 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PIXEL_TRANSFORMATION), NULL);
-#line 362 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 370 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return value->data[0].v_pointer;
-#line 3179 "ColorTransformation.c"
+#line 3258 "ColorTransformation.c"
 }
 
 
 void value_set_pixel_transformation (GValue* value, gpointer v_object) {
 	PixelTransformation* old;
-#line 362 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 370 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PIXEL_TRANSFORMATION));
-#line 362 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 370 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	old = value->data[0].v_pointer;
-#line 362 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 370 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (v_object) {
-#line 362 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 370 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_PIXEL_TRANSFORMATION));
-#line 362 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 370 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 362 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 370 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		value->data[0].v_pointer = v_object;
-#line 362 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 370 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		pixel_transformation_ref (value->data[0].v_pointer);
-#line 3199 "ColorTransformation.c"
+#line 3278 "ColorTransformation.c"
 	} else {
-#line 362 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 370 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		value->data[0].v_pointer = NULL;
-#line 3203 "ColorTransformation.c"
+#line 3282 "ColorTransformation.c"
 	}
-#line 362 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 370 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (old) {
-#line 362 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 370 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		pixel_transformation_unref (old);
-#line 3209 "ColorTransformation.c"
+#line 3288 "ColorTransformation.c"
 	}
 }
 
 
 void value_take_pixel_transformation (GValue* value, gpointer v_object) {
 	PixelTransformation* old;
-#line 362 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 370 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PIXEL_TRANSFORMATION));
-#line 362 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 370 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	old = value->data[0].v_pointer;
-#line 362 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 370 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (v_object) {
-#line 362 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 370 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_PIXEL_TRANSFORMATION));
-#line 362 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 370 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 362 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 370 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		value->data[0].v_pointer = v_object;
-#line 3228 "ColorTransformation.c"
+#line 3307 "ColorTransformation.c"
 	} else {
-#line 362 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 370 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		value->data[0].v_pointer = NULL;
-#line 3232 "ColorTransformation.c"
+#line 3311 "ColorTransformation.c"
 	}
-#line 362 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 370 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (old) {
-#line 362 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 370 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		pixel_transformation_unref (old);
-#line 3238 "ColorTransformation.c"
+#line 3317 "ColorTransformation.c"
 	}
 }
 
 
 static void pixel_transformation_class_init (PixelTransformationClass * klass) {
-#line 362 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 370 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	pixel_transformation_parent_class = g_type_class_peek_parent (klass);
-#line 362 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 370 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	((PixelTransformationClass *) klass)->finalize = pixel_transformation_finalize;
-#line 362 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 370 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_type_class_add_private (klass, sizeof (PixelTransformationPrivate));
-#line 362 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 370 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	((PixelTransformationClass *) klass)->get_preferred_format = pixel_transformation_real_get_preferred_format;
-#line 362 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 370 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	((PixelTransformationClass *) klass)->get_composition_mode = pixel_transformation_real_get_composition_mode;
-#line 362 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 370 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	((PixelTransformationClass *) klass)->compose_with = pixel_transformation_real_compose_with;
-#line 362 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 370 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	((PixelTransformationClass *) klass)->is_identity = pixel_transformation_real_is_identity;
-#line 362 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 370 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	((PixelTransformationClass *) klass)->transform_pixel_hsv = pixel_transformation_real_transform_pixel_hsv;
-#line 362 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 370 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	((PixelTransformationClass *) klass)->transform_pixel_rgb = pixel_transformation_real_transform_pixel_rgb;
-#line 362 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 370 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	((PixelTransformationClass *) klass)->to_string = pixel_transformation_real_to_string;
-#line 362 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 370 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	((PixelTransformationClass *) klass)->copy = pixel_transformation_real_copy;
-#line 3266 "ColorTransformation.c"
+#line 3345 "ColorTransformation.c"
 }
 
 
 static void pixel_transformation_instance_init (PixelTransformation * self) {
-#line 362 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 370 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv = PIXEL_TRANSFORMATION_GET_PRIVATE (self);
-#line 362 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 370 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->ref_count = 1;
-#line 3275 "ColorTransformation.c"
+#line 3354 "ColorTransformation.c"
 }
 
 
 static void pixel_transformation_finalize (PixelTransformation* obj) {
 	PixelTransformation * self;
-#line 362 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 370 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PIXEL_TRANSFORMATION, PixelTransformation);
-#line 362 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 370 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_signal_handlers_destroy (self);
-#line 3285 "ColorTransformation.c"
+#line 3364 "ColorTransformation.c"
 }
 
 
@@ -3303,24 +3382,24 @@ GType pixel_transformation_get_type (void) {
 gpointer pixel_transformation_ref (gpointer instance) {
 	PixelTransformation* self;
 	self = instance;
-#line 362 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 370 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_atomic_int_inc (&self->ref_count);
-#line 362 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 370 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return instance;
-#line 3310 "ColorTransformation.c"
+#line 3389 "ColorTransformation.c"
 }
 
 
 void pixel_transformation_unref (gpointer instance) {
 	PixelTransformation* self;
 	self = instance;
-#line 362 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 370 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 362 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 370 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		PIXEL_TRANSFORMATION_GET_CLASS (self)->finalize (self);
-#line 362 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 370 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 3323 "ColorTransformation.c"
+#line 3402 "ColorTransformation.c"
 	}
 }
 
@@ -3329,93 +3408,93 @@ RGBTransformation* rgb_transformation_construct (GType object_type, PixelTransfo
 	RGBTransformation* self = NULL;
 	PixelTransformationType _tmp0_ = 0;
 	gfloat* _tmp1_ = NULL;
-#line 413 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 421 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp0_ = type;
-#line 413 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 421 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self = (RGBTransformation*) pixel_transformation_construct (object_type, _tmp0_);
-#line 419 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 427 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp1_ = g_new0 (gfloat, 16);
-#line 419 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 427 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp1_[0] = 1.0f;
-#line 419 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 427 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp1_[1] = 0.0f;
-#line 419 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 427 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp1_[2] = 0.0f;
-#line 419 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 427 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp1_[3] = 0.0f;
-#line 419 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 427 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp1_[4] = 0.0f;
-#line 419 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 427 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp1_[5] = 1.0f;
-#line 419 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 427 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp1_[6] = 0.0f;
-#line 419 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 427 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp1_[7] = 0.0f;
-#line 419 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 427 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp1_[8] = 0.0f;
-#line 419 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 427 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp1_[9] = 0.0f;
-#line 419 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 427 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp1_[10] = 1.0f;
-#line 419 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 427 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp1_[11] = 0.0f;
-#line 419 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 427 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp1_[12] = 0.0f;
-#line 419 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 427 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp1_[13] = 0.0f;
-#line 419 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 427 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp1_[14] = 0.0f;
-#line 419 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 427 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp1_[15] = 1.0f;
-#line 419 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 427 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->matrix_entries = (g_free (self->matrix_entries), NULL);
-#line 419 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 427 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->matrix_entries = _tmp1_;
-#line 419 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 427 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->matrix_entries_length1 = 16;
-#line 412 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 420 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return self;
-#line 3378 "ColorTransformation.c"
+#line 3457 "ColorTransformation.c"
 }
 
 
 RGBTransformation* rgb_transformation_new (PixelTransformationType type) {
-#line 412 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 420 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return rgb_transformation_construct (TYPE_RGB_TRANSFORMATION, type);
-#line 3385 "ColorTransformation.c"
+#line 3464 "ColorTransformation.c"
 }
 
 
 static PixelFormat rgb_transformation_real_get_preferred_format (PixelTransformation* base) {
 	RGBTransformation * self;
 	PixelFormat result = 0;
-#line 426 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 434 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_RGB_TRANSFORMATION, RGBTransformation);
-#line 427 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 435 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	result = PIXEL_FORMAT_RGB;
-#line 427 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 435 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return result;
-#line 3398 "ColorTransformation.c"
+#line 3477 "ColorTransformation.c"
 }
 
 
 static CompositionMode rgb_transformation_real_get_composition_mode (PixelTransformation* base) {
 	RGBTransformation * self;
 	CompositionMode result = 0;
-#line 430 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 438 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_RGB_TRANSFORMATION, RGBTransformation);
-#line 431 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 439 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	result = COMPOSITION_MODE_RGB_MATRIX;
-#line 431 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 439 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return result;
-#line 3411 "ColorTransformation.c"
+#line 3490 "ColorTransformation.c"
 }
 
 
 static gpointer _pixel_transformation_ref0 (gpointer self) {
-#line 439 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 447 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return self ? pixel_transformation_ref (self) : NULL;
-#line 3418 "ColorTransformation.c"
+#line 3497 "ColorTransformation.c"
 }
 
 
@@ -3928,1071 +4007,1071 @@ static void rgb_transformation_real_compose_with (PixelTransformation* base, Pix
 	gfloat _tmp356_ = 0.0F;
 	gboolean _tmp366_ = FALSE;
 	gboolean _tmp367_ = FALSE;
-#line 434 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 442 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_RGB_TRANSFORMATION, RGBTransformation);
-#line 434 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 442 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_return_if_fail (IS_PIXEL_TRANSFORMATION (other));
-#line 435 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 443 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp0_ = other;
-#line 435 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 443 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp1_ = pixel_transformation_get_composition_mode (_tmp0_);
-#line 435 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 443 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (_tmp1_ != COMPOSITION_MODE_RGB_MATRIX) {
-#line 436 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-		g_error ("ColorTransformation.vala:436: %s", "RGBTransformation: compose_with( ): 'other' transformation " "does not support RGB_MATRIX composition mode");
-#line 3943 "ColorTransformation.c"
+#line 444 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+		g_error ("ColorTransformation.vala:444: %s", "RGBTransformation: compose_with( ): 'other' transformation " "does not support RGB_MATRIX composition mode");
+#line 4022 "ColorTransformation.c"
 	}
-#line 439 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 447 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp2_ = other;
-#line 439 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 447 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp3_ = _pixel_transformation_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_RGB_TRANSFORMATION, RGBTransformation));
-#line 439 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 447 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	transform = _tmp3_;
-#line 441 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 449 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp4_ = g_new0 (gfloat, 16);
-#line 441 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 449 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	result_matrix_entries = _tmp4_;
-#line 441 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 449 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	result_matrix_entries_length1 = 16;
-#line 441 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 449 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_result_matrix_entries_size_ = result_matrix_entries_length1;
-#line 444 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 452 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp5_ = result_matrix_entries;
-#line 444 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 452 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp5__length1 = result_matrix_entries_length1;
-#line 444 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 452 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp6_ = transform;
-#line 444 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 452 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp7_ = _tmp6_->matrix_entries;
-#line 444 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 452 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp7__length1 = _tmp6_->matrix_entries_length1;
-#line 444 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 452 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp8_ = _tmp7_[0];
-#line 444 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 452 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp9_ = self->matrix_entries;
-#line 444 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 452 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp9__length1 = self->matrix_entries_length1;
-#line 444 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 452 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp10_ = _tmp9_[0];
-#line 444 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 452 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp11_ = transform;
-#line 444 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 452 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp12_ = _tmp11_->matrix_entries;
-#line 444 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 452 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp12__length1 = _tmp11_->matrix_entries_length1;
-#line 444 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 452 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp13_ = _tmp12_[1];
-#line 444 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 452 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp14_ = self->matrix_entries;
-#line 444 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 452 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp14__length1 = self->matrix_entries_length1;
-#line 444 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 452 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp15_ = _tmp14_[4];
-#line 444 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 452 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp16_ = transform;
-#line 444 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 452 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp17_ = _tmp16_->matrix_entries;
-#line 444 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 452 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp17__length1 = _tmp16_->matrix_entries_length1;
-#line 444 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 452 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp18_ = _tmp17_[2];
-#line 444 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 452 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp19_ = self->matrix_entries;
-#line 444 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 452 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp19__length1 = self->matrix_entries_length1;
-#line 444 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 452 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp20_ = _tmp19_[8];
-#line 444 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 452 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp21_ = transform;
-#line 444 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 452 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp22_ = _tmp21_->matrix_entries;
-#line 444 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 452 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp22__length1 = _tmp21_->matrix_entries_length1;
-#line 444 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 452 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp23_ = _tmp22_[3];
-#line 444 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 452 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp24_ = self->matrix_entries;
-#line 444 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 452 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp24__length1 = self->matrix_entries_length1;
-#line 444 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 452 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp25_ = _tmp24_[12];
-#line 444 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 452 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp5_[0] = (((_tmp8_ * _tmp10_) + (_tmp13_ * _tmp15_)) + (_tmp18_ * _tmp20_)) + (_tmp23_ * _tmp25_);
-#line 444 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 452 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp26_ = _tmp5_[0];
-#line 450 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 458 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp27_ = result_matrix_entries;
-#line 450 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 458 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp27__length1 = result_matrix_entries_length1;
-#line 450 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 458 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp28_ = transform;
-#line 450 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 458 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp29_ = _tmp28_->matrix_entries;
-#line 450 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 458 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp29__length1 = _tmp28_->matrix_entries_length1;
-#line 450 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 458 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp30_ = _tmp29_[0];
-#line 450 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 458 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp31_ = self->matrix_entries;
-#line 450 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 458 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp31__length1 = self->matrix_entries_length1;
-#line 450 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 458 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp32_ = _tmp31_[1];
-#line 450 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 458 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp33_ = transform;
-#line 450 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 458 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp34_ = _tmp33_->matrix_entries;
-#line 450 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 458 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp34__length1 = _tmp33_->matrix_entries_length1;
-#line 450 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 458 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp35_ = _tmp34_[1];
-#line 450 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 458 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp36_ = self->matrix_entries;
-#line 450 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 458 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp36__length1 = self->matrix_entries_length1;
-#line 450 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 458 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp37_ = _tmp36_[5];
-#line 450 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 458 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp38_ = transform;
-#line 450 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 458 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp39_ = _tmp38_->matrix_entries;
-#line 450 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 458 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp39__length1 = _tmp38_->matrix_entries_length1;
-#line 450 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 458 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp40_ = _tmp39_[2];
-#line 450 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 458 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp41_ = self->matrix_entries;
-#line 450 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 458 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp41__length1 = self->matrix_entries_length1;
-#line 450 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 458 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp42_ = _tmp41_[9];
-#line 450 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 458 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp43_ = transform;
-#line 450 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 458 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp44_ = _tmp43_->matrix_entries;
-#line 450 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 458 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp44__length1 = _tmp43_->matrix_entries_length1;
-#line 450 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 458 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp45_ = _tmp44_[3];
-#line 450 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 458 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp46_ = self->matrix_entries;
-#line 450 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 458 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp46__length1 = self->matrix_entries_length1;
-#line 450 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 458 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp47_ = _tmp46_[13];
-#line 450 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 458 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp27_[1] = (((_tmp30_ * _tmp32_) + (_tmp35_ * _tmp37_)) + (_tmp40_ * _tmp42_)) + (_tmp45_ * _tmp47_);
-#line 450 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 458 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp48_ = _tmp27_[1];
-#line 456 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 464 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp49_ = result_matrix_entries;
-#line 456 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 464 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp49__length1 = result_matrix_entries_length1;
-#line 456 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 464 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp50_ = transform;
-#line 456 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 464 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp51_ = _tmp50_->matrix_entries;
-#line 456 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 464 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp51__length1 = _tmp50_->matrix_entries_length1;
-#line 456 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 464 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp52_ = _tmp51_[0];
-#line 456 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 464 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp53_ = self->matrix_entries;
-#line 456 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 464 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp53__length1 = self->matrix_entries_length1;
-#line 456 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 464 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp54_ = _tmp53_[2];
-#line 456 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 464 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp55_ = transform;
-#line 456 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 464 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp56_ = _tmp55_->matrix_entries;
-#line 456 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 464 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp56__length1 = _tmp55_->matrix_entries_length1;
-#line 456 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 464 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp57_ = _tmp56_[1];
-#line 456 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 464 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp58_ = self->matrix_entries;
-#line 456 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 464 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp58__length1 = self->matrix_entries_length1;
-#line 456 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 464 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp59_ = _tmp58_[6];
-#line 456 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 464 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp60_ = transform;
-#line 456 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 464 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp61_ = _tmp60_->matrix_entries;
-#line 456 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 464 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp61__length1 = _tmp60_->matrix_entries_length1;
-#line 456 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 464 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp62_ = _tmp61_[2];
-#line 456 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 464 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp63_ = self->matrix_entries;
-#line 456 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 464 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp63__length1 = self->matrix_entries_length1;
-#line 456 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 464 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp64_ = _tmp63_[10];
-#line 456 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 464 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp65_ = transform;
-#line 456 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 464 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp66_ = _tmp65_->matrix_entries;
-#line 456 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 464 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp66__length1 = _tmp65_->matrix_entries_length1;
-#line 456 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 464 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp67_ = _tmp66_[3];
-#line 456 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 464 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp68_ = self->matrix_entries;
-#line 456 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 464 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp68__length1 = self->matrix_entries_length1;
-#line 456 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 464 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp69_ = _tmp68_[14];
-#line 456 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 464 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp49_[2] = (((_tmp52_ * _tmp54_) + (_tmp57_ * _tmp59_)) + (_tmp62_ * _tmp64_)) + (_tmp67_ * _tmp69_);
-#line 456 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 464 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp70_ = _tmp49_[2];
-#line 462 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 470 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp71_ = result_matrix_entries;
-#line 462 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 470 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp71__length1 = result_matrix_entries_length1;
-#line 462 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 470 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp72_ = transform;
-#line 462 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 470 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp73_ = _tmp72_->matrix_entries;
-#line 462 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 470 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp73__length1 = _tmp72_->matrix_entries_length1;
-#line 462 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 470 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp74_ = _tmp73_[0];
-#line 462 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 470 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp75_ = self->matrix_entries;
-#line 462 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 470 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp75__length1 = self->matrix_entries_length1;
-#line 462 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 470 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp76_ = _tmp75_[3];
-#line 462 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 470 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp77_ = transform;
-#line 462 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 470 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp78_ = _tmp77_->matrix_entries;
-#line 462 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 470 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp78__length1 = _tmp77_->matrix_entries_length1;
-#line 462 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 470 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp79_ = _tmp78_[1];
-#line 462 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 470 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp80_ = self->matrix_entries;
-#line 462 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 470 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp80__length1 = self->matrix_entries_length1;
-#line 462 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 470 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp81_ = _tmp80_[7];
-#line 462 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 470 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp82_ = transform;
-#line 462 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 470 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp83_ = _tmp82_->matrix_entries;
-#line 462 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 470 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp83__length1 = _tmp82_->matrix_entries_length1;
-#line 462 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 470 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp84_ = _tmp83_[2];
-#line 462 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 470 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp85_ = self->matrix_entries;
-#line 462 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 470 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp85__length1 = self->matrix_entries_length1;
-#line 462 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 470 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp86_ = _tmp85_[11];
-#line 462 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 470 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp87_ = transform;
-#line 462 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 470 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp88_ = _tmp87_->matrix_entries;
-#line 462 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 470 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp88__length1 = _tmp87_->matrix_entries_length1;
-#line 462 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 470 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp89_ = _tmp88_[3];
-#line 462 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 470 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp90_ = self->matrix_entries;
-#line 462 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 470 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp90__length1 = self->matrix_entries_length1;
-#line 462 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 470 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp91_ = _tmp90_[15];
-#line 462 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 470 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp71_[3] = (((_tmp74_ * _tmp76_) + (_tmp79_ * _tmp81_)) + (_tmp84_ * _tmp86_)) + (_tmp89_ * _tmp91_);
-#line 462 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 470 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp92_ = _tmp71_[3];
-#line 469 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 477 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp93_ = result_matrix_entries;
-#line 469 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 477 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp93__length1 = result_matrix_entries_length1;
-#line 469 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 477 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp94_ = transform;
-#line 469 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 477 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp95_ = _tmp94_->matrix_entries;
-#line 469 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 477 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp95__length1 = _tmp94_->matrix_entries_length1;
-#line 469 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 477 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp96_ = _tmp95_[4];
-#line 469 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 477 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp97_ = self->matrix_entries;
-#line 469 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 477 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp97__length1 = self->matrix_entries_length1;
-#line 469 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 477 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp98_ = _tmp97_[0];
-#line 469 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 477 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp99_ = transform;
-#line 469 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 477 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp100_ = _tmp99_->matrix_entries;
-#line 469 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 477 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp100__length1 = _tmp99_->matrix_entries_length1;
-#line 469 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 477 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp101_ = _tmp100_[5];
-#line 469 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 477 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp102_ = self->matrix_entries;
-#line 469 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 477 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp102__length1 = self->matrix_entries_length1;
-#line 469 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 477 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp103_ = _tmp102_[4];
-#line 469 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 477 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp104_ = transform;
-#line 469 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 477 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp105_ = _tmp104_->matrix_entries;
-#line 469 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 477 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp105__length1 = _tmp104_->matrix_entries_length1;
-#line 469 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 477 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp106_ = _tmp105_[6];
-#line 469 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 477 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp107_ = self->matrix_entries;
-#line 469 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 477 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp107__length1 = self->matrix_entries_length1;
-#line 469 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 477 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp108_ = _tmp107_[8];
-#line 469 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 477 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp109_ = transform;
-#line 469 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 477 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp110_ = _tmp109_->matrix_entries;
-#line 469 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 477 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp110__length1 = _tmp109_->matrix_entries_length1;
-#line 469 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 477 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp111_ = _tmp110_[7];
-#line 469 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 477 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp112_ = self->matrix_entries;
-#line 469 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 477 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp112__length1 = self->matrix_entries_length1;
-#line 469 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 477 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp113_ = _tmp112_[12];
-#line 469 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 477 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp93_[4] = (((_tmp96_ * _tmp98_) + (_tmp101_ * _tmp103_)) + (_tmp106_ * _tmp108_)) + (_tmp111_ * _tmp113_);
-#line 469 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 477 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp114_ = _tmp93_[4];
-#line 475 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 483 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp115_ = result_matrix_entries;
-#line 475 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 483 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp115__length1 = result_matrix_entries_length1;
-#line 475 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 483 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp116_ = transform;
-#line 475 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 483 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp117_ = _tmp116_->matrix_entries;
-#line 475 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 483 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp117__length1 = _tmp116_->matrix_entries_length1;
-#line 475 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 483 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp118_ = _tmp117_[4];
-#line 475 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 483 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp119_ = self->matrix_entries;
-#line 475 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 483 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp119__length1 = self->matrix_entries_length1;
-#line 475 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 483 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp120_ = _tmp119_[1];
-#line 475 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 483 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp121_ = transform;
-#line 475 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 483 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp122_ = _tmp121_->matrix_entries;
-#line 475 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 483 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp122__length1 = _tmp121_->matrix_entries_length1;
-#line 475 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 483 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp123_ = _tmp122_[5];
-#line 475 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 483 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp124_ = self->matrix_entries;
-#line 475 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 483 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp124__length1 = self->matrix_entries_length1;
-#line 475 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 483 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp125_ = _tmp124_[5];
-#line 475 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 483 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp126_ = transform;
-#line 475 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 483 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp127_ = _tmp126_->matrix_entries;
-#line 475 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 483 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp127__length1 = _tmp126_->matrix_entries_length1;
-#line 475 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 483 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp128_ = _tmp127_[6];
-#line 475 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 483 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp129_ = self->matrix_entries;
-#line 475 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 483 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp129__length1 = self->matrix_entries_length1;
-#line 475 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 483 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp130_ = _tmp129_[9];
-#line 475 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 483 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp131_ = transform;
-#line 475 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 483 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp132_ = _tmp131_->matrix_entries;
-#line 475 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 483 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp132__length1 = _tmp131_->matrix_entries_length1;
-#line 475 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 483 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp133_ = _tmp132_[7];
-#line 475 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 483 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp134_ = self->matrix_entries;
-#line 475 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 483 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp134__length1 = self->matrix_entries_length1;
-#line 475 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 483 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp135_ = _tmp134_[13];
-#line 475 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 483 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp115_[5] = (((_tmp118_ * _tmp120_) + (_tmp123_ * _tmp125_)) + (_tmp128_ * _tmp130_)) + (_tmp133_ * _tmp135_);
-#line 475 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 483 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp136_ = _tmp115_[5];
-#line 481 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 489 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp137_ = result_matrix_entries;
-#line 481 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 489 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp137__length1 = result_matrix_entries_length1;
-#line 481 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 489 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp138_ = transform;
-#line 481 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 489 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp139_ = _tmp138_->matrix_entries;
-#line 481 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 489 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp139__length1 = _tmp138_->matrix_entries_length1;
-#line 481 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 489 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp140_ = _tmp139_[4];
-#line 481 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 489 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp141_ = self->matrix_entries;
-#line 481 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 489 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp141__length1 = self->matrix_entries_length1;
-#line 481 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 489 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp142_ = _tmp141_[2];
-#line 481 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 489 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp143_ = transform;
-#line 481 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 489 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp144_ = _tmp143_->matrix_entries;
-#line 481 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 489 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp144__length1 = _tmp143_->matrix_entries_length1;
-#line 481 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 489 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp145_ = _tmp144_[5];
-#line 481 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 489 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp146_ = self->matrix_entries;
-#line 481 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 489 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp146__length1 = self->matrix_entries_length1;
-#line 481 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 489 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp147_ = _tmp146_[6];
-#line 481 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 489 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp148_ = transform;
-#line 481 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 489 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp149_ = _tmp148_->matrix_entries;
-#line 481 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 489 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp149__length1 = _tmp148_->matrix_entries_length1;
-#line 481 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 489 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp150_ = _tmp149_[6];
-#line 481 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 489 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp151_ = self->matrix_entries;
-#line 481 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 489 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp151__length1 = self->matrix_entries_length1;
-#line 481 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 489 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp152_ = _tmp151_[10];
-#line 481 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 489 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp153_ = transform;
-#line 481 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 489 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp154_ = _tmp153_->matrix_entries;
-#line 481 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 489 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp154__length1 = _tmp153_->matrix_entries_length1;
-#line 481 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 489 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp155_ = _tmp154_[7];
-#line 481 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 489 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp156_ = self->matrix_entries;
-#line 481 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 489 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp156__length1 = self->matrix_entries_length1;
-#line 481 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 489 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp157_ = _tmp156_[14];
-#line 481 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 489 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp137_[6] = (((_tmp140_ * _tmp142_) + (_tmp145_ * _tmp147_)) + (_tmp150_ * _tmp152_)) + (_tmp155_ * _tmp157_);
-#line 481 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 489 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp158_ = _tmp137_[6];
-#line 487 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 495 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp159_ = result_matrix_entries;
-#line 487 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 495 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp159__length1 = result_matrix_entries_length1;
-#line 487 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 495 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp160_ = transform;
-#line 487 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 495 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp161_ = _tmp160_->matrix_entries;
-#line 487 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 495 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp161__length1 = _tmp160_->matrix_entries_length1;
-#line 487 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 495 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp162_ = _tmp161_[4];
-#line 487 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 495 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp163_ = self->matrix_entries;
-#line 487 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 495 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp163__length1 = self->matrix_entries_length1;
-#line 487 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 495 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp164_ = _tmp163_[3];
-#line 487 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 495 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp165_ = transform;
-#line 487 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 495 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp166_ = _tmp165_->matrix_entries;
-#line 487 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 495 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp166__length1 = _tmp165_->matrix_entries_length1;
-#line 487 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 495 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp167_ = _tmp166_[5];
-#line 487 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 495 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp168_ = self->matrix_entries;
-#line 487 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 495 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp168__length1 = self->matrix_entries_length1;
-#line 487 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 495 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp169_ = _tmp168_[7];
-#line 487 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 495 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp170_ = transform;
-#line 487 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 495 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp171_ = _tmp170_->matrix_entries;
-#line 487 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 495 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp171__length1 = _tmp170_->matrix_entries_length1;
-#line 487 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 495 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp172_ = _tmp171_[6];
-#line 487 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 495 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp173_ = self->matrix_entries;
-#line 487 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 495 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp173__length1 = self->matrix_entries_length1;
-#line 487 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 495 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp174_ = _tmp173_[11];
-#line 487 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 495 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp175_ = transform;
-#line 487 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 495 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp176_ = _tmp175_->matrix_entries;
-#line 487 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 495 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp176__length1 = _tmp175_->matrix_entries_length1;
-#line 487 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 495 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp177_ = _tmp176_[7];
-#line 487 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 495 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp178_ = self->matrix_entries;
-#line 487 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 495 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp178__length1 = self->matrix_entries_length1;
-#line 487 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 495 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp179_ = _tmp178_[15];
-#line 487 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 495 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp159_[7] = (((_tmp162_ * _tmp164_) + (_tmp167_ * _tmp169_)) + (_tmp172_ * _tmp174_)) + (_tmp177_ * _tmp179_);
-#line 487 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 495 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp180_ = _tmp159_[7];
-#line 494 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 502 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp181_ = result_matrix_entries;
-#line 494 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 502 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp181__length1 = result_matrix_entries_length1;
-#line 494 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 502 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp182_ = transform;
-#line 494 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 502 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp183_ = _tmp182_->matrix_entries;
-#line 494 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 502 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp183__length1 = _tmp182_->matrix_entries_length1;
-#line 494 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 502 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp184_ = _tmp183_[8];
-#line 494 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 502 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp185_ = self->matrix_entries;
-#line 494 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 502 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp185__length1 = self->matrix_entries_length1;
-#line 494 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 502 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp186_ = _tmp185_[0];
-#line 494 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 502 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp187_ = transform;
-#line 494 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 502 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp188_ = _tmp187_->matrix_entries;
-#line 494 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 502 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp188__length1 = _tmp187_->matrix_entries_length1;
-#line 494 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 502 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp189_ = _tmp188_[9];
-#line 494 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 502 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp190_ = self->matrix_entries;
-#line 494 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 502 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp190__length1 = self->matrix_entries_length1;
-#line 494 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 502 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp191_ = _tmp190_[4];
-#line 494 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 502 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp192_ = transform;
-#line 494 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 502 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp193_ = _tmp192_->matrix_entries;
-#line 494 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 502 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp193__length1 = _tmp192_->matrix_entries_length1;
-#line 494 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 502 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp194_ = _tmp193_[10];
-#line 494 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 502 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp195_ = self->matrix_entries;
-#line 494 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 502 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp195__length1 = self->matrix_entries_length1;
-#line 494 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 502 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp196_ = _tmp195_[8];
-#line 494 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 502 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp197_ = transform;
-#line 494 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 502 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp198_ = _tmp197_->matrix_entries;
-#line 494 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 502 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp198__length1 = _tmp197_->matrix_entries_length1;
-#line 494 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 502 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp199_ = _tmp198_[11];
-#line 494 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 502 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp200_ = self->matrix_entries;
-#line 494 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 502 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp200__length1 = self->matrix_entries_length1;
-#line 494 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 502 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp201_ = _tmp200_[12];
-#line 494 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 502 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp181_[8] = (((_tmp184_ * _tmp186_) + (_tmp189_ * _tmp191_)) + (_tmp194_ * _tmp196_)) + (_tmp199_ * _tmp201_);
-#line 494 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 502 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp202_ = _tmp181_[8];
-#line 500 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 508 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp203_ = result_matrix_entries;
-#line 500 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 508 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp203__length1 = result_matrix_entries_length1;
-#line 500 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 508 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp204_ = transform;
-#line 500 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 508 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp205_ = _tmp204_->matrix_entries;
-#line 500 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 508 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp205__length1 = _tmp204_->matrix_entries_length1;
-#line 500 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 508 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp206_ = _tmp205_[8];
-#line 500 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 508 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp207_ = self->matrix_entries;
-#line 500 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 508 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp207__length1 = self->matrix_entries_length1;
-#line 500 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 508 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp208_ = _tmp207_[1];
-#line 500 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 508 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp209_ = transform;
-#line 500 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 508 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp210_ = _tmp209_->matrix_entries;
-#line 500 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 508 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp210__length1 = _tmp209_->matrix_entries_length1;
-#line 500 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 508 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp211_ = _tmp210_[9];
-#line 500 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 508 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp212_ = self->matrix_entries;
-#line 500 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 508 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp212__length1 = self->matrix_entries_length1;
-#line 500 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 508 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp213_ = _tmp212_[5];
-#line 500 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 508 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp214_ = transform;
-#line 500 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 508 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp215_ = _tmp214_->matrix_entries;
-#line 500 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 508 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp215__length1 = _tmp214_->matrix_entries_length1;
-#line 500 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 508 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp216_ = _tmp215_[10];
-#line 500 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 508 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp217_ = self->matrix_entries;
-#line 500 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 508 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp217__length1 = self->matrix_entries_length1;
-#line 500 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 508 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp218_ = _tmp217_[9];
-#line 500 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 508 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp219_ = transform;
-#line 500 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 508 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp220_ = _tmp219_->matrix_entries;
-#line 500 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 508 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp220__length1 = _tmp219_->matrix_entries_length1;
-#line 500 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 508 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp221_ = _tmp220_[11];
-#line 500 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 508 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp222_ = self->matrix_entries;
-#line 500 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 508 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp222__length1 = self->matrix_entries_length1;
-#line 500 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 508 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp223_ = _tmp222_[13];
-#line 500 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 508 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp203_[9] = (((_tmp206_ * _tmp208_) + (_tmp211_ * _tmp213_)) + (_tmp216_ * _tmp218_)) + (_tmp221_ * _tmp223_);
-#line 500 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 508 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp224_ = _tmp203_[9];
-#line 506 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 514 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp225_ = result_matrix_entries;
-#line 506 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 514 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp225__length1 = result_matrix_entries_length1;
-#line 506 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 514 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp226_ = transform;
-#line 506 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 514 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp227_ = _tmp226_->matrix_entries;
-#line 506 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 514 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp227__length1 = _tmp226_->matrix_entries_length1;
-#line 506 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 514 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp228_ = _tmp227_[8];
-#line 506 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 514 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp229_ = self->matrix_entries;
-#line 506 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 514 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp229__length1 = self->matrix_entries_length1;
-#line 506 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 514 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp230_ = _tmp229_[2];
-#line 506 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 514 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp231_ = transform;
-#line 506 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 514 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp232_ = _tmp231_->matrix_entries;
-#line 506 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 514 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp232__length1 = _tmp231_->matrix_entries_length1;
-#line 506 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 514 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp233_ = _tmp232_[9];
-#line 506 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 514 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp234_ = self->matrix_entries;
-#line 506 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 514 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp234__length1 = self->matrix_entries_length1;
-#line 506 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 514 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp235_ = _tmp234_[6];
-#line 506 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 514 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp236_ = transform;
-#line 506 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 514 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp237_ = _tmp236_->matrix_entries;
-#line 506 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 514 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp237__length1 = _tmp236_->matrix_entries_length1;
-#line 506 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 514 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp238_ = _tmp237_[10];
-#line 506 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 514 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp239_ = self->matrix_entries;
-#line 506 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 514 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp239__length1 = self->matrix_entries_length1;
-#line 506 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 514 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp240_ = _tmp239_[10];
-#line 506 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 514 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp241_ = transform;
-#line 506 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 514 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp242_ = _tmp241_->matrix_entries;
-#line 506 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 514 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp242__length1 = _tmp241_->matrix_entries_length1;
-#line 506 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 514 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp243_ = _tmp242_[11];
-#line 506 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 514 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp244_ = self->matrix_entries;
-#line 506 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 514 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp244__length1 = self->matrix_entries_length1;
-#line 506 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 514 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp245_ = _tmp244_[14];
-#line 506 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 514 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp225_[10] = (((_tmp228_ * _tmp230_) + (_tmp233_ * _tmp235_)) + (_tmp238_ * _tmp240_)) + (_tmp243_ * _tmp245_);
-#line 506 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 514 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp246_ = _tmp225_[10];
-#line 512 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 520 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp247_ = result_matrix_entries;
-#line 512 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 520 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp247__length1 = result_matrix_entries_length1;
-#line 512 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 520 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp248_ = transform;
-#line 512 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 520 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp249_ = _tmp248_->matrix_entries;
-#line 512 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 520 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp249__length1 = _tmp248_->matrix_entries_length1;
-#line 512 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 520 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp250_ = _tmp249_[8];
-#line 512 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 520 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp251_ = self->matrix_entries;
-#line 512 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 520 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp251__length1 = self->matrix_entries_length1;
-#line 512 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 520 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp252_ = _tmp251_[3];
-#line 512 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 520 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp253_ = transform;
-#line 512 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 520 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp254_ = _tmp253_->matrix_entries;
-#line 512 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 520 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp254__length1 = _tmp253_->matrix_entries_length1;
-#line 512 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 520 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp255_ = _tmp254_[9];
-#line 512 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 520 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp256_ = self->matrix_entries;
-#line 512 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 520 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp256__length1 = self->matrix_entries_length1;
-#line 512 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 520 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp257_ = _tmp256_[7];
-#line 512 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 520 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp258_ = transform;
-#line 512 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 520 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp259_ = _tmp258_->matrix_entries;
-#line 512 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 520 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp259__length1 = _tmp258_->matrix_entries_length1;
-#line 512 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 520 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp260_ = _tmp259_[10];
-#line 512 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 520 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp261_ = self->matrix_entries;
-#line 512 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 520 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp261__length1 = self->matrix_entries_length1;
-#line 512 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 520 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp262_ = _tmp261_[11];
-#line 512 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 520 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp263_ = transform;
-#line 512 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 520 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp264_ = _tmp263_->matrix_entries;
-#line 512 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 520 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp264__length1 = _tmp263_->matrix_entries_length1;
-#line 512 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 520 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp265_ = _tmp264_[11];
-#line 512 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 520 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp266_ = self->matrix_entries;
-#line 512 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 520 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp266__length1 = self->matrix_entries_length1;
-#line 512 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 520 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp267_ = _tmp266_[15];
-#line 512 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 520 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp247_[11] = (((_tmp250_ * _tmp252_) + (_tmp255_ * _tmp257_)) + (_tmp260_ * _tmp262_)) + (_tmp265_ * _tmp267_);
-#line 512 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 520 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp268_ = _tmp247_[11];
-#line 519 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 527 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp269_ = result_matrix_entries;
-#line 519 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 527 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp269__length1 = result_matrix_entries_length1;
-#line 519 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 527 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp270_ = transform;
-#line 519 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 527 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp271_ = _tmp270_->matrix_entries;
-#line 519 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 527 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp271__length1 = _tmp270_->matrix_entries_length1;
-#line 519 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 527 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp272_ = _tmp271_[12];
-#line 519 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 527 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp273_ = self->matrix_entries;
-#line 519 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 527 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp273__length1 = self->matrix_entries_length1;
-#line 519 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 527 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp274_ = _tmp273_[0];
-#line 519 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 527 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp275_ = transform;
-#line 519 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 527 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp276_ = _tmp275_->matrix_entries;
-#line 519 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 527 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp276__length1 = _tmp275_->matrix_entries_length1;
-#line 519 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 527 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp277_ = _tmp276_[13];
-#line 519 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 527 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp278_ = self->matrix_entries;
-#line 519 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 527 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp278__length1 = self->matrix_entries_length1;
-#line 519 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 527 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp279_ = _tmp278_[4];
-#line 519 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 527 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp280_ = transform;
-#line 519 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 527 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp281_ = _tmp280_->matrix_entries;
-#line 519 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 527 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp281__length1 = _tmp280_->matrix_entries_length1;
-#line 519 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 527 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp282_ = _tmp281_[14];
-#line 519 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 527 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp283_ = self->matrix_entries;
-#line 519 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 527 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp283__length1 = self->matrix_entries_length1;
-#line 519 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 527 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp284_ = _tmp283_[8];
-#line 519 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 527 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp285_ = transform;
-#line 519 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 527 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp286_ = _tmp285_->matrix_entries;
-#line 519 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 527 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp286__length1 = _tmp285_->matrix_entries_length1;
-#line 519 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 527 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp287_ = _tmp286_[15];
-#line 519 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 527 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp288_ = self->matrix_entries;
-#line 519 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 527 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp288__length1 = self->matrix_entries_length1;
-#line 519 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 527 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp289_ = _tmp288_[12];
-#line 519 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 527 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp269_[12] = (((_tmp272_ * _tmp274_) + (_tmp277_ * _tmp279_)) + (_tmp282_ * _tmp284_)) + (_tmp287_ * _tmp289_);
-#line 519 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 527 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp290_ = _tmp269_[12];
-#line 525 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 533 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp291_ = result_matrix_entries;
-#line 525 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 533 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp291__length1 = result_matrix_entries_length1;
-#line 525 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 533 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp292_ = transform;
-#line 525 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 533 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp293_ = _tmp292_->matrix_entries;
-#line 525 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 533 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp293__length1 = _tmp292_->matrix_entries_length1;
-#line 525 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 533 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp294_ = _tmp293_[12];
-#line 525 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 533 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp295_ = self->matrix_entries;
-#line 525 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 533 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp295__length1 = self->matrix_entries_length1;
-#line 525 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 533 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp296_ = _tmp295_[1];
-#line 525 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 533 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp297_ = transform;
-#line 525 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 533 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp298_ = _tmp297_->matrix_entries;
-#line 525 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 533 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp298__length1 = _tmp297_->matrix_entries_length1;
-#line 525 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 533 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp299_ = _tmp298_[13];
-#line 525 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 533 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp300_ = self->matrix_entries;
-#line 525 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 533 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp300__length1 = self->matrix_entries_length1;
-#line 525 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 533 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp301_ = _tmp300_[5];
-#line 525 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 533 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp302_ = transform;
-#line 525 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 533 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp303_ = _tmp302_->matrix_entries;
-#line 525 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 533 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp303__length1 = _tmp302_->matrix_entries_length1;
-#line 525 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 533 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp304_ = _tmp303_[14];
-#line 525 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 533 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp305_ = self->matrix_entries;
-#line 525 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 533 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp305__length1 = self->matrix_entries_length1;
-#line 525 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 533 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp306_ = _tmp305_[9];
-#line 525 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 533 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp307_ = transform;
-#line 525 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 533 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp308_ = _tmp307_->matrix_entries;
-#line 525 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 533 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp308__length1 = _tmp307_->matrix_entries_length1;
-#line 525 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 533 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp309_ = _tmp308_[15];
-#line 525 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 533 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp310_ = self->matrix_entries;
-#line 525 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 533 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp310__length1 = self->matrix_entries_length1;
-#line 525 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 533 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp311_ = _tmp310_[13];
-#line 525 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 533 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp291_[13] = (((_tmp294_ * _tmp296_) + (_tmp299_ * _tmp301_)) + (_tmp304_ * _tmp306_)) + (_tmp309_ * _tmp311_);
-#line 525 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 533 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp312_ = _tmp291_[13];
-#line 531 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 539 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp313_ = result_matrix_entries;
-#line 531 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 539 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp313__length1 = result_matrix_entries_length1;
-#line 531 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 539 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp314_ = transform;
-#line 531 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 539 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp315_ = _tmp314_->matrix_entries;
-#line 531 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 539 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp315__length1 = _tmp314_->matrix_entries_length1;
-#line 531 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 539 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp316_ = _tmp315_[12];
-#line 531 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 539 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp317_ = self->matrix_entries;
-#line 531 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 539 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp317__length1 = self->matrix_entries_length1;
-#line 531 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 539 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp318_ = _tmp317_[2];
-#line 531 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 539 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp319_ = transform;
-#line 531 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 539 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp320_ = _tmp319_->matrix_entries;
-#line 531 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 539 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp320__length1 = _tmp319_->matrix_entries_length1;
-#line 531 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 539 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp321_ = _tmp320_[13];
-#line 531 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 539 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp322_ = self->matrix_entries;
-#line 531 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 539 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp322__length1 = self->matrix_entries_length1;
-#line 531 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 539 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp323_ = _tmp322_[6];
-#line 531 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 539 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp324_ = transform;
-#line 531 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 539 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp325_ = _tmp324_->matrix_entries;
-#line 531 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 539 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp325__length1 = _tmp324_->matrix_entries_length1;
-#line 531 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 539 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp326_ = _tmp325_[14];
-#line 531 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 539 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp327_ = self->matrix_entries;
-#line 531 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 539 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp327__length1 = self->matrix_entries_length1;
-#line 531 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 539 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp328_ = _tmp327_[10];
-#line 531 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 539 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp329_ = transform;
-#line 531 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 539 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp330_ = _tmp329_->matrix_entries;
-#line 531 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 539 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp330__length1 = _tmp329_->matrix_entries_length1;
-#line 531 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 539 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp331_ = _tmp330_[15];
-#line 531 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 539 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp332_ = self->matrix_entries;
-#line 531 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 539 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp332__length1 = self->matrix_entries_length1;
-#line 531 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 539 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp333_ = _tmp332_[14];
-#line 531 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 539 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp313_[14] = (((_tmp316_ * _tmp318_) + (_tmp321_ * _tmp323_)) + (_tmp326_ * _tmp328_)) + (_tmp331_ * _tmp333_);
-#line 531 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 539 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp334_ = _tmp313_[14];
-#line 537 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 545 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp335_ = result_matrix_entries;
-#line 537 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 545 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp335__length1 = result_matrix_entries_length1;
-#line 537 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 545 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp336_ = transform;
-#line 537 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 545 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp337_ = _tmp336_->matrix_entries;
-#line 537 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 545 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp337__length1 = _tmp336_->matrix_entries_length1;
-#line 537 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 545 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp338_ = _tmp337_[12];
-#line 537 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 545 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp339_ = self->matrix_entries;
-#line 537 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 545 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp339__length1 = self->matrix_entries_length1;
-#line 537 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 545 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp340_ = _tmp339_[3];
-#line 537 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 545 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp341_ = transform;
-#line 537 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 545 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp342_ = _tmp341_->matrix_entries;
-#line 537 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 545 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp342__length1 = _tmp341_->matrix_entries_length1;
-#line 537 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 545 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp343_ = _tmp342_[13];
-#line 537 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 545 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp344_ = self->matrix_entries;
-#line 537 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 545 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp344__length1 = self->matrix_entries_length1;
-#line 537 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 545 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp345_ = _tmp344_[7];
-#line 537 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 545 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp346_ = transform;
-#line 537 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 545 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp347_ = _tmp346_->matrix_entries;
-#line 537 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 545 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp347__length1 = _tmp346_->matrix_entries_length1;
-#line 537 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 545 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp348_ = _tmp347_[14];
-#line 537 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 545 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp349_ = self->matrix_entries;
-#line 537 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 545 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp349__length1 = self->matrix_entries_length1;
-#line 537 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 545 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp350_ = _tmp349_[11];
-#line 537 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 545 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp351_ = transform;
-#line 537 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 545 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp352_ = _tmp351_->matrix_entries;
-#line 537 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 545 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp352__length1 = _tmp351_->matrix_entries_length1;
-#line 537 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 545 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp353_ = _tmp352_[15];
-#line 537 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 545 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp354_ = self->matrix_entries;
-#line 537 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 545 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp354__length1 = self->matrix_entries_length1;
-#line 537 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 545 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp355_ = _tmp354_[15];
-#line 537 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 545 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp335_[15] = (((_tmp338_ * _tmp340_) + (_tmp343_ * _tmp345_)) + (_tmp348_ * _tmp350_)) + (_tmp353_ * _tmp355_);
-#line 537 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 545 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp356_ = _tmp335_[15];
-#line 4983 "ColorTransformation.c"
+#line 5062 "ColorTransformation.c"
 	{
 		gint i = 0;
-#line 543 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 551 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		i = 0;
-#line 4988 "ColorTransformation.c"
+#line 5067 "ColorTransformation.c"
 		{
 			gboolean _tmp357_ = FALSE;
-#line 543 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 551 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp357_ = TRUE;
-#line 543 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 551 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			while (TRUE) {
-#line 4995 "ColorTransformation.c"
+#line 5074 "ColorTransformation.c"
 				gint _tmp359_ = 0;
 				gfloat* _tmp360_ = NULL;
 				gint _tmp360__length1 = 0;
@@ -5002,74 +5081,74 @@ static void rgb_transformation_real_compose_with (PixelTransformation* base, Pix
 				gint _tmp363_ = 0;
 				gfloat _tmp364_ = 0.0F;
 				gfloat _tmp365_ = 0.0F;
-#line 543 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 551 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				if (!_tmp357_) {
-#line 5007 "ColorTransformation.c"
+#line 5086 "ColorTransformation.c"
 					gint _tmp358_ = 0;
-#line 543 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 551 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp358_ = i;
-#line 543 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 551 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					i = _tmp358_ + 1;
-#line 5013 "ColorTransformation.c"
+#line 5092 "ColorTransformation.c"
 				}
-#line 543 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 551 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp357_ = FALSE;
-#line 543 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 551 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp359_ = i;
-#line 543 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 551 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				if (!(_tmp359_ < RGB_TRANSFORMATION_MATRIX_SIZE)) {
-#line 543 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 551 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					break;
-#line 5023 "ColorTransformation.c"
+#line 5102 "ColorTransformation.c"
 				}
-#line 544 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 552 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp360_ = self->matrix_entries;
-#line 544 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 552 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp360__length1 = self->matrix_entries_length1;
-#line 544 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 552 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp361_ = i;
-#line 544 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 552 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp362_ = result_matrix_entries;
-#line 544 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 552 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp362__length1 = result_matrix_entries_length1;
-#line 544 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 552 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp363_ = i;
-#line 544 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 552 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp364_ = _tmp362_[_tmp363_];
-#line 544 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 552 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp360_[_tmp361_] = _tmp364_;
-#line 544 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 552 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp365_ = _tmp360_[_tmp361_];
-#line 5043 "ColorTransformation.c"
+#line 5122 "ColorTransformation.c"
 			}
 		}
 	}
-#line 546 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 554 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp367_ = self->identity;
-#line 546 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 554 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (_tmp367_) {
-#line 5051 "ColorTransformation.c"
+#line 5130 "ColorTransformation.c"
 		RGBTransformation* _tmp368_ = NULL;
 		gboolean _tmp369_ = FALSE;
-#line 546 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 554 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp368_ = transform;
-#line 546 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 554 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp369_ = _tmp368_->identity;
-#line 546 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 554 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp366_ = _tmp369_;
-#line 5060 "ColorTransformation.c"
+#line 5139 "ColorTransformation.c"
 	} else {
-#line 546 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 554 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp366_ = FALSE;
-#line 5064 "ColorTransformation.c"
+#line 5143 "ColorTransformation.c"
 	}
-#line 546 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 554 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->identity = _tmp366_;
-#line 434 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 442 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	result_matrix_entries = (g_free (result_matrix_entries), NULL);
-#line 434 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 442 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_pixel_transformation_unref0 (transform);
-#line 5072 "ColorTransformation.c"
+#line 5151 "ColorTransformation.c"
 }
 
 
@@ -5078,21 +5157,21 @@ static void rgb_transformation_real_transform_pixel_hsv (PixelTransformation* ba
 	RGBAnalyticPixel _tmp0_ = {0};
 	RGBAnalyticPixel _tmp1_ = {0};
 	HSVAnalyticPixel _tmp2_ = {0};
-#line 549 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 557 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_RGB_TRANSFORMATION, RGBTransformation);
-#line 549 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 557 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_return_if_fail (p != NULL);
-#line 550 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 558 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	hsv_analytic_pixel_to_rgb (p, &_tmp0_);
-#line 550 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 558 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	pixel_transformation_transform_pixel_rgb (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PIXEL_TRANSFORMATION, PixelTransformation), &_tmp0_, &_tmp1_);
-#line 550 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 558 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	rgb_analytic_pixel_to_hsv (&_tmp1_, &_tmp2_);
-#line 550 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 558 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	*result = _tmp2_;
-#line 550 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 558 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return;
-#line 5095 "ColorTransformation.c"
+#line 5174 "ColorTransformation.c"
 }
 
 
@@ -5165,155 +5244,155 @@ static void rgb_transformation_real_transform_pixel_rgb (PixelTransformation* ba
 	gfloat _tmp49_ = 0.0F;
 	gfloat _tmp50_ = 0.0F;
 	RGBAnalyticPixel _tmp51_ = {0};
-#line 553 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 561 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_RGB_TRANSFORMATION, RGBTransformation);
-#line 553 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 561 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_return_if_fail (p != NULL);
-#line 554 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 562 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp0_ = *p;
-#line 554 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 562 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp1_ = _tmp0_.red;
-#line 554 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 562 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp2_ = self->matrix_entries;
-#line 554 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 562 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp2__length1 = self->matrix_entries_length1;
-#line 554 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 562 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp3_ = _tmp2_[0];
-#line 554 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 562 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp4_ = *p;
-#line 554 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 562 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp5_ = _tmp4_.green;
-#line 554 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 562 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp6_ = self->matrix_entries;
-#line 554 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 562 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp6__length1 = self->matrix_entries_length1;
-#line 554 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 562 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp7_ = _tmp6_[1];
-#line 554 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 562 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp8_ = *p;
-#line 554 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 562 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp9_ = _tmp8_.blue;
-#line 554 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 562 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp10_ = self->matrix_entries;
-#line 554 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 562 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp10__length1 = self->matrix_entries_length1;
-#line 554 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 562 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp11_ = _tmp10_[2];
-#line 554 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 562 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp12_ = self->matrix_entries;
-#line 554 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 562 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp12__length1 = self->matrix_entries_length1;
-#line 554 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 562 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp13_ = _tmp12_[3];
-#line 554 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 562 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	red_out = (((_tmp1_ * _tmp3_) + (_tmp5_ * _tmp7_)) + (_tmp9_ * _tmp11_)) + _tmp13_;
-#line 558 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 566 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp14_ = red_out;
-#line 558 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 566 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp15_ = CLAMP (_tmp14_, 0.0f, 1.0f);
-#line 558 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 566 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	red_out = _tmp15_;
-#line 560 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 568 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp16_ = *p;
-#line 560 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 568 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp17_ = _tmp16_.red;
-#line 560 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 568 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp18_ = self->matrix_entries;
-#line 560 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 568 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp18__length1 = self->matrix_entries_length1;
-#line 560 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 568 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp19_ = _tmp18_[4];
-#line 560 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 568 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp20_ = *p;
-#line 560 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 568 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp21_ = _tmp20_.green;
-#line 560 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 568 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp22_ = self->matrix_entries;
-#line 560 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 568 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp22__length1 = self->matrix_entries_length1;
-#line 560 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 568 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp23_ = _tmp22_[5];
-#line 560 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 568 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp24_ = *p;
-#line 560 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 568 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp25_ = _tmp24_.blue;
-#line 560 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 568 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp26_ = self->matrix_entries;
-#line 560 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 568 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp26__length1 = self->matrix_entries_length1;
-#line 560 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 568 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp27_ = _tmp26_[6];
-#line 560 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 568 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp28_ = self->matrix_entries;
-#line 560 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 568 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp28__length1 = self->matrix_entries_length1;
-#line 560 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 568 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp29_ = _tmp28_[7];
-#line 560 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 568 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	green_out = (((_tmp17_ * _tmp19_) + (_tmp21_ * _tmp23_)) + (_tmp25_ * _tmp27_)) + _tmp29_;
-#line 564 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 572 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp30_ = green_out;
-#line 564 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 572 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp31_ = CLAMP (_tmp30_, 0.0f, 1.0f);
-#line 564 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 572 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	green_out = _tmp31_;
-#line 566 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 574 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp32_ = *p;
-#line 566 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 574 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp33_ = _tmp32_.red;
-#line 566 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 574 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp34_ = self->matrix_entries;
-#line 566 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 574 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp34__length1 = self->matrix_entries_length1;
-#line 566 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 574 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp35_ = _tmp34_[8];
-#line 566 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 574 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp36_ = *p;
-#line 566 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 574 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp37_ = _tmp36_.green;
-#line 566 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 574 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp38_ = self->matrix_entries;
-#line 566 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 574 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp38__length1 = self->matrix_entries_length1;
-#line 566 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 574 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp39_ = _tmp38_[9];
-#line 566 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 574 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp40_ = *p;
-#line 566 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 574 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp41_ = _tmp40_.blue;
-#line 566 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 574 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp42_ = self->matrix_entries;
-#line 566 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 574 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp42__length1 = self->matrix_entries_length1;
-#line 566 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 574 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp43_ = _tmp42_[10];
-#line 566 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 574 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp44_ = self->matrix_entries;
-#line 566 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 574 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp44__length1 = self->matrix_entries_length1;
-#line 566 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 574 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp45_ = _tmp44_[11];
-#line 566 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 574 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	blue_out = (((_tmp33_ * _tmp35_) + (_tmp37_ * _tmp39_)) + (_tmp41_ * _tmp43_)) + _tmp45_;
-#line 570 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 578 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp46_ = blue_out;
-#line 570 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 578 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp47_ = CLAMP (_tmp46_, 0.0f, 1.0f);
-#line 570 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 578 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	blue_out = _tmp47_;
-#line 572 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 580 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp48_ = red_out;
-#line 572 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 580 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp49_ = green_out;
-#line 572 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 580 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp50_ = blue_out;
-#line 572 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 580 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	rgb_analytic_pixel_init_from_components (&_tmp51_, _tmp48_, _tmp49_, _tmp50_);
-#line 572 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 580 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	*result = _tmp51_;
-#line 572 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 580 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return;
-#line 5316 "ColorTransformation.c"
+#line 5395 "ColorTransformation.c"
 }
 
 
@@ -5321,15 +5400,15 @@ static gboolean rgb_transformation_real_is_identity (PixelTransformation* base)
 	RGBTransformation * self;
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
-#line 575 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 583 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_RGB_TRANSFORMATION, RGBTransformation);
-#line 576 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 584 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp0_ = self->identity;
-#line 576 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 584 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	result = _tmp0_;
-#line 576 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 584 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return result;
-#line 5332 "ColorTransformation.c"
+#line 5411 "ColorTransformation.c"
 }
 
 
@@ -5339,27 +5418,27 @@ static PixelTransformation* rgb_transformation_real_copy (PixelTransformation* b
 	RGBTransformation* _result_ = NULL;
 	PixelTransformationType _tmp0_ = 0;
 	RGBTransformation* _tmp1_ = NULL;
-#line 579 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 587 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_RGB_TRANSFORMATION, RGBTransformation);
-#line 580 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 588 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp0_ = pixel_transformation_get_transformation_type (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PIXEL_TRANSFORMATION, PixelTransformation));
-#line 580 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 588 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp1_ = rgb_transformation_new (_tmp0_);
-#line 580 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 588 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_result_ = _tmp1_;
-#line 5350 "ColorTransformation.c"
+#line 5429 "ColorTransformation.c"
 	{
 		gint i = 0;
-#line 582 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 590 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		i = 0;
-#line 5355 "ColorTransformation.c"
+#line 5434 "ColorTransformation.c"
 		{
 			gboolean _tmp2_ = FALSE;
-#line 582 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 590 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp2_ = TRUE;
-#line 582 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 590 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			while (TRUE) {
-#line 5362 "ColorTransformation.c"
+#line 5441 "ColorTransformation.c"
 				gint _tmp4_ = 0;
 				RGBTransformation* _tmp5_ = NULL;
 				gfloat* _tmp6_ = NULL;
@@ -5370,97 +5449,97 @@ static PixelTransformation* rgb_transformation_real_copy (PixelTransformation* b
 				gint _tmp9_ = 0;
 				gfloat _tmp10_ = 0.0F;
 				gfloat _tmp11_ = 0.0F;
-#line 582 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 590 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				if (!_tmp2_) {
-#line 5375 "ColorTransformation.c"
+#line 5454 "ColorTransformation.c"
 					gint _tmp3_ = 0;
-#line 582 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 590 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp3_ = i;
-#line 582 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 590 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					i = _tmp3_ + 1;
-#line 5381 "ColorTransformation.c"
+#line 5460 "ColorTransformation.c"
 				}
-#line 582 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 590 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp2_ = FALSE;
-#line 582 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 590 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp4_ = i;
-#line 582 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 590 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				if (!(_tmp4_ < RGB_TRANSFORMATION_MATRIX_SIZE)) {
-#line 582 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 590 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					break;
-#line 5391 "ColorTransformation.c"
+#line 5470 "ColorTransformation.c"
 				}
-#line 583 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 591 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp5_ = _result_;
-#line 583 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 591 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp6_ = _tmp5_->matrix_entries;
-#line 583 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 591 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp6__length1 = _tmp5_->matrix_entries_length1;
-#line 583 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 591 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp7_ = i;
-#line 583 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 591 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp8_ = self->matrix_entries;
-#line 583 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 591 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp8__length1 = self->matrix_entries_length1;
-#line 583 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 591 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp9_ = i;
-#line 583 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 591 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp10_ = _tmp8_[_tmp9_];
-#line 583 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 591 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp6_[_tmp7_] = _tmp10_;
-#line 583 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 591 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp11_ = _tmp6_[_tmp7_];
-#line 5413 "ColorTransformation.c"
+#line 5492 "ColorTransformation.c"
 			}
 		}
 	}
-#line 586 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 594 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	result = G_TYPE_CHECK_INSTANCE_CAST (_result_, TYPE_PIXEL_TRANSFORMATION, PixelTransformation);
-#line 586 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 594 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return result;
-#line 5421 "ColorTransformation.c"
+#line 5500 "ColorTransformation.c"
 }
 
 
 static void rgb_transformation_class_init (RGBTransformationClass * klass) {
-#line 403 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 411 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	rgb_transformation_parent_class = g_type_class_peek_parent (klass);
-#line 403 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 411 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	((PixelTransformationClass *) klass)->finalize = rgb_transformation_finalize;
-#line 403 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 411 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	((PixelTransformationClass *) klass)->get_preferred_format = rgb_transformation_real_get_preferred_format;
-#line 403 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 411 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	((PixelTransformationClass *) klass)->get_composition_mode = rgb_transformation_real_get_composition_mode;
-#line 403 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 411 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	((PixelTransformationClass *) klass)->compose_with = rgb_transformation_real_compose_with;
-#line 403 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 411 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	((PixelTransformationClass *) klass)->transform_pixel_hsv = rgb_transformation_real_transform_pixel_hsv;
-#line 403 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 411 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	((PixelTransformationClass *) klass)->transform_pixel_rgb = rgb_transformation_real_transform_pixel_rgb;
-#line 403 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 411 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	((PixelTransformationClass *) klass)->is_identity = rgb_transformation_real_is_identity;
-#line 403 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 411 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	((PixelTransformationClass *) klass)->copy = rgb_transformation_real_copy;
-#line 5444 "ColorTransformation.c"
+#line 5523 "ColorTransformation.c"
 }
 
 
 static void rgb_transformation_instance_init (RGBTransformation * self) {
-#line 410 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 418 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->identity = TRUE;
-#line 5451 "ColorTransformation.c"
+#line 5530 "ColorTransformation.c"
 }
 
 
 static void rgb_transformation_finalize (PixelTransformation* obj) {
 	RGBTransformation * self;
-#line 403 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 411 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_RGB_TRANSFORMATION, RGBTransformation);
-#line 406 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 414 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->matrix_entries = (g_free (self->matrix_entries), NULL);
-#line 403 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 411 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	PIXEL_TRANSFORMATION_CLASS (rgb_transformation_parent_class)->finalize (obj);
-#line 5463 "ColorTransformation.c"
+#line 5542 "ColorTransformation.c"
 }
 
 
@@ -5479,26 +5558,26 @@ GType rgb_transformation_get_type (void) {
 HSVTransformation* hsv_transformation_construct (GType object_type, PixelTransformationType type) {
 	HSVTransformation* self = NULL;
 	PixelTransformationType _tmp0_ = 0;
-#line 592 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 600 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp0_ = type;
-#line 592 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 600 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self = (HSVTransformation*) pixel_transformation_construct (object_type, _tmp0_);
-#line 591 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 599 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return self;
-#line 5488 "ColorTransformation.c"
+#line 5567 "ColorTransformation.c"
 }
 
 
 static PixelFormat hsv_transformation_real_get_preferred_format (PixelTransformation* base) {
 	HSVTransformation * self;
 	PixelFormat result = 0;
-#line 595 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 603 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_HSV_TRANSFORMATION, HSVTransformation);
-#line 596 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 604 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	result = PIXEL_FORMAT_HSV;
-#line 596 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 604 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return result;
-#line 5501 "ColorTransformation.c"
+#line 5580 "ColorTransformation.c"
 }
 
 
@@ -5507,32 +5586,32 @@ static void hsv_transformation_real_transform_pixel_rgb (PixelTransformation* ba
 	HSVAnalyticPixel _tmp0_ = {0};
 	HSVAnalyticPixel _tmp1_ = {0};
 	RGBAnalyticPixel _tmp2_ = {0};
-#line 599 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 607 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_HSV_TRANSFORMATION, HSVTransformation);
-#line 599 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 607 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_return_if_fail (p != NULL);
-#line 600 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 608 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	rgb_analytic_pixel_to_hsv (p, &_tmp0_);
-#line 600 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 608 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	pixel_transformation_transform_pixel_hsv (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PIXEL_TRANSFORMATION, PixelTransformation), &_tmp0_, &_tmp1_);
-#line 600 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 608 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	hsv_analytic_pixel_to_rgb (&_tmp1_, &_tmp2_);
-#line 600 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 608 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	*result = _tmp2_;
-#line 600 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 608 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return;
-#line 5524 "ColorTransformation.c"
+#line 5603 "ColorTransformation.c"
 }
 
 
 static void hsv_transformation_class_init (HSVTransformationClass * klass) {
-#line 590 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 598 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	hsv_transformation_parent_class = g_type_class_peek_parent (klass);
-#line 590 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 598 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	((PixelTransformationClass *) klass)->get_preferred_format = hsv_transformation_real_get_preferred_format;
-#line 590 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 598 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	((PixelTransformationClass *) klass)->transform_pixel_rgb = hsv_transformation_real_transform_pixel_rgb;
-#line 5535 "ColorTransformation.c"
+#line 5614 "ColorTransformation.c"
 }
 
 
@@ -5557,19 +5636,19 @@ TintTransformation* tint_transformation_construct (GType object_type, gfloat cli
 	gfloat _tmp0_ = 0.0F;
 	gfloat _tmp1_ = 0.0F;
 	gfloat _tmp2_ = 0.0F;
-#line 612 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 620 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self = (TintTransformation*) rgb_transformation_construct (object_type, PIXEL_TRANSFORMATION_TYPE_TINT);
-#line 614 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 622 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp0_ = client_param;
-#line 614 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 622 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp1_ = CLAMP (_tmp0_, TINT_TRANSFORMATION_MIN_PARAMETER, TINT_TRANSFORMATION_MAX_PARAMETER);
-#line 614 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 622 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv->parameter = _tmp1_;
-#line 616 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 624 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp2_ = self->priv->parameter;
-#line 616 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 624 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (_tmp2_ != 0.0f) {
-#line 5572 "ColorTransformation.c"
+#line 5651 "ColorTransformation.c"
 		gfloat adjusted_param = 0.0F;
 		gfloat _tmp3_ = 0.0F;
 		gfloat _tmp4_ = 0.0F;
@@ -5585,101 +5664,101 @@ TintTransformation* tint_transformation_construct (GType object_type, gfloat cli
 		gint _tmp11__length1 = 0;
 		gfloat _tmp12_ = 0.0F;
 		gfloat _tmp13_ = 0.0F;
-#line 617 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 625 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp3_ = self->priv->parameter;
-#line 617 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 625 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		adjusted_param = _tmp3_ / TINT_TRANSFORMATION_MAX_PARAMETER;
-#line 618 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 626 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp4_ = adjusted_param;
-#line 618 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 626 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		adjusted_param = _tmp4_ * TINT_TRANSFORMATION_INTENSITY_FACTOR;
-#line 620 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 628 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp5_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_RGB_TRANSFORMATION, RGBTransformation)->matrix_entries;
-#line 620 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 628 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp5__length1 = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_RGB_TRANSFORMATION, RGBTransformation)->matrix_entries_length1;
-#line 620 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 628 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp6_ = adjusted_param;
-#line 620 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 628 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp5_[11] -= _tmp6_ / 2;
-#line 620 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 628 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp7_ = _tmp5_[11];
-#line 621 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 629 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp8_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_RGB_TRANSFORMATION, RGBTransformation)->matrix_entries;
-#line 621 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 629 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp8__length1 = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_RGB_TRANSFORMATION, RGBTransformation)->matrix_entries_length1;
-#line 621 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 629 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp9_ = adjusted_param;
-#line 621 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 629 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp8_[7] += _tmp9_;
-#line 621 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 629 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp10_ = _tmp8_[7];
-#line 622 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 630 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp11_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_RGB_TRANSFORMATION, RGBTransformation)->matrix_entries;
-#line 622 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 630 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp11__length1 = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_RGB_TRANSFORMATION, RGBTransformation)->matrix_entries_length1;
-#line 622 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 630 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp12_ = adjusted_param;
-#line 622 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 630 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp11_[3] -= _tmp12_ / 2;
-#line 622 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 630 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp13_ = _tmp11_[3];
-#line 624 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 632 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_RGB_TRANSFORMATION, RGBTransformation)->identity = FALSE;
-#line 5628 "ColorTransformation.c"
+#line 5707 "ColorTransformation.c"
 	}
-#line 611 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 619 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return self;
-#line 5632 "ColorTransformation.c"
+#line 5711 "ColorTransformation.c"
 }
 
 
 TintTransformation* tint_transformation_new (gfloat client_param) {
-#line 611 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 619 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return tint_transformation_construct (TYPE_TINT_TRANSFORMATION, client_param);
-#line 5639 "ColorTransformation.c"
+#line 5718 "ColorTransformation.c"
 }
 
 
 gfloat tint_transformation_get_parameter (TintTransformation* self) {
 	gfloat result = 0.0F;
 	gfloat _tmp0_ = 0.0F;
-#line 628 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 636 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_return_val_if_fail (IS_TINT_TRANSFORMATION (self), 0.0F);
-#line 629 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 637 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp0_ = self->priv->parameter;
-#line 629 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 637 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	result = _tmp0_;
-#line 629 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 637 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return result;
-#line 5654 "ColorTransformation.c"
+#line 5733 "ColorTransformation.c"
 }
 
 
 static void tint_transformation_class_init (TintTransformationClass * klass) {
-#line 604 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 612 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	tint_transformation_parent_class = g_type_class_peek_parent (klass);
-#line 604 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 612 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	((PixelTransformationClass *) klass)->finalize = tint_transformation_finalize;
-#line 604 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 612 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_type_class_add_private (klass, sizeof (TintTransformationPrivate));
-#line 5665 "ColorTransformation.c"
+#line 5744 "ColorTransformation.c"
 }
 
 
 static void tint_transformation_instance_init (TintTransformation * self) {
-#line 604 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 612 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv = TINT_TRANSFORMATION_GET_PRIVATE (self);
-#line 5672 "ColorTransformation.c"
+#line 5751 "ColorTransformation.c"
 }
 
 
 static void tint_transformation_finalize (PixelTransformation* obj) {
 	TintTransformation * self;
-#line 604 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 612 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_TINT_TRANSFORMATION, TintTransformation);
-#line 604 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 612 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	PIXEL_TRANSFORMATION_CLASS (tint_transformation_parent_class)->finalize (obj);
-#line 5682 "ColorTransformation.c"
+#line 5761 "ColorTransformation.c"
 }
 
 
@@ -5700,19 +5779,19 @@ TemperatureTransformation* temperature_transformation_construct (GType object_ty
 	gfloat _tmp0_ = 0.0F;
 	gfloat _tmp1_ = 0.0F;
 	gfloat _tmp2_ = 0.0F;
-#line 641 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 649 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self = (TemperatureTransformation*) rgb_transformation_construct (object_type, PIXEL_TRANSFORMATION_TYPE_TEMPERATURE);
-#line 643 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 651 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp0_ = client_parameter;
-#line 643 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 651 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp1_ = CLAMP (_tmp0_, TEMPERATURE_TRANSFORMATION_MIN_PARAMETER, TEMPERATURE_TRANSFORMATION_MAX_PARAMETER);
-#line 643 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 651 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv->parameter = _tmp1_;
-#line 645 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 653 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp2_ = self->priv->parameter;
-#line 645 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 653 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (_tmp2_ != 0.0f) {
-#line 5715 "ColorTransformation.c"
+#line 5794 "ColorTransformation.c"
 		gfloat adjusted_param = 0.0F;
 		gfloat _tmp3_ = 0.0F;
 		gfloat _tmp4_ = 0.0F;
@@ -5728,101 +5807,101 @@ TemperatureTransformation* temperature_transformation_construct (GType object_ty
 		gint _tmp11__length1 = 0;
 		gfloat _tmp12_ = 0.0F;
 		gfloat _tmp13_ = 0.0F;
-#line 646 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 654 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp3_ = self->priv->parameter;
-#line 646 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 654 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		adjusted_param = _tmp3_ / TEMPERATURE_TRANSFORMATION_MAX_PARAMETER;
-#line 647 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 655 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp4_ = adjusted_param;
-#line 647 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 655 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		adjusted_param = _tmp4_ * TEMPERATURE_TRANSFORMATION_INTENSITY_FACTOR;
-#line 649 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 657 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp5_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_RGB_TRANSFORMATION, RGBTransformation)->matrix_entries;
-#line 649 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 657 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp5__length1 = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_RGB_TRANSFORMATION, RGBTransformation)->matrix_entries_length1;
-#line 649 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 657 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp6_ = adjusted_param;
-#line 649 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 657 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp5_[11] -= _tmp6_;
-#line 649 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 657 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp7_ = _tmp5_[11];
-#line 650 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 658 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp8_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_RGB_TRANSFORMATION, RGBTransformation)->matrix_entries;
-#line 650 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 658 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp8__length1 = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_RGB_TRANSFORMATION, RGBTransformation)->matrix_entries_length1;
-#line 650 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 658 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp9_ = adjusted_param;
-#line 650 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 658 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp8_[7] += _tmp9_ / 2;
-#line 650 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 658 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp10_ = _tmp8_[7];
-#line 651 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 659 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp11_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_RGB_TRANSFORMATION, RGBTransformation)->matrix_entries;
-#line 651 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 659 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp11__length1 = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_RGB_TRANSFORMATION, RGBTransformation)->matrix_entries_length1;
-#line 651 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 659 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp12_ = adjusted_param;
-#line 651 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 659 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp11_[3] += _tmp12_ / 2;
-#line 651 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 659 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp13_ = _tmp11_[3];
-#line 653 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 661 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_RGB_TRANSFORMATION, RGBTransformation)->identity = FALSE;
-#line 5771 "ColorTransformation.c"
+#line 5850 "ColorTransformation.c"
 	}
-#line 640 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 648 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return self;
-#line 5775 "ColorTransformation.c"
+#line 5854 "ColorTransformation.c"
 }
 
 
 TemperatureTransformation* temperature_transformation_new (gfloat client_parameter) {
-#line 640 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 648 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return temperature_transformation_construct (TYPE_TEMPERATURE_TRANSFORMATION, client_parameter);
-#line 5782 "ColorTransformation.c"
+#line 5861 "ColorTransformation.c"
 }
 
 
 gfloat temperature_transformation_get_parameter (TemperatureTransformation* self) {
 	gfloat result = 0.0F;
 	gfloat _tmp0_ = 0.0F;
-#line 657 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 665 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_return_val_if_fail (IS_TEMPERATURE_TRANSFORMATION (self), 0.0F);
-#line 658 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 666 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp0_ = self->priv->parameter;
-#line 658 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 666 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	result = _tmp0_;
-#line 658 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 666 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return result;
-#line 5797 "ColorTransformation.c"
+#line 5876 "ColorTransformation.c"
 }
 
 
 static void temperature_transformation_class_init (TemperatureTransformationClass * klass) {
-#line 633 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 641 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	temperature_transformation_parent_class = g_type_class_peek_parent (klass);
-#line 633 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 641 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	((PixelTransformationClass *) klass)->finalize = temperature_transformation_finalize;
-#line 633 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 641 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_type_class_add_private (klass, sizeof (TemperatureTransformationPrivate));
-#line 5808 "ColorTransformation.c"
+#line 5887 "ColorTransformation.c"
 }
 
 
 static void temperature_transformation_instance_init (TemperatureTransformation * self) {
-#line 633 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 641 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv = TEMPERATURE_TRANSFORMATION_GET_PRIVATE (self);
-#line 5815 "ColorTransformation.c"
+#line 5894 "ColorTransformation.c"
 }
 
 
 static void temperature_transformation_finalize (PixelTransformation* obj) {
 	TemperatureTransformation * self;
-#line 633 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 641 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_TEMPERATURE_TRANSFORMATION, TemperatureTransformation);
-#line 633 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 641 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	PIXEL_TRANSFORMATION_CLASS (temperature_transformation_parent_class)->finalize (obj);
-#line 5825 "ColorTransformation.c"
+#line 5904 "ColorTransformation.c"
 }
 
 
@@ -5843,19 +5922,19 @@ SaturationTransformation* saturation_transformation_construct (GType object_type
 	gfloat _tmp0_ = 0.0F;
 	gfloat _tmp1_ = 0.0F;
 	gfloat _tmp2_ = 0.0F;
-#line 669 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 677 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self = (SaturationTransformation*) rgb_transformation_construct (object_type, PIXEL_TRANSFORMATION_TYPE_SATURATION);
-#line 671 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 679 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp0_ = client_parameter;
-#line 671 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 679 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp1_ = CLAMP (_tmp0_, SATURATION_TRANSFORMATION_MIN_PARAMETER, SATURATION_TRANSFORMATION_MAX_PARAMETER);
-#line 671 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 679 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv->parameter = _tmp1_;
-#line 673 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 681 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp2_ = self->priv->parameter;
-#line 673 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 681 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (_tmp2_ != 0.0f) {
-#line 5858 "ColorTransformation.c"
+#line 5937 "ColorTransformation.c"
 		gfloat adjusted_param = 0.0F;
 		gfloat _tmp3_ = 0.0F;
 		gfloat _tmp4_ = 0.0F;
@@ -5908,187 +5987,187 @@ SaturationTransformation* saturation_transformation_construct (GType object_type
 		gfloat _tmp41_ = 0.0F;
 		gfloat _tmp42_ = 0.0F;
 		gfloat _tmp43_ = 0.0F;
-#line 674 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 682 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp3_ = self->priv->parameter;
-#line 674 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 682 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		adjusted_param = _tmp3_ / SATURATION_TRANSFORMATION_MAX_PARAMETER;
-#line 675 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 683 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp4_ = adjusted_param;
-#line 675 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 683 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		adjusted_param = _tmp4_ + 1.0f;
-#line 677 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 685 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		one_third = 0.3333333f;
-#line 679 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 687 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp5_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_RGB_TRANSFORMATION, RGBTransformation)->matrix_entries;
-#line 679 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 687 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp5__length1 = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_RGB_TRANSFORMATION, RGBTransformation)->matrix_entries_length1;
-#line 679 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 687 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp6_ = adjusted_param;
-#line 679 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 687 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp7_ = one_third;
-#line 679 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 687 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp8_ = adjusted_param;
-#line 679 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 687 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp5_[0] = ((1.0f - _tmp6_) * _tmp7_) + _tmp8_;
-#line 679 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 687 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp9_ = _tmp5_[0];
-#line 681 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 689 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp10_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_RGB_TRANSFORMATION, RGBTransformation)->matrix_entries;
-#line 681 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 689 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp10__length1 = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_RGB_TRANSFORMATION, RGBTransformation)->matrix_entries_length1;
-#line 681 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 689 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp11_ = adjusted_param;
-#line 681 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 689 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp12_ = one_third;
-#line 681 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 689 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp10_[1] = (1.0f - _tmp11_) * _tmp12_;
-#line 681 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 689 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp13_ = _tmp10_[1];
-#line 682 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 690 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp14_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_RGB_TRANSFORMATION, RGBTransformation)->matrix_entries;
-#line 682 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 690 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp14__length1 = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_RGB_TRANSFORMATION, RGBTransformation)->matrix_entries_length1;
-#line 682 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 690 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp15_ = adjusted_param;
-#line 682 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 690 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp16_ = one_third;
-#line 682 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 690 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp14_[2] = (1.0f - _tmp15_) * _tmp16_;
-#line 682 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 690 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp17_ = _tmp14_[2];
-#line 684 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 692 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp18_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_RGB_TRANSFORMATION, RGBTransformation)->matrix_entries;
-#line 684 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 692 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp18__length1 = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_RGB_TRANSFORMATION, RGBTransformation)->matrix_entries_length1;
-#line 684 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 692 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp19_ = adjusted_param;
-#line 684 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 692 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp20_ = one_third;
-#line 684 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 692 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp18_[4] = (1.0f - _tmp19_) * _tmp20_;
-#line 684 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 692 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp21_ = _tmp18_[4];
-#line 685 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 693 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp22_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_RGB_TRANSFORMATION, RGBTransformation)->matrix_entries;
-#line 685 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 693 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp22__length1 = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_RGB_TRANSFORMATION, RGBTransformation)->matrix_entries_length1;
-#line 685 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 693 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp23_ = adjusted_param;
-#line 685 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 693 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp24_ = one_third;
-#line 685 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 693 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp25_ = adjusted_param;
-#line 685 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 693 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp22_[5] = ((1.0f - _tmp23_) * _tmp24_) + _tmp25_;
-#line 685 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 693 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp26_ = _tmp22_[5];
-#line 687 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 695 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp27_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_RGB_TRANSFORMATION, RGBTransformation)->matrix_entries;
-#line 687 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 695 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp27__length1 = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_RGB_TRANSFORMATION, RGBTransformation)->matrix_entries_length1;
-#line 687 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 695 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp28_ = adjusted_param;
-#line 687 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 695 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp29_ = one_third;
-#line 687 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 695 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp27_[6] = (1.0f - _tmp28_) * _tmp29_;
-#line 687 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 695 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp30_ = _tmp27_[6];
-#line 689 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 697 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp31_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_RGB_TRANSFORMATION, RGBTransformation)->matrix_entries;
-#line 689 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 697 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp31__length1 = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_RGB_TRANSFORMATION, RGBTransformation)->matrix_entries_length1;
-#line 689 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 697 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp32_ = adjusted_param;
-#line 689 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 697 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp33_ = one_third;
-#line 689 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 697 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp31_[8] = (1.0f - _tmp32_) * _tmp33_;
-#line 689 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 697 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp34_ = _tmp31_[8];
-#line 690 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 698 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp35_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_RGB_TRANSFORMATION, RGBTransformation)->matrix_entries;
-#line 690 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 698 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp35__length1 = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_RGB_TRANSFORMATION, RGBTransformation)->matrix_entries_length1;
-#line 690 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 698 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp36_ = adjusted_param;
-#line 690 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 698 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp37_ = one_third;
-#line 690 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 698 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp35_[9] = (1.0f - _tmp36_) * _tmp37_;
-#line 690 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 698 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp38_ = _tmp35_[9];
-#line 691 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 699 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp39_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_RGB_TRANSFORMATION, RGBTransformation)->matrix_entries;
-#line 691 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 699 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp39__length1 = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_RGB_TRANSFORMATION, RGBTransformation)->matrix_entries_length1;
-#line 691 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 699 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp40_ = adjusted_param;
-#line 691 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 699 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp41_ = one_third;
-#line 691 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 699 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp42_ = adjusted_param;
-#line 691 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 699 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp39_[10] = ((1.0f - _tmp40_) * _tmp41_) + _tmp42_;
-#line 691 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 699 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp43_ = _tmp39_[10];
-#line 694 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 702 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_RGB_TRANSFORMATION, RGBTransformation)->identity = FALSE;
-#line 6037 "ColorTransformation.c"
+#line 6116 "ColorTransformation.c"
 	}
-#line 668 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 676 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return self;
-#line 6041 "ColorTransformation.c"
+#line 6120 "ColorTransformation.c"
 }
 
 
 SaturationTransformation* saturation_transformation_new (gfloat client_parameter) {
-#line 668 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 676 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return saturation_transformation_construct (TYPE_SATURATION_TRANSFORMATION, client_parameter);
-#line 6048 "ColorTransformation.c"
+#line 6127 "ColorTransformation.c"
 }
 
 
 gfloat saturation_transformation_get_parameter (SaturationTransformation* self) {
 	gfloat result = 0.0F;
 	gfloat _tmp0_ = 0.0F;
-#line 698 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 706 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_return_val_if_fail (IS_SATURATION_TRANSFORMATION (self), 0.0F);
-#line 699 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 707 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp0_ = self->priv->parameter;
-#line 699 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 707 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	result = _tmp0_;
-#line 699 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 707 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return result;
-#line 6063 "ColorTransformation.c"
+#line 6142 "ColorTransformation.c"
 }
 
 
 static void saturation_transformation_class_init (SaturationTransformationClass * klass) {
-#line 662 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 670 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	saturation_transformation_parent_class = g_type_class_peek_parent (klass);
-#line 662 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 670 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	((PixelTransformationClass *) klass)->finalize = saturation_transformation_finalize;
-#line 662 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 670 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_type_class_add_private (klass, sizeof (SaturationTransformationPrivate));
-#line 6074 "ColorTransformation.c"
+#line 6153 "ColorTransformation.c"
 }
 
 
 static void saturation_transformation_instance_init (SaturationTransformation * self) {
-#line 662 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 670 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv = SATURATION_TRANSFORMATION_GET_PRIVATE (self);
-#line 6081 "ColorTransformation.c"
+#line 6160 "ColorTransformation.c"
 }
 
 
 static void saturation_transformation_finalize (PixelTransformation* obj) {
 	SaturationTransformation * self;
-#line 662 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 670 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SATURATION_TRANSFORMATION, SaturationTransformation);
-#line 662 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 670 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	PIXEL_TRANSFORMATION_CLASS (saturation_transformation_parent_class)->finalize (obj);
-#line 6091 "ColorTransformation.c"
+#line 6170 "ColorTransformation.c"
 }
 
 
@@ -6109,19 +6188,19 @@ ExposureTransformation* exposure_transformation_construct (GType object_type, gf
 	gfloat _tmp0_ = 0.0F;
 	gfloat _tmp1_ = 0.0F;
 	gfloat _tmp2_ = 0.0F;
-#line 710 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 718 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self = (ExposureTransformation*) rgb_transformation_construct (object_type, PIXEL_TRANSFORMATION_TYPE_EXPOSURE);
-#line 712 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 720 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp0_ = client_parameter;
-#line 712 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 720 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp1_ = CLAMP (_tmp0_, EXPOSURE_TRANSFORMATION_MIN_PARAMETER, EXPOSURE_TRANSFORMATION_MAX_PARAMETER);
-#line 712 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 720 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv->parameter = _tmp1_;
-#line 714 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 722 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp2_ = self->priv->parameter;
-#line 714 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 722 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (_tmp2_ != 0.0f) {
-#line 6124 "ColorTransformation.c"
+#line 6203 "ColorTransformation.c"
 		gfloat adjusted_param = 0.0F;
 		gfloat _tmp3_ = 0.0F;
 		gfloat* _tmp4_ = NULL;
@@ -6136,97 +6215,97 @@ ExposureTransformation* exposure_transformation_construct (GType object_type, gf
 		gint _tmp10__length1 = 0;
 		gfloat _tmp11_ = 0.0F;
 		gfloat _tmp12_ = 0.0F;
-#line 716 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 724 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp3_ = self->priv->parameter;
-#line 716 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 724 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		adjusted_param = ((_tmp3_ + 16.0f) / 32.0f) + 0.5f;
-#line 718 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 726 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_RGB_TRANSFORMATION, RGBTransformation)->matrix_entries;
-#line 718 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 726 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp4__length1 = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_RGB_TRANSFORMATION, RGBTransformation)->matrix_entries_length1;
-#line 718 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 726 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp5_ = adjusted_param;
-#line 718 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 726 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp4_[0] = _tmp5_;
-#line 718 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 726 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp6_ = _tmp4_[0];
-#line 719 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 727 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp7_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_RGB_TRANSFORMATION, RGBTransformation)->matrix_entries;
-#line 719 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 727 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp7__length1 = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_RGB_TRANSFORMATION, RGBTransformation)->matrix_entries_length1;
-#line 719 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 727 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp8_ = adjusted_param;
-#line 719 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 727 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp7_[5] = _tmp8_;
-#line 719 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 727 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp9_ = _tmp7_[5];
-#line 720 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 728 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp10_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_RGB_TRANSFORMATION, RGBTransformation)->matrix_entries;
-#line 720 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 728 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp10__length1 = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_RGB_TRANSFORMATION, RGBTransformation)->matrix_entries_length1;
-#line 720 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 728 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp11_ = adjusted_param;
-#line 720 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 728 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp10_[10] = _tmp11_;
-#line 720 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 728 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp12_ = _tmp10_[10];
-#line 722 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 730 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_RGB_TRANSFORMATION, RGBTransformation)->identity = FALSE;
-#line 6175 "ColorTransformation.c"
+#line 6254 "ColorTransformation.c"
 	}
-#line 709 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 717 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return self;
-#line 6179 "ColorTransformation.c"
+#line 6258 "ColorTransformation.c"
 }
 
 
 ExposureTransformation* exposure_transformation_new (gfloat client_parameter) {
-#line 709 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 717 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return exposure_transformation_construct (TYPE_EXPOSURE_TRANSFORMATION, client_parameter);
-#line 6186 "ColorTransformation.c"
+#line 6265 "ColorTransformation.c"
 }
 
 
 gfloat exposure_transformation_get_parameter (ExposureTransformation* self) {
 	gfloat result = 0.0F;
 	gfloat _tmp0_ = 0.0F;
-#line 726 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 734 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_return_val_if_fail (IS_EXPOSURE_TRANSFORMATION (self), 0.0F);
-#line 727 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 735 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp0_ = self->priv->parameter;
-#line 727 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 735 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	result = _tmp0_;
-#line 727 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 735 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return result;
-#line 6201 "ColorTransformation.c"
+#line 6280 "ColorTransformation.c"
 }
 
 
 static void exposure_transformation_class_init (ExposureTransformationClass * klass) {
-#line 703 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 711 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	exposure_transformation_parent_class = g_type_class_peek_parent (klass);
-#line 703 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 711 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	((PixelTransformationClass *) klass)->finalize = exposure_transformation_finalize;
-#line 703 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 711 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_type_class_add_private (klass, sizeof (ExposureTransformationPrivate));
-#line 6212 "ColorTransformation.c"
+#line 6291 "ColorTransformation.c"
 }
 
 
 static void exposure_transformation_instance_init (ExposureTransformation * self) {
-#line 703 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 711 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv = EXPOSURE_TRANSFORMATION_GET_PRIVATE (self);
-#line 6219 "ColorTransformation.c"
+#line 6298 "ColorTransformation.c"
 }
 
 
 static void exposure_transformation_finalize (PixelTransformation* obj) {
 	ExposureTransformation * self;
-#line 703 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 711 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_EXPOSURE_TRANSFORMATION, ExposureTransformation);
-#line 703 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 711 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	PIXEL_TRANSFORMATION_CLASS (exposure_transformation_parent_class)->finalize (obj);
-#line 6229 "ColorTransformation.c"
+#line 6308 "ColorTransformation.c"
 }
 
 
@@ -6242,27 +6321,219 @@ GType exposure_transformation_get_type (void) {
 }
 
 
+ContrastTransformation* contrast_transformation_construct (GType object_type, gfloat client_parameter) {
+	ContrastTransformation* self = NULL;
+	gfloat _tmp0_ = 0.0F;
+	gfloat _tmp1_ = 0.0F;
+	gfloat _tmp2_ = 0.0F;
+#line 748 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	self = (ContrastTransformation*) rgb_transformation_construct (object_type, PIXEL_TRANSFORMATION_TYPE_CONTRAST);
+#line 750 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	_tmp0_ = client_parameter;
+#line 750 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	_tmp1_ = CLAMP (_tmp0_, CONTRAST_TRANSFORMATION_MIN_PARAMETER, CONTRAST_TRANSFORMATION_MAX_PARAMETER);
+#line 750 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	self->priv->parameter = _tmp1_;
+#line 752 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	_tmp2_ = self->priv->parameter;
+#line 752 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	if (_tmp2_ != 0.0f) {
+#line 6341 "ColorTransformation.c"
+		gfloat contrast_adjustment = 0.0F;
+		gfloat _tmp3_ = 0.0F;
+		gfloat component_coefficient = 0.0F;
+		gfloat _tmp4_ = 0.0F;
+		gfloat component_offset = 0.0F;
+		gfloat _tmp5_ = 0.0F;
+		gfloat* _tmp6_ = NULL;
+		gint _tmp6__length1 = 0;
+		gfloat _tmp7_ = 0.0F;
+		gfloat _tmp8_ = 0.0F;
+		gfloat* _tmp9_ = NULL;
+		gint _tmp9__length1 = 0;
+		gfloat _tmp10_ = 0.0F;
+		gfloat _tmp11_ = 0.0F;
+		gfloat* _tmp12_ = NULL;
+		gint _tmp12__length1 = 0;
+		gfloat _tmp13_ = 0.0F;
+		gfloat _tmp14_ = 0.0F;
+		gfloat* _tmp15_ = NULL;
+		gint _tmp15__length1 = 0;
+		gfloat _tmp16_ = 0.0F;
+		gfloat _tmp17_ = 0.0F;
+		gfloat* _tmp18_ = NULL;
+		gint _tmp18__length1 = 0;
+		gfloat _tmp19_ = 0.0F;
+		gfloat _tmp20_ = 0.0F;
+		gfloat* _tmp21_ = NULL;
+		gint _tmp21__length1 = 0;
+		gfloat _tmp22_ = 0.0F;
+		gfloat _tmp23_ = 0.0F;
+#line 754 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+		_tmp3_ = self->priv->parameter;
+#line 754 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+		contrast_adjustment = (_tmp3_ / 16.0f) * CONTRAST_TRANSFORMATION_MAX_CONTRAST_ADJUSTMENT;
+#line 755 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+		_tmp4_ = contrast_adjustment;
+#line 755 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+		component_coefficient = 1.0f + _tmp4_;
+#line 756 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+		_tmp5_ = contrast_adjustment;
+#line 756 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+		component_offset = _tmp5_ / (-2.0f);
+#line 758 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+		_tmp6_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_RGB_TRANSFORMATION, RGBTransformation)->matrix_entries;
+#line 758 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+		_tmp6__length1 = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_RGB_TRANSFORMATION, RGBTransformation)->matrix_entries_length1;
+#line 758 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+		_tmp7_ = component_coefficient;
+#line 758 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+		_tmp6_[0] = _tmp7_;
+#line 758 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+		_tmp8_ = _tmp6_[0];
+#line 759 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+		_tmp9_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_RGB_TRANSFORMATION, RGBTransformation)->matrix_entries;
+#line 759 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+		_tmp9__length1 = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_RGB_TRANSFORMATION, RGBTransformation)->matrix_entries_length1;
+#line 759 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+		_tmp10_ = component_coefficient;
+#line 759 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+		_tmp9_[5] = _tmp10_;
+#line 759 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+		_tmp11_ = _tmp9_[5];
+#line 760 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+		_tmp12_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_RGB_TRANSFORMATION, RGBTransformation)->matrix_entries;
+#line 760 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+		_tmp12__length1 = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_RGB_TRANSFORMATION, RGBTransformation)->matrix_entries_length1;
+#line 760 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+		_tmp13_ = component_coefficient;
+#line 760 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+		_tmp12_[10] = _tmp13_;
+#line 760 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+		_tmp14_ = _tmp12_[10];
+#line 762 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+		_tmp15_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_RGB_TRANSFORMATION, RGBTransformation)->matrix_entries;
+#line 762 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+		_tmp15__length1 = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_RGB_TRANSFORMATION, RGBTransformation)->matrix_entries_length1;
+#line 762 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+		_tmp16_ = component_offset;
+#line 762 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+		_tmp15_[3] = _tmp16_;
+#line 762 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+		_tmp17_ = _tmp15_[3];
+#line 763 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+		_tmp18_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_RGB_TRANSFORMATION, RGBTransformation)->matrix_entries;
+#line 763 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+		_tmp18__length1 = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_RGB_TRANSFORMATION, RGBTransformation)->matrix_entries_length1;
+#line 763 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+		_tmp19_ = component_offset;
+#line 763 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+		_tmp18_[7] = _tmp19_;
+#line 763 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+		_tmp20_ = _tmp18_[7];
+#line 764 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+		_tmp21_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_RGB_TRANSFORMATION, RGBTransformation)->matrix_entries;
+#line 764 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+		_tmp21__length1 = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_RGB_TRANSFORMATION, RGBTransformation)->matrix_entries_length1;
+#line 764 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+		_tmp22_ = component_offset;
+#line 764 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+		_tmp21_[11] = _tmp22_;
+#line 764 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+		_tmp23_ = _tmp21_[11];
+#line 766 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+		G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_RGB_TRANSFORMATION, RGBTransformation)->identity = FALSE;
+#line 6446 "ColorTransformation.c"
+	}
+#line 747 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	return self;
+#line 6450 "ColorTransformation.c"
+}
+
+
+ContrastTransformation* contrast_transformation_new (gfloat client_parameter) {
+#line 747 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	return contrast_transformation_construct (TYPE_CONTRAST_TRANSFORMATION, client_parameter);
+#line 6457 "ColorTransformation.c"
+}
+
+
+gfloat contrast_transformation_get_parameter (ContrastTransformation* self) {
+	gfloat result = 0.0F;
+	gfloat _tmp0_ = 0.0F;
+#line 770 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	g_return_val_if_fail (IS_CONTRAST_TRANSFORMATION (self), 0.0F);
+#line 771 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	_tmp0_ = self->priv->parameter;
+#line 771 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	result = _tmp0_;
+#line 771 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	return result;
+#line 6472 "ColorTransformation.c"
+}
+
+
+static void contrast_transformation_class_init (ContrastTransformationClass * klass) {
+#line 739 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	contrast_transformation_parent_class = g_type_class_peek_parent (klass);
+#line 739 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	((PixelTransformationClass *) klass)->finalize = contrast_transformation_finalize;
+#line 739 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	g_type_class_add_private (klass, sizeof (ContrastTransformationPrivate));
+#line 6483 "ColorTransformation.c"
+}
+
+
+static void contrast_transformation_instance_init (ContrastTransformation * self) {
+#line 739 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	self->priv = CONTRAST_TRANSFORMATION_GET_PRIVATE (self);
+#line 6490 "ColorTransformation.c"
+}
+
+
+static void contrast_transformation_finalize (PixelTransformation* obj) {
+	ContrastTransformation * self;
+#line 739 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_CONTRAST_TRANSFORMATION, ContrastTransformation);
+#line 739 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	PIXEL_TRANSFORMATION_CLASS (contrast_transformation_parent_class)->finalize (obj);
+#line 6500 "ColorTransformation.c"
+}
+
+
+GType contrast_transformation_get_type (void) {
+	static volatile gsize contrast_transformation_type_id__volatile = 0;
+	if (g_once_init_enter (&contrast_transformation_type_id__volatile)) {
+		static const GTypeInfo g_define_type_info = { sizeof (ContrastTransformationClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) contrast_transformation_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (ContrastTransformation), 0, (GInstanceInitFunc) contrast_transformation_instance_init, NULL };
+		GType contrast_transformation_type_id;
+		contrast_transformation_type_id = g_type_register_static (TYPE_RGB_TRANSFORMATION, "ContrastTransformation", &g_define_type_info, 0);
+		g_once_init_leave (&contrast_transformation_type_id__volatile, contrast_transformation_type_id);
+	}
+	return contrast_transformation_type_id__volatile;
+}
+
+
 PixelTransformer* pixel_transformer_construct (GType object_type) {
 	PixelTransformer* self = NULL;
-#line 737 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 781 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self = (PixelTransformer*) g_type_create_instance (object_type);
-#line 737 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 781 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return self;
-#line 6251 "ColorTransformation.c"
+#line 6522 "ColorTransformation.c"
 }
 
 
 PixelTransformer* pixel_transformer_new (void) {
-#line 737 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 781 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return pixel_transformer_construct (TYPE_PIXEL_TRANSFORMER);
-#line 6258 "ColorTransformation.c"
+#line 6529 "ColorTransformation.c"
 }
 
 
 static gpointer _g_object_ref0 (gpointer self) {
-#line 743 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 787 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 6265 "ColorTransformation.c"
+#line 6536 "ColorTransformation.c"
 }
 
 
@@ -6270,13 +6541,13 @@ PixelTransformer* pixel_transformer_copy (PixelTransformer* self) {
 	PixelTransformer* result = NULL;
 	PixelTransformer* clone = NULL;
 	PixelTransformer* _tmp0_ = NULL;
-#line 740 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 784 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_return_val_if_fail (IS_PIXEL_TRANSFORMER (self), NULL);
-#line 741 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 785 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp0_ = pixel_transformer_new ();
-#line 741 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 785 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	clone = _tmp0_;
-#line 6279 "ColorTransformation.c"
+#line 6550 "ColorTransformation.c"
 	{
 		GeeArrayList* _transformation_list = NULL;
 		GeeArrayList* _tmp1_ = NULL;
@@ -6286,25 +6557,25 @@ PixelTransformer* pixel_transformer_copy (PixelTransformer* self) {
 		gint _tmp4_ = 0;
 		gint _tmp5_ = 0;
 		gint _transformation_index = 0;
-#line 743 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 787 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp1_ = self->priv->transformations;
-#line 743 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 787 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp2_ = _g_object_ref0 (_tmp1_);
-#line 743 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 787 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_transformation_list = _tmp2_;
-#line 743 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 787 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp3_ = _transformation_list;
-#line 743 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 787 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp4_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 743 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 787 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp5_ = _tmp4_;
-#line 743 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 787 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_transformation_size = _tmp5_;
-#line 743 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 787 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_transformation_index = -1;
-#line 743 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 787 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		while (TRUE) {
-#line 6307 "ColorTransformation.c"
+#line 6578 "ColorTransformation.c"
 			gint _tmp6_ = 0;
 			gint _tmp7_ = 0;
 			gint _tmp8_ = 0;
@@ -6315,49 +6586,49 @@ PixelTransformer* pixel_transformer_copy (PixelTransformer* self) {
 			PixelTransformer* _tmp12_ = NULL;
 			GeeArrayList* _tmp13_ = NULL;
 			PixelTransformation* _tmp14_ = NULL;
-#line 743 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 787 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp6_ = _transformation_index;
-#line 743 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 787 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_transformation_index = _tmp6_ + 1;
-#line 743 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 787 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp7_ = _transformation_index;
-#line 743 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 787 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp8_ = _transformation_size;
-#line 743 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 787 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			if (!(_tmp7_ < _tmp8_)) {
-#line 743 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 787 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				break;
-#line 6330 "ColorTransformation.c"
+#line 6601 "ColorTransformation.c"
 			}
-#line 743 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 787 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp9_ = _transformation_list;
-#line 743 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 787 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp10_ = _transformation_index;
-#line 743 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 787 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp11_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp10_);
-#line 743 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 787 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			transformation = (PixelTransformation*) _tmp11_;
-#line 744 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 788 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp12_ = clone;
-#line 744 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 788 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp13_ = _tmp12_->priv->transformations;
-#line 744 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 788 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp14_ = transformation;
-#line 744 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 788 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp14_);
-#line 743 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 787 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_pixel_transformation_unref0 (transformation);
-#line 6350 "ColorTransformation.c"
+#line 6621 "ColorTransformation.c"
 		}
-#line 743 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 787 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_g_object_unref0 (_transformation_list);
-#line 6354 "ColorTransformation.c"
+#line 6625 "ColorTransformation.c"
 	}
-#line 746 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 790 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	result = clone;
-#line 746 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 790 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return result;
-#line 6360 "ColorTransformation.c"
+#line 6631 "ColorTransformation.c"
 }
 
 
@@ -6367,41 +6638,41 @@ static void pixel_transformer_build_optimized_transformations (PixelTransformer*
 	gint _tmp2_ = 0;
 	PixelTransformation** _tmp3_ = NULL;
 	PixelTransformation* pre_trans = NULL;
-#line 749 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 793 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_return_if_fail (IS_PIXEL_TRANSFORMER (self));
-#line 750 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 794 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp0_ = self->priv->transformations;
-#line 750 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 794 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp1_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 750 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 794 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp2_ = _tmp1_;
-#line 750 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 794 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp3_ = g_new0 (PixelTransformation*, _tmp2_ + 1);
-#line 750 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 794 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv->optimized_transformations = (_vala_array_free (self->priv->optimized_transformations, self->priv->optimized_transformations_length1, (GDestroyNotify) pixel_transformation_unref), NULL);
-#line 750 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 794 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv->optimized_transformations = _tmp3_;
-#line 750 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 794 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv->optimized_transformations_length1 = _tmp2_;
-#line 750 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 794 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv->_optimized_transformations_size_ = self->priv->optimized_transformations_length1;
-#line 752 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 796 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	pre_trans = NULL;
-#line 753 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 797 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv->optimized_slots_used = 0;
-#line 6392 "ColorTransformation.c"
+#line 6663 "ColorTransformation.c"
 	{
 		gint i = 0;
-#line 754 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 798 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		i = 0;
-#line 6397 "ColorTransformation.c"
+#line 6668 "ColorTransformation.c"
 		{
 			gboolean _tmp4_ = FALSE;
-#line 754 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 798 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp4_ = TRUE;
-#line 754 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 798 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			while (TRUE) {
-#line 6404 "ColorTransformation.c"
+#line 6675 "ColorTransformation.c"
 				gint _tmp6_ = 0;
 				GeeArrayList* _tmp7_ = NULL;
 				gint _tmp8_ = 0;
@@ -6418,139 +6689,139 @@ static void pixel_transformer_build_optimized_transformations (PixelTransformer*
 				gboolean _tmp21_ = FALSE;
 				gboolean _tmp22_ = FALSE;
 				PixelTransformation* _tmp23_ = NULL;
-#line 754 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 798 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				if (!_tmp4_) {
-#line 6423 "ColorTransformation.c"
+#line 6694 "ColorTransformation.c"
 					gint _tmp5_ = 0;
-#line 754 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 798 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp5_ = i;
-#line 754 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 798 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					i = _tmp5_ + 1;
-#line 6429 "ColorTransformation.c"
+#line 6700 "ColorTransformation.c"
 				}
-#line 754 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 798 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp4_ = FALSE;
-#line 754 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 798 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp6_ = i;
-#line 754 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 798 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp7_ = self->priv->transformations;
-#line 754 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 798 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp8_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 754 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 798 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp9_ = _tmp8_;
-#line 754 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 798 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				if (!(_tmp6_ < _tmp9_)) {
-#line 754 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 798 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					break;
-#line 6445 "ColorTransformation.c"
+#line 6716 "ColorTransformation.c"
 				}
-#line 755 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 799 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp10_ = self->priv->transformations;
-#line 755 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 799 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp11_ = i;
-#line 755 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 799 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp12_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp11_);
-#line 755 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 799 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				trans = (PixelTransformation*) _tmp12_;
-#line 757 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 801 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp13_ = trans;
-#line 757 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 801 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp14_ = pixel_transformation_is_identity (_tmp13_);
-#line 757 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 801 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				if (_tmp14_) {
-#line 758 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 802 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_pixel_transformation_unref0 (trans);
-#line 758 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 802 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					continue;
-#line 6465 "ColorTransformation.c"
+#line 6736 "ColorTransformation.c"
 				}
-#line 760 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 804 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				this_trans = NULL;
-#line 761 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 805 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp15_ = trans;
-#line 761 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 805 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp16_ = pixel_transformation_get_composition_mode (_tmp15_);
-#line 761 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 805 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				if (_tmp16_ == COMPOSITION_MODE_NONE) {
-#line 6475 "ColorTransformation.c"
+#line 6746 "ColorTransformation.c"
 					PixelTransformation* _tmp17_ = NULL;
 					PixelTransformation* _tmp18_ = NULL;
-#line 762 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 806 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp17_ = trans;
-#line 762 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 806 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp18_ = _pixel_transformation_ref0 (_tmp17_);
-#line 762 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 806 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_pixel_transformation_unref0 (this_trans);
-#line 762 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 806 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					this_trans = _tmp18_;
-#line 6486 "ColorTransformation.c"
+#line 6757 "ColorTransformation.c"
 				} else {
 					PixelTransformation* _tmp19_ = NULL;
 					PixelTransformation* _tmp20_ = NULL;
-#line 764 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 808 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp19_ = trans;
-#line 764 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 808 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp20_ = pixel_transformation_copy (_tmp19_);
-#line 764 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 808 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_pixel_transformation_unref0 (this_trans);
-#line 764 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 808 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					this_trans = _tmp20_;
-#line 6498 "ColorTransformation.c"
+#line 6769 "ColorTransformation.c"
 				}
-#line 766 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 810 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp23_ = pre_trans;
-#line 766 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 810 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				if (_tmp23_ != NULL) {
-#line 6504 "ColorTransformation.c"
+#line 6775 "ColorTransformation.c"
 					PixelTransformation* _tmp24_ = NULL;
 					CompositionMode _tmp25_ = 0;
-#line 766 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 810 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp24_ = this_trans;
-#line 766 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 810 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp25_ = pixel_transformation_get_composition_mode (_tmp24_);
-#line 766 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 810 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp22_ = _tmp25_ != COMPOSITION_MODE_NONE;
-#line 6513 "ColorTransformation.c"
+#line 6784 "ColorTransformation.c"
 				} else {
-#line 766 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 810 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp22_ = FALSE;
-#line 6517 "ColorTransformation.c"
+#line 6788 "ColorTransformation.c"
 				}
-#line 766 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 810 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				if (_tmp22_) {
-#line 6521 "ColorTransformation.c"
+#line 6792 "ColorTransformation.c"
 					PixelTransformation* _tmp26_ = NULL;
 					CompositionMode _tmp27_ = 0;
 					PixelTransformation* _tmp28_ = NULL;
 					CompositionMode _tmp29_ = 0;
-#line 767 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 811 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp26_ = this_trans;
-#line 767 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 811 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp27_ = pixel_transformation_get_composition_mode (_tmp26_);
-#line 767 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 811 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp28_ = pre_trans;
-#line 767 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 811 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp29_ = pixel_transformation_get_composition_mode (_tmp28_);
-#line 767 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 811 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp21_ = _tmp27_ == _tmp29_;
-#line 6536 "ColorTransformation.c"
+#line 6807 "ColorTransformation.c"
 				} else {
-#line 766 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 810 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp21_ = FALSE;
-#line 6540 "ColorTransformation.c"
+#line 6811 "ColorTransformation.c"
 				}
-#line 766 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 810 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				if (_tmp21_) {
-#line 6544 "ColorTransformation.c"
+#line 6815 "ColorTransformation.c"
 					PixelTransformation* _tmp30_ = NULL;
 					PixelTransformation* _tmp31_ = NULL;
-#line 768 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 812 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp30_ = pre_trans;
-#line 768 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 812 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp31_ = this_trans;
-#line 768 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 812 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					pixel_transformation_compose_with (_tmp30_, _tmp31_);
-#line 6553 "ColorTransformation.c"
+#line 6824 "ColorTransformation.c"
 				} else {
 					PixelTransformation** _tmp32_ = NULL;
 					gint _tmp32__length1 = 0;
@@ -6560,45 +6831,45 @@ static void pixel_transformer_build_optimized_transformations (PixelTransformer*
 					PixelTransformation* _tmp36_ = NULL;
 					PixelTransformation* _tmp37_ = NULL;
 					PixelTransformation* _tmp38_ = NULL;
-#line 770 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 814 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp32_ = self->priv->optimized_transformations;
-#line 770 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 814 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp32__length1 = self->priv->optimized_transformations_length1;
-#line 770 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 814 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp33_ = self->priv->optimized_slots_used;
-#line 770 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 814 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					self->priv->optimized_slots_used = _tmp33_ + 1;
-#line 770 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 814 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp34_ = this_trans;
-#line 770 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 814 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp35_ = _pixel_transformation_ref0 (_tmp34_);
-#line 770 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 814 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_pixel_transformation_unref0 (_tmp32_[_tmp33_]);
-#line 770 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 814 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp32_[_tmp33_] = _tmp35_;
-#line 770 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 814 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp36_ = _tmp32_[_tmp33_];
-#line 771 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 815 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp37_ = this_trans;
-#line 771 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 815 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp38_ = _pixel_transformation_ref0 (_tmp37_);
-#line 771 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 815 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_pixel_transformation_unref0 (pre_trans);
-#line 771 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 815 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					pre_trans = _tmp38_;
-#line 6589 "ColorTransformation.c"
+#line 6860 "ColorTransformation.c"
 				}
-#line 754 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 798 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_pixel_transformation_unref0 (this_trans);
-#line 754 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 798 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_pixel_transformation_unref0 (trans);
-#line 6595 "ColorTransformation.c"
+#line 6866 "ColorTransformation.c"
 			}
 		}
 	}
-#line 749 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 793 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_pixel_transformation_unref0 (pre_trans);
-#line 6601 "ColorTransformation.c"
+#line 6872 "ColorTransformation.c"
 }
 
 
@@ -6608,31 +6879,31 @@ static void pixel_transformer_apply_transformations (PixelTransformer* self, RGB
 	RGBAnalyticPixel _tmp0_ = {0};
 	HSVAnalyticPixel p_hsv = {0};
 	PixelFormat _tmp21_ = 0;
-#line 776 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 820 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_return_if_fail (IS_PIXEL_TRANSFORMER (self));
-#line 776 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 820 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_return_if_fail (p != NULL);
-#line 777 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 821 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	current_format = PIXEL_FORMAT_RGB;
-#line 778 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 822 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp0_ = *p;
-#line 778 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 822 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	p_rgb = _tmp0_;
-#line 779 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 823 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	hsv_analytic_pixel_init (&p_hsv);
-#line 6623 "ColorTransformation.c"
+#line 6894 "ColorTransformation.c"
 	{
 		gint i = 0;
-#line 781 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 825 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		i = 0;
-#line 6628 "ColorTransformation.c"
+#line 6899 "ColorTransformation.c"
 		{
 			gboolean _tmp1_ = FALSE;
-#line 781 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 825 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp1_ = TRUE;
-#line 781 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 825 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			while (TRUE) {
-#line 6635 "ColorTransformation.c"
+#line 6906 "ColorTransformation.c"
 				gint _tmp3_ = 0;
 				gint _tmp4_ = 0;
 				PixelTransformation* trans = NULL;
@@ -6643,199 +6914,199 @@ static void pixel_transformer_apply_transformations (PixelTransformer* self, RGB
 				PixelTransformation* _tmp8_ = NULL;
 				PixelTransformation* _tmp9_ = NULL;
 				PixelFormat _tmp10_ = 0;
-#line 781 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 825 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				if (!_tmp1_) {
-#line 6648 "ColorTransformation.c"
+#line 6919 "ColorTransformation.c"
 					gint _tmp2_ = 0;
-#line 781 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 825 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp2_ = i;
-#line 781 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 825 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					i = _tmp2_ + 1;
-#line 6654 "ColorTransformation.c"
+#line 6925 "ColorTransformation.c"
 				}
-#line 781 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 825 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp1_ = FALSE;
-#line 781 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 825 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp3_ = i;
-#line 781 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 825 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp4_ = self->priv->optimized_slots_used;
-#line 781 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 825 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				if (!(_tmp3_ < _tmp4_)) {
-#line 781 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 825 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					break;
-#line 6666 "ColorTransformation.c"
+#line 6937 "ColorTransformation.c"
 				}
-#line 782 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 826 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp5_ = self->priv->optimized_transformations;
-#line 782 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 826 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp5__length1 = self->priv->optimized_transformations_length1;
-#line 782 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 826 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp6_ = i;
-#line 782 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 826 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp7_ = _tmp5_[_tmp6_];
-#line 782 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 826 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp8_ = _pixel_transformation_ref0 (_tmp7_);
-#line 782 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 826 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				trans = _tmp8_;
-#line 783 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 827 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp9_ = trans;
-#line 783 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 827 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp10_ = pixel_transformation_get_preferred_format (_tmp9_);
-#line 783 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 827 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				if (_tmp10_ == PIXEL_FORMAT_RGB) {
-#line 6686 "ColorTransformation.c"
+#line 6957 "ColorTransformation.c"
 					PixelFormat _tmp11_ = 0;
 					PixelTransformation* _tmp13_ = NULL;
 					RGBAnalyticPixel _tmp14_ = {0};
 					RGBAnalyticPixel _tmp15_ = {0};
-#line 784 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 828 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp11_ = current_format;
-#line 784 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 828 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					if (_tmp11_ == PIXEL_FORMAT_HSV) {
-#line 6695 "ColorTransformation.c"
+#line 6966 "ColorTransformation.c"
 						RGBAnalyticPixel _tmp12_ = {0};
-#line 785 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 829 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 						hsv_analytic_pixel_to_rgb (&p_hsv, &_tmp12_);
-#line 785 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 829 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 						p_rgb = _tmp12_;
-#line 786 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 830 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 						current_format = PIXEL_FORMAT_RGB;
-#line 6703 "ColorTransformation.c"
+#line 6974 "ColorTransformation.c"
 					}
-#line 788 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 832 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp13_ = trans;
-#line 788 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 832 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp14_ = p_rgb;
-#line 788 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 832 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					pixel_transformation_transform_pixel_rgb (_tmp13_, &_tmp14_, &_tmp15_);
-#line 788 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 832 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					p_rgb = _tmp15_;
-#line 6713 "ColorTransformation.c"
+#line 6984 "ColorTransformation.c"
 				} else {
 					PixelFormat _tmp16_ = 0;
 					PixelTransformation* _tmp18_ = NULL;
 					HSVAnalyticPixel _tmp19_ = {0};
 					HSVAnalyticPixel _tmp20_ = {0};
-#line 790 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 834 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp16_ = current_format;
-#line 790 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 834 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					if (_tmp16_ == PIXEL_FORMAT_RGB) {
-#line 6723 "ColorTransformation.c"
+#line 6994 "ColorTransformation.c"
 						HSVAnalyticPixel _tmp17_ = {0};
-#line 791 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 835 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 						rgb_analytic_pixel_to_hsv (&p_rgb, &_tmp17_);
-#line 791 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 835 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 						p_hsv = _tmp17_;
-#line 792 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 836 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 						current_format = PIXEL_FORMAT_HSV;
-#line 6731 "ColorTransformation.c"
+#line 7002 "ColorTransformation.c"
 					}
-#line 794 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 838 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp18_ = trans;
-#line 794 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 838 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp19_ = p_hsv;
-#line 794 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 838 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					pixel_transformation_transform_pixel_hsv (_tmp18_, &_tmp19_, &_tmp20_);
-#line 794 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 838 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					p_hsv = _tmp20_;
-#line 6741 "ColorTransformation.c"
+#line 7012 "ColorTransformation.c"
 				}
-#line 781 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 825 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_pixel_transformation_unref0 (trans);
-#line 6745 "ColorTransformation.c"
+#line 7016 "ColorTransformation.c"
 			}
 		}
 	}
-#line 798 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 842 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp21_ = current_format;
-#line 798 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 842 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (_tmp21_ == PIXEL_FORMAT_HSV) {
-#line 6753 "ColorTransformation.c"
+#line 7024 "ColorTransformation.c"
 		RGBAnalyticPixel _tmp22_ = {0};
-#line 799 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 843 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		hsv_analytic_pixel_to_rgb (&p_hsv, &_tmp22_);
-#line 799 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 843 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		p_rgb = _tmp22_;
-#line 6759 "ColorTransformation.c"
+#line 7030 "ColorTransformation.c"
 	}
-#line 801 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 845 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	*result = p_rgb;
-#line 801 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 845 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return;
-#line 6765 "ColorTransformation.c"
+#line 7036 "ColorTransformation.c"
 }
 
 
 void pixel_transformer_attach_transformation (PixelTransformer* self, PixelTransformation* trans) {
 	GeeArrayList* _tmp0_ = NULL;
 	PixelTransformation* _tmp1_ = NULL;
-#line 807 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 851 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_return_if_fail (IS_PIXEL_TRANSFORMER (self));
-#line 807 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 851 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_return_if_fail (IS_PIXEL_TRANSFORMATION (trans));
-#line 808 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 852 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp0_ = self->priv->transformations;
-#line 808 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 852 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp1_ = trans;
-#line 808 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 852 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp1_);
-#line 809 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 853 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv->optimized_transformations = (_vala_array_free (self->priv->optimized_transformations, self->priv->optimized_transformations_length1, (GDestroyNotify) pixel_transformation_unref), NULL);
-#line 809 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 853 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv->optimized_transformations = NULL;
-#line 809 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 853 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv->optimized_transformations_length1 = 0;
-#line 809 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 853 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv->_optimized_transformations_size_ = self->priv->optimized_transformations_length1;
-#line 6790 "ColorTransformation.c"
+#line 7061 "ColorTransformation.c"
 }
 
 
 void pixel_transformer_detach_transformation (PixelTransformer* self, PixelTransformation* victim) {
 	GeeArrayList* _tmp0_ = NULL;
 	PixelTransformation* _tmp1_ = NULL;
-#line 814 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 858 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_return_if_fail (IS_PIXEL_TRANSFORMER (self));
-#line 814 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 858 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_return_if_fail (IS_PIXEL_TRANSFORMATION (victim));
-#line 815 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 859 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp0_ = self->priv->transformations;
-#line 815 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 859 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp1_ = victim;
-#line 815 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 859 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	gee_abstract_collection_remove (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp1_);
-#line 816 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 860 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv->optimized_transformations = (_vala_array_free (self->priv->optimized_transformations, self->priv->optimized_transformations_length1, (GDestroyNotify) pixel_transformation_unref), NULL);
-#line 816 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 860 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv->optimized_transformations = NULL;
-#line 816 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 860 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv->optimized_transformations_length1 = 0;
-#line 816 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 860 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv->_optimized_transformations_size_ = self->priv->optimized_transformations_length1;
-#line 6815 "ColorTransformation.c"
+#line 7086 "ColorTransformation.c"
 }
 
 
 void pixel_transformer_replace_transformation (PixelTransformer* self, PixelTransformation* old_trans, PixelTransformation* new_trans) {
-#line 821 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 865 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_return_if_fail (IS_PIXEL_TRANSFORMER (self));
-#line 821 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 865 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_return_if_fail (IS_PIXEL_TRANSFORMATION (old_trans));
-#line 821 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 865 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_return_if_fail (IS_PIXEL_TRANSFORMATION (new_trans));
-#line 6826 "ColorTransformation.c"
+#line 7097 "ColorTransformation.c"
 	{
 		gint i = 0;
-#line 823 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 867 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		i = 0;
-#line 6831 "ColorTransformation.c"
+#line 7102 "ColorTransformation.c"
 		{
 			gboolean _tmp0_ = FALSE;
-#line 823 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 867 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp0_ = TRUE;
-#line 823 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 867 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			while (TRUE) {
-#line 6838 "ColorTransformation.c"
+#line 7109 "ColorTransformation.c"
 				gint _tmp2_ = 0;
 				GeeArrayList* _tmp3_ = NULL;
 				gint _tmp4_ = 0;
@@ -6846,79 +7117,79 @@ void pixel_transformer_replace_transformation (PixelTransformer* self, PixelTran
 				PixelTransformation* _tmp9_ = NULL;
 				PixelTransformation* _tmp10_ = NULL;
 				gboolean _tmp11_ = FALSE;
-#line 823 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 867 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				if (!_tmp0_) {
-#line 6851 "ColorTransformation.c"
+#line 7122 "ColorTransformation.c"
 					gint _tmp1_ = 0;
-#line 823 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 867 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp1_ = i;
-#line 823 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 867 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					i = _tmp1_ + 1;
-#line 6857 "ColorTransformation.c"
+#line 7128 "ColorTransformation.c"
 				}
-#line 823 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 867 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp0_ = FALSE;
-#line 823 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 867 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp2_ = i;
-#line 823 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 867 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp3_ = self->priv->transformations;
-#line 823 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 867 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp4_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 823 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 867 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp5_ = _tmp4_;
-#line 823 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 867 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				if (!(_tmp2_ < _tmp5_)) {
-#line 823 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 867 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					break;
-#line 6873 "ColorTransformation.c"
+#line 7144 "ColorTransformation.c"
 				}
-#line 824 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 868 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp6_ = self->priv->transformations;
-#line 824 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 868 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp7_ = i;
-#line 824 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 868 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp8_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp7_);
-#line 824 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 868 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp9_ = (PixelTransformation*) _tmp8_;
-#line 824 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 868 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp10_ = old_trans;
-#line 824 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 868 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp11_ = _tmp9_ == _tmp10_;
-#line 824 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 868 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_pixel_transformation_unref0 (_tmp9_);
-#line 824 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 868 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				if (_tmp11_) {
-#line 6891 "ColorTransformation.c"
+#line 7162 "ColorTransformation.c"
 					GeeArrayList* _tmp12_ = NULL;
 					gint _tmp13_ = 0;
 					PixelTransformation* _tmp14_ = NULL;
-#line 825 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 869 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp12_ = self->priv->transformations;
-#line 825 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 869 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp13_ = i;
-#line 825 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 869 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp14_ = new_trans;
-#line 825 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 869 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					gee_abstract_list_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp13_, _tmp14_);
-#line 827 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 871 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					self->priv->optimized_transformations = (_vala_array_free (self->priv->optimized_transformations, self->priv->optimized_transformations_length1, (GDestroyNotify) pixel_transformation_unref), NULL);
-#line 827 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 871 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					self->priv->optimized_transformations = NULL;
-#line 827 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 871 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					self->priv->optimized_transformations_length1 = 0;
-#line 827 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 871 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					self->priv->_optimized_transformations_size_ = self->priv->optimized_transformations_length1;
-#line 828 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 872 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					return;
-#line 6913 "ColorTransformation.c"
+#line 7184 "ColorTransformation.c"
 				}
 			}
 		}
 	}
-#line 831 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	g_error ("ColorTransformation.vala:831: %s", "PixelTransformer: replace_transformation( ): old_trans is not present " \
+#line 875 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	g_error ("ColorTransformation.vala:875: %s", "PixelTransformer: replace_transformation( ): old_trans is not present " \
 "in " "transformation collection");
-#line 6920 "ColorTransformation.c"
+#line 7191 "ColorTransformation.c"
 }
 
 
@@ -6926,21 +7197,21 @@ void pixel_transformer_transform_pixbuf (PixelTransformer* self, GdkPixbuf* pixb
 	GdkPixbuf* _tmp0_ = NULL;
 	GdkPixbuf* _tmp1_ = NULL;
 	GCancellable* _tmp2_ = NULL;
-#line 835 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 879 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_return_if_fail (IS_PIXEL_TRANSFORMER (self));
-#line 835 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 879 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_return_if_fail (GDK_IS_PIXBUF (pixbuf));
-#line 835 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 879 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_return_if_fail ((cancellable == NULL) || G_IS_CANCELLABLE (cancellable));
-#line 836 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 880 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp0_ = pixbuf;
-#line 836 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 880 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp1_ = pixbuf;
-#line 836 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 880 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp2_ = cancellable;
-#line 836 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 880 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	pixel_transformer_transform_to_other_pixbuf (self, _tmp0_, _tmp1_, _tmp2_);
-#line 6942 "ColorTransformation.c"
+#line 7213 "ColorTransformation.c"
 }
 
 
@@ -6965,69 +7236,69 @@ void pixel_transformer_transform_from_fp (PixelTransformer* self, gfloat** fp_pi
 	gint dest_pixels_length1 = 0;
 	gint _dest_pixels_size_ = 0;
 	gint cache_pixel_ticker = 0;
-#line 839 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 883 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_return_if_fail (IS_PIXEL_TRANSFORMER (self));
-#line 839 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 883 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_return_if_fail (GDK_IS_PIXBUF (dest));
-#line 840 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 884 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp0_ = self->priv->optimized_transformations;
-#line 840 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 884 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp0__length1 = self->priv->optimized_transformations_length1;
-#line 840 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 884 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (_tmp0_ == NULL) {
-#line 841 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 885 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		pixel_transformer_build_optimized_transformations (self);
-#line 6979 "ColorTransformation.c"
+#line 7250 "ColorTransformation.c"
 	}
-#line 843 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 887 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp1_ = dest;
-#line 843 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 887 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp2_ = gdk_pixbuf_get_width (_tmp1_);
-#line 843 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 887 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	dest_width = _tmp2_;
-#line 844 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 888 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp3_ = dest;
-#line 844 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 888 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp4_ = gdk_pixbuf_get_height (_tmp3_);
-#line 844 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 888 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	dest_height = _tmp4_;
-#line 845 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 889 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp5_ = dest;
-#line 845 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 889 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp6_ = gdk_pixbuf_get_n_channels (_tmp5_);
-#line 845 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 889 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	dest_num_channels = _tmp6_;
-#line 846 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 890 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp7_ = dest;
-#line 846 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 890 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp8_ = gdk_pixbuf_get_rowstride (_tmp7_);
-#line 846 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 890 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	dest_rowstride = _tmp8_;
-#line 847 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 891 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp9_ = dest;
-#line 847 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 891 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp10_ = gdk_pixbuf_get_pixels (_tmp9_);
-#line 847 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 891 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	dest_pixels = _tmp10_;
-#line 847 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 891 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	dest_pixels_length1 = -1;
-#line 847 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 891 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_dest_pixels_size_ = dest_pixels_length1;
-#line 849 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 893 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	cache_pixel_ticker = 0;
-#line 7017 "ColorTransformation.c"
+#line 7288 "ColorTransformation.c"
 	{
 		gint j = 0;
-#line 851 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 895 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		j = 0;
-#line 7022 "ColorTransformation.c"
+#line 7293 "ColorTransformation.c"
 		{
 			gboolean _tmp11_ = FALSE;
-#line 851 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 895 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp11_ = TRUE;
-#line 851 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 895 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			while (TRUE) {
-#line 7029 "ColorTransformation.c"
+#line 7300 "ColorTransformation.c"
 				gint _tmp13_ = 0;
 				gint _tmp14_ = 0;
 				gint row_start_index = 0;
@@ -7037,58 +7308,58 @@ void pixel_transformer_transform_from_fp (PixelTransformer* self, gfloat** fp_pi
 				gint _tmp17_ = 0;
 				gint _tmp18_ = 0;
 				gint _tmp19_ = 0;
-#line 851 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 895 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				if (!_tmp11_) {
-#line 7041 "ColorTransformation.c"
+#line 7312 "ColorTransformation.c"
 					gint _tmp12_ = 0;
-#line 851 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 895 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp12_ = j;
-#line 851 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 895 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					j = _tmp12_ + 1;
-#line 7047 "ColorTransformation.c"
+#line 7318 "ColorTransformation.c"
 				}
-#line 851 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 895 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp11_ = FALSE;
-#line 851 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 895 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp13_ = j;
-#line 851 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 895 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp14_ = dest_height;
-#line 851 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 895 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				if (!(_tmp13_ < _tmp14_)) {
-#line 851 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 895 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					break;
-#line 7059 "ColorTransformation.c"
+#line 7330 "ColorTransformation.c"
 				}
-#line 852 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 896 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp15_ = j;
-#line 852 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 896 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp16_ = dest_rowstride;
-#line 852 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 896 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				row_start_index = _tmp15_ * _tmp16_;
-#line 853 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 897 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp17_ = row_start_index;
-#line 853 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 897 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp18_ = dest_width;
-#line 853 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 897 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp19_ = dest_num_channels;
-#line 853 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 897 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				row_end_index = _tmp17_ + (_tmp18_ * _tmp19_);
-#line 7075 "ColorTransformation.c"
+#line 7346 "ColorTransformation.c"
 				{
 					gint i = 0;
 					gint _tmp20_ = 0;
-#line 854 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 898 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp20_ = row_start_index;
-#line 854 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 898 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					i = _tmp20_;
-#line 7083 "ColorTransformation.c"
+#line 7354 "ColorTransformation.c"
 					{
 						gboolean _tmp21_ = FALSE;
-#line 854 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 898 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 						_tmp21_ = TRUE;
-#line 854 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 898 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 						while (TRUE) {
-#line 7090 "ColorTransformation.c"
+#line 7361 "ColorTransformation.c"
 							gint _tmp24_ = 0;
 							gint _tmp25_ = 0;
 							RGBAnalyticPixel pixel = {0};
@@ -7125,110 +7396,110 @@ void pixel_transformer_transform_from_fp (PixelTransformer* self, gfloat** fp_pi
 							RGBAnalyticPixel _tmp50_ = {0};
 							gfloat _tmp51_ = 0.0F;
 							guchar _tmp52_ = '\0';
-#line 854 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 898 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							if (!_tmp21_) {
-#line 7129 "ColorTransformation.c"
+#line 7400 "ColorTransformation.c"
 								gint _tmp22_ = 0;
 								gint _tmp23_ = 0;
-#line 854 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 898 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 								_tmp22_ = i;
-#line 854 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 898 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 								_tmp23_ = dest_num_channels;
-#line 854 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 898 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 								i = _tmp22_ + _tmp23_;
-#line 7138 "ColorTransformation.c"
+#line 7409 "ColorTransformation.c"
 							}
-#line 854 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 898 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp21_ = FALSE;
-#line 854 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 898 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp24_ = i;
-#line 854 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 898 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp25_ = row_end_index;
-#line 854 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 898 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							if (!(_tmp24_ < _tmp25_)) {
-#line 854 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 898 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 								break;
-#line 7150 "ColorTransformation.c"
+#line 7421 "ColorTransformation.c"
 							}
-#line 855 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 899 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp26_ = *fp_pixel_cache;
-#line 855 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 899 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp26__length1 = *fp_pixel_cache_length1;
-#line 855 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 899 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp27_ = cache_pixel_ticker;
-#line 855 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 899 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp28_ = _tmp26_[_tmp27_];
-#line 855 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 899 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp29_ = *fp_pixel_cache;
-#line 855 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 899 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp29__length1 = *fp_pixel_cache_length1;
-#line 855 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 899 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp30_ = cache_pixel_ticker;
-#line 855 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 899 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp31_ = _tmp29_[_tmp30_ + 1];
-#line 855 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 899 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp32_ = *fp_pixel_cache;
-#line 855 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 899 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp32__length1 = *fp_pixel_cache_length1;
-#line 855 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 899 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp33_ = cache_pixel_ticker;
-#line 855 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 899 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp34_ = _tmp32_[_tmp33_ + 2];
-#line 855 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 899 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							rgb_analytic_pixel_init_from_components (&pixel, _tmp28_, _tmp31_, _tmp34_);
-#line 860 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 904 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp35_ = cache_pixel_ticker;
-#line 860 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 904 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							cache_pixel_ticker = _tmp35_ + 3;
-#line 862 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 906 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp36_ = pixel;
-#line 862 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 906 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							pixel_transformer_apply_transformations (self, &_tmp36_, &_tmp37_);
-#line 862 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 906 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							pixel = _tmp37_;
-#line 864 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 908 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp38_ = dest_pixels;
-#line 864 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 908 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp38__length1 = dest_pixels_length1;
-#line 864 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 908 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp39_ = i;
-#line 864 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 908 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp40_ = pixel;
-#line 864 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 908 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp41_ = _tmp40_.red;
-#line 864 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 908 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp38_[_tmp39_] = (guchar) (_tmp41_ * 255.0f);
-#line 864 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 908 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp42_ = _tmp38_[_tmp39_];
-#line 865 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 909 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp43_ = dest_pixels;
-#line 865 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 909 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp43__length1 = dest_pixels_length1;
-#line 865 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 909 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp44_ = i;
-#line 865 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 909 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp45_ = pixel;
-#line 865 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 909 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp46_ = _tmp45_.green;
-#line 865 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 909 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp43_[_tmp44_ + 1] = (guchar) (_tmp46_ * 255.0f);
-#line 865 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 909 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp47_ = _tmp43_[_tmp44_ + 1];
-#line 866 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 910 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp48_ = dest_pixels;
-#line 866 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 910 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp48__length1 = dest_pixels_length1;
-#line 866 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 910 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp49_ = i;
-#line 866 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 910 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp50_ = pixel;
-#line 866 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 910 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp51_ = _tmp50_.blue;
-#line 866 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 910 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp48_[_tmp49_ + 2] = (guchar) (_tmp51_ * 255.0f);
-#line 866 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 910 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp52_ = _tmp48_[_tmp49_ + 2];
-#line 7230 "ColorTransformation.c"
+#line 7501 "ColorTransformation.c"
 						}
 					}
 				}
@@ -7284,144 +7555,144 @@ void pixel_transformer_transform_to_other_pixbuf (PixelTransformer* self, GdkPix
 	guint8* _tmp32_ = NULL;
 	gint dest_pixels_length1 = 0;
 	gint _dest_pixels_size_ = 0;
-#line 871 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 915 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_return_if_fail (IS_PIXEL_TRANSFORMER (self));
-#line 871 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 915 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_return_if_fail (GDK_IS_PIXBUF (source));
-#line 871 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 915 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_return_if_fail (GDK_IS_PIXBUF (dest));
-#line 871 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 915 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_return_if_fail ((cancellable == NULL) || G_IS_CANCELLABLE (cancellable));
-#line 873 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 917 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp0_ = source;
-#line 873 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 917 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp1_ = gdk_pixbuf_get_width (_tmp0_);
-#line 873 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 917 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp2_ = _tmp1_;
-#line 873 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 917 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp3_ = dest;
-#line 873 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 917 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp4_ = gdk_pixbuf_get_width (_tmp3_);
-#line 873 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 917 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp5_ = _tmp4_;
-#line 873 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 917 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (_tmp2_ != _tmp5_) {
-#line 874 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-		g_error ("ColorTransformation.vala:874: PixelTransformer: source and destination" \
+#line 918 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+		g_error ("ColorTransformation.vala:918: PixelTransformer: source and destination" \
 " pixbufs must have the same width");
-#line 7310 "ColorTransformation.c"
+#line 7581 "ColorTransformation.c"
 	}
-#line 876 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 920 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp6_ = source;
-#line 876 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 920 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp7_ = gdk_pixbuf_get_height (_tmp6_);
-#line 876 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 920 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp8_ = _tmp7_;
-#line 876 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 920 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp9_ = dest;
-#line 876 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 920 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp10_ = gdk_pixbuf_get_height (_tmp9_);
-#line 876 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 920 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp11_ = _tmp10_;
-#line 876 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 920 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (_tmp8_ != _tmp11_) {
-#line 877 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-		g_error ("ColorTransformation.vala:877: PixelTransformer: source and destination" \
+#line 921 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+		g_error ("ColorTransformation.vala:921: PixelTransformer: source and destination" \
 " pixbufs must have the same height");
-#line 7328 "ColorTransformation.c"
+#line 7599 "ColorTransformation.c"
 	}
-#line 879 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 923 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp12_ = source;
-#line 879 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 923 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp13_ = gdk_pixbuf_get_n_channels (_tmp12_);
-#line 879 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 923 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp14_ = _tmp13_;
-#line 879 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 923 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp15_ = dest;
-#line 879 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 923 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp16_ = gdk_pixbuf_get_n_channels (_tmp15_);
-#line 879 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 923 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp17_ = _tmp16_;
-#line 879 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 923 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (_tmp14_ != _tmp17_) {
-#line 880 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-		g_error ("ColorTransformation.vala:880: %s", "PixelTransformer: source and destination pixbufs must have the same nu" \
+#line 924 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+		g_error ("ColorTransformation.vala:924: %s", "PixelTransformer: source and destination pixbufs must have the same nu" \
 "mber " "of channels");
-#line 7346 "ColorTransformation.c"
+#line 7617 "ColorTransformation.c"
 	}
-#line 883 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 927 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp18_ = self->priv->optimized_transformations;
-#line 883 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 927 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp18__length1 = self->priv->optimized_transformations_length1;
-#line 883 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 927 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (_tmp18_ == NULL) {
-#line 884 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 928 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		pixel_transformer_build_optimized_transformations (self);
-#line 7356 "ColorTransformation.c"
+#line 7627 "ColorTransformation.c"
 	}
-#line 886 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 930 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp19_ = source;
-#line 886 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 930 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp20_ = gdk_pixbuf_get_n_channels (_tmp19_);
-#line 886 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 930 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	n_channels = _tmp20_;
-#line 887 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 931 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp21_ = source;
-#line 887 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 931 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp22_ = gdk_pixbuf_get_rowstride (_tmp21_);
-#line 887 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 931 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	rowstride = _tmp22_;
-#line 888 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 932 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp23_ = source;
-#line 888 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 932 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp24_ = gdk_pixbuf_get_width (_tmp23_);
-#line 888 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 932 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	width = _tmp24_;
-#line 889 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 933 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp25_ = source;
-#line 889 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 933 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp26_ = gdk_pixbuf_get_height (_tmp25_);
-#line 889 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 933 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	height = _tmp26_;
-#line 890 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 934 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp27_ = n_channels;
-#line 890 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 934 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp28_ = width;
-#line 890 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 934 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	rowbytes = _tmp27_ * _tmp28_;
-#line 891 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 935 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp29_ = source;
-#line 891 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 935 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp30_ = gdk_pixbuf_get_pixels (_tmp29_);
-#line 891 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 935 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	source_pixels = _tmp30_;
-#line 891 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 935 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	source_pixels_length1 = -1;
-#line 891 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 935 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_source_pixels_size_ = source_pixels_length1;
-#line 892 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 936 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp31_ = dest;
-#line 892 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 936 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp32_ = gdk_pixbuf_get_pixels (_tmp31_);
-#line 892 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 936 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	dest_pixels = _tmp32_;
-#line 892 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 936 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	dest_pixels_length1 = -1;
-#line 892 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 936 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_dest_pixels_size_ = dest_pixels_length1;
-#line 7408 "ColorTransformation.c"
+#line 7679 "ColorTransformation.c"
 	{
 		gint j = 0;
-#line 893 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 937 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		j = 0;
-#line 7413 "ColorTransformation.c"
+#line 7684 "ColorTransformation.c"
 		{
 			gboolean _tmp33_ = FALSE;
-#line 893 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 937 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp33_ = TRUE;
-#line 893 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 937 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			while (TRUE) {
-#line 7420 "ColorTransformation.c"
+#line 7691 "ColorTransformation.c"
 				gint _tmp35_ = 0;
 				gint _tmp36_ = 0;
 				gint row_start_index = 0;
@@ -7432,56 +7703,56 @@ void pixel_transformer_transform_to_other_pixbuf (PixelTransformer* self, GdkPix
 				gint _tmp40_ = 0;
 				gboolean _tmp70_ = FALSE;
 				GCancellable* _tmp71_ = NULL;
-#line 893 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 937 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				if (!_tmp33_) {
-#line 7433 "ColorTransformation.c"
+#line 7704 "ColorTransformation.c"
 					gint _tmp34_ = 0;
-#line 893 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 937 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp34_ = j;
-#line 893 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 937 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					j = _tmp34_ + 1;
-#line 7439 "ColorTransformation.c"
+#line 7710 "ColorTransformation.c"
 				}
-#line 893 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 937 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp33_ = FALSE;
-#line 893 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 937 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp35_ = j;
-#line 893 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 937 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp36_ = height;
-#line 893 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 937 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				if (!(_tmp35_ < _tmp36_)) {
-#line 893 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 937 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					break;
-#line 7451 "ColorTransformation.c"
+#line 7722 "ColorTransformation.c"
 				}
-#line 894 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 938 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp37_ = j;
-#line 894 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 938 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp38_ = rowstride;
-#line 894 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 938 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				row_start_index = _tmp37_ * _tmp38_;
-#line 895 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 939 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp39_ = row_start_index;
-#line 895 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 939 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp40_ = rowbytes;
-#line 895 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 939 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				row_end_index = _tmp39_ + _tmp40_;
-#line 7465 "ColorTransformation.c"
+#line 7736 "ColorTransformation.c"
 				{
 					gint i = 0;
 					gint _tmp41_ = 0;
-#line 896 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 940 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp41_ = row_start_index;
-#line 896 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 940 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					i = _tmp41_;
-#line 7473 "ColorTransformation.c"
+#line 7744 "ColorTransformation.c"
 					{
 						gboolean _tmp42_ = FALSE;
-#line 896 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 940 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 						_tmp42_ = TRUE;
-#line 896 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 940 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 						while (TRUE) {
-#line 7480 "ColorTransformation.c"
+#line 7751 "ColorTransformation.c"
 							gint _tmp45_ = 0;
 							gint _tmp46_ = 0;
 							RGBAnalyticPixel current_pixel = {0};
@@ -7514,127 +7785,127 @@ void pixel_transformer_transform_to_other_pixbuf (PixelTransformer* self, GdkPix
 							gint _tmp67_ = 0;
 							guchar _tmp68_ = '\0';
 							guchar _tmp69_ = '\0';
-#line 896 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 940 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							if (!_tmp42_) {
-#line 7515 "ColorTransformation.c"
+#line 7786 "ColorTransformation.c"
 								gint _tmp43_ = 0;
 								gint _tmp44_ = 0;
-#line 896 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 940 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 								_tmp43_ = i;
-#line 896 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 940 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 								_tmp44_ = n_channels;
-#line 896 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 940 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 								i = _tmp43_ + _tmp44_;
-#line 7524 "ColorTransformation.c"
+#line 7795 "ColorTransformation.c"
 							}
-#line 896 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 940 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp42_ = FALSE;
-#line 896 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 940 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp45_ = i;
-#line 896 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 940 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp46_ = row_end_index;
-#line 896 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 940 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							if (!(_tmp45_ < _tmp46_)) {
-#line 896 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 940 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 								break;
-#line 7536 "ColorTransformation.c"
+#line 7807 "ColorTransformation.c"
 							}
-#line 897 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 941 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp47_ = source_pixels;
-#line 897 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 941 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp47__length1 = source_pixels_length1;
-#line 897 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 941 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp48_ = i;
-#line 897 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 941 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp49_ = _tmp47_[_tmp48_];
-#line 897 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 941 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp50_ = source_pixels;
-#line 897 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 941 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp50__length1 = source_pixels_length1;
-#line 897 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 941 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp51_ = i;
-#line 897 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 941 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp52_ = _tmp50_[_tmp51_ + 1];
-#line 897 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 941 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp53_ = source_pixels;
-#line 897 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 941 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp53__length1 = source_pixels_length1;
-#line 897 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 941 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp54_ = i;
-#line 897 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 941 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp55_ = _tmp53_[_tmp54_ + 2];
-#line 897 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 941 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							rgb_analytic_pixel_init_from_quantized_components (&current_pixel, _tmp49_, _tmp52_, _tmp55_);
-#line 900 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 944 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp56_ = current_pixel;
-#line 900 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 944 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							pixel_transformer_apply_transformations (self, &_tmp56_, &_tmp57_);
-#line 900 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 944 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							current_pixel = _tmp57_;
-#line 902 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 946 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp58_ = dest_pixels;
-#line 902 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 946 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp58__length1 = dest_pixels_length1;
-#line 902 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 946 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp59_ = i;
-#line 902 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 946 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp60_ = rgb_analytic_pixel_quantized_red (&current_pixel);
-#line 902 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 946 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp58_[_tmp59_] = _tmp60_;
-#line 902 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 946 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp61_ = _tmp58_[_tmp59_];
-#line 903 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 947 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp62_ = dest_pixels;
-#line 903 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 947 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp62__length1 = dest_pixels_length1;
-#line 903 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 947 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp63_ = i;
-#line 903 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 947 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp64_ = rgb_analytic_pixel_quantized_green (&current_pixel);
-#line 903 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 947 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp62_[_tmp63_ + 1] = _tmp64_;
-#line 903 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 947 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp65_ = _tmp62_[_tmp63_ + 1];
-#line 904 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 948 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp66_ = dest_pixels;
-#line 904 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 948 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp66__length1 = dest_pixels_length1;
-#line 904 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 948 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp67_ = i;
-#line 904 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 948 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp68_ = rgb_analytic_pixel_quantized_blue (&current_pixel);
-#line 904 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 948 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp66_[_tmp67_ + 2] = _tmp68_;
-#line 904 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 948 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp69_ = _tmp66_[_tmp67_ + 2];
-#line 7606 "ColorTransformation.c"
+#line 7877 "ColorTransformation.c"
 						}
 					}
 				}
-#line 907 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 951 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp71_ = cancellable;
-#line 907 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 951 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				if (_tmp71_ != NULL) {
-#line 7614 "ColorTransformation.c"
+#line 7885 "ColorTransformation.c"
 					GCancellable* _tmp72_ = NULL;
 					gboolean _tmp73_ = FALSE;
-#line 907 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 951 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp72_ = cancellable;
-#line 907 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 951 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp73_ = g_cancellable_is_cancelled (_tmp72_);
-#line 907 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 951 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp70_ = _tmp73_;
-#line 7623 "ColorTransformation.c"
+#line 7894 "ColorTransformation.c"
 				} else {
-#line 907 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 951 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp70_ = FALSE;
-#line 7627 "ColorTransformation.c"
+#line 7898 "ColorTransformation.c"
 				}
-#line 907 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 951 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				if (_tmp70_) {
-#line 908 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 952 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					return;
-#line 7633 "ColorTransformation.c"
+#line 7904 "ColorTransformation.c"
 				}
 			}
 		}
@@ -7643,229 +7914,229 @@ void pixel_transformer_transform_to_other_pixbuf (PixelTransformer* self, GdkPix
 
 
 static void value_pixel_transformer_init (GValue* value) {
-#line 731 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 775 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	value->data[0].v_pointer = NULL;
-#line 7644 "ColorTransformation.c"
+#line 7915 "ColorTransformation.c"
 }
 
 
 static void value_pixel_transformer_free_value (GValue* value) {
-#line 731 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 775 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (value->data[0].v_pointer) {
-#line 731 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 775 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		pixel_transformer_unref (value->data[0].v_pointer);
-#line 7653 "ColorTransformation.c"
+#line 7924 "ColorTransformation.c"
 	}
 }
 
 
 static void value_pixel_transformer_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 731 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 775 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (src_value->data[0].v_pointer) {
-#line 731 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 775 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		dest_value->data[0].v_pointer = pixel_transformer_ref (src_value->data[0].v_pointer);
-#line 7663 "ColorTransformation.c"
+#line 7934 "ColorTransformation.c"
 	} else {
-#line 731 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 775 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 7667 "ColorTransformation.c"
+#line 7938 "ColorTransformation.c"
 	}
 }
 
 
 static gpointer value_pixel_transformer_peek_pointer (const GValue* value) {
-#line 731 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 775 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return value->data[0].v_pointer;
-#line 7675 "ColorTransformation.c"
+#line 7946 "ColorTransformation.c"
 }
 
 
 static gchar* value_pixel_transformer_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 731 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 775 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (collect_values[0].v_pointer) {
-#line 7682 "ColorTransformation.c"
+#line 7953 "ColorTransformation.c"
 		PixelTransformer* object;
 		object = collect_values[0].v_pointer;
-#line 731 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 775 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		if (object->parent_instance.g_class == NULL) {
-#line 731 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 775 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 7689 "ColorTransformation.c"
+#line 7960 "ColorTransformation.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 731 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 775 "/home/jens/Source/shotwell/src/ColorTransformation.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 7693 "ColorTransformation.c"
+#line 7964 "ColorTransformation.c"
 		}
-#line 731 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 775 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		value->data[0].v_pointer = pixel_transformer_ref (object);
-#line 7697 "ColorTransformation.c"
+#line 7968 "ColorTransformation.c"
 	} else {
-#line 731 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 775 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		value->data[0].v_pointer = NULL;
-#line 7701 "ColorTransformation.c"
+#line 7972 "ColorTransformation.c"
 	}
-#line 731 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 775 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return NULL;
-#line 7705 "ColorTransformation.c"
+#line 7976 "ColorTransformation.c"
 }
 
 
 static gchar* value_pixel_transformer_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 	PixelTransformer** object_p;
 	object_p = collect_values[0].v_pointer;
-#line 731 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 775 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (!object_p) {
-#line 731 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 775 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 7716 "ColorTransformation.c"
+#line 7987 "ColorTransformation.c"
 	}
-#line 731 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 775 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (!value->data[0].v_pointer) {
-#line 731 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 775 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		*object_p = NULL;
-#line 7722 "ColorTransformation.c"
+#line 7993 "ColorTransformation.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 731 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 775 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		*object_p = value->data[0].v_pointer;
-#line 7726 "ColorTransformation.c"
+#line 7997 "ColorTransformation.c"
 	} else {
-#line 731 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 775 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		*object_p = pixel_transformer_ref (value->data[0].v_pointer);
-#line 7730 "ColorTransformation.c"
+#line 8001 "ColorTransformation.c"
 	}
-#line 731 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 775 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return NULL;
-#line 7734 "ColorTransformation.c"
+#line 8005 "ColorTransformation.c"
 }
 
 
 GParamSpec* param_spec_pixel_transformer (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
 	ParamSpecPixelTransformer* spec;
-#line 731 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 775 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, TYPE_PIXEL_TRANSFORMER), NULL);
-#line 731 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 775 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 731 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 775 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 731 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 775 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return G_PARAM_SPEC (spec);
-#line 7748 "ColorTransformation.c"
+#line 8019 "ColorTransformation.c"
 }
 
 
 gpointer value_get_pixel_transformer (const GValue* value) {
-#line 731 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 775 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PIXEL_TRANSFORMER), NULL);
-#line 731 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 775 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return value->data[0].v_pointer;
-#line 7757 "ColorTransformation.c"
+#line 8028 "ColorTransformation.c"
 }
 
 
 void value_set_pixel_transformer (GValue* value, gpointer v_object) {
 	PixelTransformer* old;
-#line 731 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 775 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PIXEL_TRANSFORMER));
-#line 731 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 775 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	old = value->data[0].v_pointer;
-#line 731 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 775 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (v_object) {
-#line 731 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 775 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_PIXEL_TRANSFORMER));
-#line 731 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 775 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 731 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 775 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		value->data[0].v_pointer = v_object;
-#line 731 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 775 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		pixel_transformer_ref (value->data[0].v_pointer);
-#line 7777 "ColorTransformation.c"
+#line 8048 "ColorTransformation.c"
 	} else {
-#line 731 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 775 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		value->data[0].v_pointer = NULL;
-#line 7781 "ColorTransformation.c"
+#line 8052 "ColorTransformation.c"
 	}
-#line 731 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 775 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (old) {
-#line 731 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 775 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		pixel_transformer_unref (old);
-#line 7787 "ColorTransformation.c"
+#line 8058 "ColorTransformation.c"
 	}
 }
 
 
 void value_take_pixel_transformer (GValue* value, gpointer v_object) {
 	PixelTransformer* old;
-#line 731 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 775 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PIXEL_TRANSFORMER));
-#line 731 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 775 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	old = value->data[0].v_pointer;
-#line 731 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 775 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (v_object) {
-#line 731 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 775 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_PIXEL_TRANSFORMER));
-#line 731 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 775 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 731 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 775 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		value->data[0].v_pointer = v_object;
-#line 7806 "ColorTransformation.c"
+#line 8077 "ColorTransformation.c"
 	} else {
-#line 731 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 775 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		value->data[0].v_pointer = NULL;
-#line 7810 "ColorTransformation.c"
+#line 8081 "ColorTransformation.c"
 	}
-#line 731 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 775 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (old) {
-#line 731 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 775 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		pixel_transformer_unref (old);
-#line 7816 "ColorTransformation.c"
+#line 8087 "ColorTransformation.c"
 	}
 }
 
 
 static void pixel_transformer_class_init (PixelTransformerClass * klass) {
-#line 731 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 775 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	pixel_transformer_parent_class = g_type_class_peek_parent (klass);
-#line 731 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 775 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	((PixelTransformerClass *) klass)->finalize = pixel_transformer_finalize;
-#line 731 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 775 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_type_class_add_private (klass, sizeof (PixelTransformerPrivate));
-#line 7828 "ColorTransformation.c"
+#line 8099 "ColorTransformation.c"
 }
 
 
 static void pixel_transformer_instance_init (PixelTransformer * self) {
 	GeeArrayList* _tmp0_ = NULL;
-#line 731 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 775 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv = PIXEL_TRANSFORMER_GET_PRIVATE (self);
-#line 732 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 776 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp0_ = gee_array_list_new (TYPE_PIXEL_TRANSFORMATION, (GBoxedCopyFunc) pixel_transformation_ref, pixel_transformation_unref, NULL, NULL, NULL);
-#line 732 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 776 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv->transformations = _tmp0_;
-#line 734 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 778 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv->optimized_transformations = NULL;
-#line 734 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 778 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv->optimized_transformations_length1 = 0;
-#line 734 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 778 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv->_optimized_transformations_size_ = self->priv->optimized_transformations_length1;
-#line 735 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 779 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv->optimized_slots_used = 0;
-#line 731 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 775 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->ref_count = 1;
-#line 7850 "ColorTransformation.c"
+#line 8121 "ColorTransformation.c"
 }
 
 
 static void pixel_transformer_finalize (PixelTransformer* obj) {
 	PixelTransformer * self;
-#line 731 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 775 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PIXEL_TRANSFORMER, PixelTransformer);
-#line 731 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 775 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_signal_handlers_destroy (self);
-#line 732 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 776 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_g_object_unref0 (self->priv->transformations);
-#line 734 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 778 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv->optimized_transformations = (_vala_array_free (self->priv->optimized_transformations, self->priv->optimized_transformations_length1, (GDestroyNotify) pixel_transformation_unref), NULL);
-#line 7864 "ColorTransformation.c"
+#line 8135 "ColorTransformation.c"
 }
 
 
@@ -7886,24 +8157,24 @@ GType pixel_transformer_get_type (void) {
 gpointer pixel_transformer_ref (gpointer instance) {
 	PixelTransformer* self;
 	self = instance;
-#line 731 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 775 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_atomic_int_inc (&self->ref_count);
-#line 731 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 775 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return instance;
-#line 7889 "ColorTransformation.c"
+#line 8160 "ColorTransformation.c"
 }
 
 
 void pixel_transformer_unref (gpointer instance) {
 	PixelTransformer* self;
 	self = instance;
-#line 731 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 775 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 731 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 775 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		PIXEL_TRANSFORMER_GET_CLASS (self)->finalize (self);
-#line 731 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 775 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 7902 "ColorTransformation.c"
+#line 8173 "ColorTransformation.c"
 	}
 }
 
@@ -7927,57 +8198,57 @@ RGBHistogram* rgb_histogram_construct (GType object_type, GdkPixbuf* pixbuf) {
 	guint8* _tmp10_ = NULL;
 	gint pixel_data_length1 = 0;
 	gint _pixel_data_size_ = 0;
-#line 930 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 974 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_return_val_if_fail (GDK_IS_PIXBUF (pixbuf), NULL);
-#line 930 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 974 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self = (RGBHistogram*) g_type_create_instance (object_type);
-#line 931 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 975 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp0_ = pixbuf;
-#line 931 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 975 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp1_ = gdk_pixbuf_get_bits_per_sample (_tmp0_);
-#line 931 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 975 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	sample_bytes = _tmp1_ / 8;
-#line 932 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 976 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp2_ = sample_bytes;
-#line 932 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 976 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp3_ = pixbuf;
-#line 932 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 976 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp4_ = gdk_pixbuf_get_n_channels (_tmp3_);
-#line 932 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 976 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	pixel_bytes = _tmp2_ * _tmp4_;
-#line 933 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 977 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp5_ = pixel_bytes;
-#line 933 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 977 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp6_ = pixbuf;
-#line 933 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 977 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp7_ = gdk_pixbuf_get_width (_tmp6_);
-#line 933 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 977 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp8_ = _tmp7_;
-#line 933 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 977 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	row_length_bytes = _tmp5_ * _tmp8_;
-#line 935 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 979 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp9_ = pixbuf;
-#line 935 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 979 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp10_ = gdk_pixbuf_get_pixels (_tmp9_);
-#line 935 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 979 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	pixel_data = _tmp10_;
-#line 935 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 979 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	pixel_data_length1 = -1;
-#line 935 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 979 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_pixel_data_size_ = pixel_data_length1;
-#line 7964 "ColorTransformation.c"
+#line 8235 "ColorTransformation.c"
 	{
 		gint y = 0;
-#line 937 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 981 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		y = 0;
-#line 7969 "ColorTransformation.c"
+#line 8240 "ColorTransformation.c"
 		{
 			gboolean _tmp11_ = FALSE;
-#line 937 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 981 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp11_ = TRUE;
-#line 937 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 981 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			while (TRUE) {
-#line 7976 "ColorTransformation.c"
+#line 8247 "ColorTransformation.c"
 				gint _tmp13_ = 0;
 				GdkPixbuf* _tmp14_ = NULL;
 				gint _tmp15_ = 0;
@@ -7996,63 +8267,63 @@ RGBHistogram* rgb_histogram_construct (GType object_type, GdkPixbuf* pixbuf) {
 				gint _tmp24_ = 0;
 				gint _tmp25_ = 0;
 				gint _tmp26_ = 0;
-#line 937 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 981 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				if (!_tmp11_) {
-#line 7997 "ColorTransformation.c"
+#line 8268 "ColorTransformation.c"
 					gint _tmp12_ = 0;
-#line 937 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 981 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp12_ = y;
-#line 937 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 981 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					y = _tmp12_ + 1;
-#line 8003 "ColorTransformation.c"
+#line 8274 "ColorTransformation.c"
 				}
-#line 937 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 981 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp11_ = FALSE;
-#line 937 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 981 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp13_ = y;
-#line 937 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 981 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp14_ = pixbuf;
-#line 937 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 981 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp15_ = gdk_pixbuf_get_height (_tmp14_);
-#line 937 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 981 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp16_ = _tmp15_;
-#line 937 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 981 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				if (!(_tmp13_ < _tmp16_)) {
-#line 937 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 981 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					break;
-#line 8019 "ColorTransformation.c"
+#line 8290 "ColorTransformation.c"
 				}
-#line 938 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 982 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp17_ = y;
-#line 938 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 982 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp18_ = pixbuf;
-#line 938 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 982 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp19_ = gdk_pixbuf_get_rowstride (_tmp18_);
-#line 938 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 982 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp20_ = _tmp19_;
-#line 938 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 982 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				row_start_offset = _tmp17_ * _tmp20_;
-#line 940 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 984 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp21_ = row_start_offset;
-#line 940 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 984 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				r_offset = _tmp21_;
-#line 941 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 985 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp22_ = row_start_offset;
-#line 941 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 985 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp23_ = sample_bytes;
-#line 941 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 985 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				g_offset = _tmp22_ + _tmp23_;
-#line 942 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 986 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp24_ = row_start_offset;
-#line 942 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 986 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp25_ = sample_bytes;
-#line 942 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 986 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp26_ = sample_bytes;
-#line 942 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 986 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				b_offset = (_tmp24_ + _tmp25_) + _tmp26_;
-#line 944 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 988 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				while (TRUE) {
-#line 8051 "ColorTransformation.c"
+#line 8322 "ColorTransformation.c"
 					gint _tmp27_ = 0;
 					gint _tmp28_ = 0;
 					gint _tmp29_ = 0;
@@ -8083,99 +8354,99 @@ RGBHistogram* rgb_histogram_construct (GType object_type, GdkPixbuf* pixbuf) {
 					gint _tmp48_ = 0;
 					gint _tmp49_ = 0;
 					gint _tmp50_ = 0;
-#line 944 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 988 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp27_ = b_offset;
-#line 944 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 988 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp28_ = row_start_offset;
-#line 944 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 988 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp29_ = row_length_bytes;
-#line 944 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 988 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					if (!(_tmp27_ < (_tmp28_ + _tmp29_))) {
-#line 944 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 988 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 						break;
-#line 8092 "ColorTransformation.c"
+#line 8363 "ColorTransformation.c"
 					}
-#line 945 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 989 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp30_ = self->priv->red_counts;
-#line 945 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 989 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp30__length1 = self->priv->red_counts_length1;
-#line 945 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 989 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp31_ = pixel_data;
-#line 945 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 989 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp31__length1 = pixel_data_length1;
-#line 945 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 989 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp32_ = r_offset;
-#line 945 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 989 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp33_ = _tmp31_[_tmp32_];
-#line 945 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 989 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp30_[_tmp33_] += 1;
-#line 945 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 989 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp34_ = _tmp30_[_tmp33_];
-#line 946 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 990 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp35_ = self->priv->green_counts;
-#line 946 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 990 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp35__length1 = self->priv->green_counts_length1;
-#line 946 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 990 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp36_ = pixel_data;
-#line 946 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 990 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp36__length1 = pixel_data_length1;
-#line 946 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 990 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp37_ = g_offset;
-#line 946 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 990 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp38_ = _tmp36_[_tmp37_];
-#line 946 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 990 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp35_[_tmp38_] += 1;
-#line 946 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 990 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp39_ = _tmp35_[_tmp38_];
-#line 947 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 991 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp40_ = self->priv->blue_counts;
-#line 947 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 991 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp40__length1 = self->priv->blue_counts_length1;
-#line 947 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 991 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp41_ = pixel_data;
-#line 947 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 991 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp41__length1 = pixel_data_length1;
-#line 947 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 991 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp42_ = b_offset;
-#line 947 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 991 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp43_ = _tmp41_[_tmp42_];
-#line 947 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 991 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp40_[_tmp43_] += 1;
-#line 947 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 991 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp44_ = _tmp40_[_tmp43_];
-#line 949 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 993 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp45_ = r_offset;
-#line 949 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 993 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp46_ = pixel_bytes;
-#line 949 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 993 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					r_offset = _tmp45_ + _tmp46_;
-#line 950 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 994 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp47_ = g_offset;
-#line 950 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 994 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp48_ = pixel_bytes;
-#line 950 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 994 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					g_offset = _tmp47_ + _tmp48_;
-#line 951 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 995 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp49_ = b_offset;
-#line 951 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 995 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp50_ = pixel_bytes;
-#line 951 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 995 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					b_offset = _tmp49_ + _tmp50_;
-#line 8160 "ColorTransformation.c"
+#line 8431 "ColorTransformation.c"
 				}
 			}
 		}
 	}
-#line 930 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 974 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return self;
-#line 8167 "ColorTransformation.c"
+#line 8438 "ColorTransformation.c"
 }
 
 
 RGBHistogram* rgb_histogram_new (GdkPixbuf* pixbuf) {
-#line 930 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 974 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return rgb_histogram_construct (TYPE_RGB_HISTOGRAM, pixbuf);
-#line 8174 "ColorTransformation.c"
+#line 8445 "ColorTransformation.c"
 }
 
 
@@ -8190,67 +8461,67 @@ static gint rgb_histogram_correct_snap_to_quantization (RGBHistogram* self, gint
 	gint _tmp54__length1 = 0;
 	gint _tmp55_ = 0;
 	gint _tmp56_ = 0;
-#line 956 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1000 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_return_val_if_fail (IS_RGB_HISTOGRAM (self), 0);
-#line 957 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1001 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp0_ = buckets;
-#line 957 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1001 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp0__length1 = buckets_length1;
-#line 957 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1001 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_vala_assert (_tmp0__length1 == 256, "buckets.length == 256");
-#line 958 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1002 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp2_ = i;
-#line 958 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1002 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (_tmp2_ >= 0) {
-#line 8201 "ColorTransformation.c"
+#line 8472 "ColorTransformation.c"
 		gint _tmp3_ = 0;
-#line 958 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1002 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp3_ = i;
-#line 958 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1002 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp1_ = _tmp3_ <= 255;
-#line 8207 "ColorTransformation.c"
+#line 8478 "ColorTransformation.c"
 	} else {
-#line 958 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1002 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp1_ = FALSE;
-#line 8211 "ColorTransformation.c"
+#line 8482 "ColorTransformation.c"
 	}
-#line 958 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1002 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_vala_assert (_tmp1_, "(i >= 0) && (i <= 255)");
-#line 960 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1004 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp4_ = i;
-#line 960 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1004 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (_tmp4_ == 0) {
-#line 8219 "ColorTransformation.c"
+#line 8490 "ColorTransformation.c"
 		gint* _tmp5_ = NULL;
 		gint _tmp5__length1 = 0;
 		gint _tmp6_ = 0;
 		gint _tmp7_ = 0;
-#line 961 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1005 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp5_ = buckets;
-#line 961 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1005 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp5__length1 = buckets_length1;
-#line 961 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1005 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp6_ = i;
-#line 961 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1005 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp7_ = _tmp5_[_tmp6_];
-#line 961 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1005 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		if (_tmp7_ > 0) {
-#line 8234 "ColorTransformation.c"
+#line 8505 "ColorTransformation.c"
 			gint* _tmp8_ = NULL;
 			gint _tmp8__length1 = 0;
 			gint _tmp9_ = 0;
 			gint _tmp10_ = 0;
-#line 962 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1006 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp8_ = buckets;
-#line 962 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1006 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp8__length1 = buckets_length1;
-#line 962 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1006 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp9_ = i;
-#line 962 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1006 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp10_ = _tmp8_[_tmp9_ + 1];
-#line 962 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1006 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			if (_tmp10_ > 0) {
-#line 8249 "ColorTransformation.c"
+#line 8520 "ColorTransformation.c"
 				gint* _tmp11_ = NULL;
 				gint _tmp11__length1 = 0;
 				gint _tmp12_ = 0;
@@ -8259,82 +8530,82 @@ static gint rgb_histogram_correct_snap_to_quantization (RGBHistogram* self, gint
 				gint _tmp14__length1 = 0;
 				gint _tmp15_ = 0;
 				gint _tmp16_ = 0;
-#line 963 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1007 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp11_ = buckets;
-#line 963 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1007 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp11__length1 = buckets_length1;
-#line 963 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1007 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp12_ = i;
-#line 963 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1007 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp13_ = _tmp11_[_tmp12_];
-#line 963 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1007 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp14_ = buckets;
-#line 963 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1007 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp14__length1 = buckets_length1;
-#line 963 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1007 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp15_ = i;
-#line 963 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1007 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp16_ = _tmp14_[_tmp15_ + 1];
-#line 963 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1007 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				if (_tmp13_ > (2 * _tmp16_)) {
-#line 8276 "ColorTransformation.c"
+#line 8547 "ColorTransformation.c"
 					gint* _tmp17_ = NULL;
 					gint _tmp17__length1 = 0;
 					gint _tmp18_ = 0;
 					gint _tmp19_ = 0;
-#line 964 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1008 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp17_ = buckets;
-#line 964 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1008 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp17__length1 = buckets_length1;
-#line 964 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1008 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp18_ = i;
-#line 964 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1008 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp19_ = _tmp17_[_tmp18_ + 1];
-#line 964 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1008 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					result = _tmp19_;
-#line 964 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1008 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					return result;
-#line 8293 "ColorTransformation.c"
+#line 8564 "ColorTransformation.c"
 				}
 			}
 		}
 	} else {
 		gint _tmp20_ = 0;
-#line 965 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1009 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp20_ = i;
-#line 965 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1009 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		if (_tmp20_ == 255) {
-#line 8303 "ColorTransformation.c"
+#line 8574 "ColorTransformation.c"
 			gint* _tmp21_ = NULL;
 			gint _tmp21__length1 = 0;
 			gint _tmp22_ = 0;
 			gint _tmp23_ = 0;
-#line 966 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1010 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp21_ = buckets;
-#line 966 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1010 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp21__length1 = buckets_length1;
-#line 966 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1010 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp22_ = i;
-#line 966 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1010 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp23_ = _tmp21_[_tmp22_];
-#line 966 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1010 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			if (_tmp23_ > 0) {
-#line 8318 "ColorTransformation.c"
+#line 8589 "ColorTransformation.c"
 				gint* _tmp24_ = NULL;
 				gint _tmp24__length1 = 0;
 				gint _tmp25_ = 0;
 				gint _tmp26_ = 0;
-#line 967 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1011 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp24_ = buckets;
-#line 967 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1011 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp24__length1 = buckets_length1;
-#line 967 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1011 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp25_ = i;
-#line 967 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1011 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp26_ = _tmp24_[_tmp25_ - 1];
-#line 967 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1011 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				if (_tmp26_ > 0) {
-#line 8333 "ColorTransformation.c"
+#line 8604 "ColorTransformation.c"
 					gint* _tmp27_ = NULL;
 					gint _tmp27__length1 = 0;
 					gint _tmp28_ = 0;
@@ -8343,42 +8614,42 @@ static gint rgb_histogram_correct_snap_to_quantization (RGBHistogram* self, gint
 					gint _tmp30__length1 = 0;
 					gint _tmp31_ = 0;
 					gint _tmp32_ = 0;
-#line 968 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1012 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp27_ = buckets;
-#line 968 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1012 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp27__length1 = buckets_length1;
-#line 968 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1012 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp28_ = i;
-#line 968 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1012 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp29_ = _tmp27_[_tmp28_];
-#line 968 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1012 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp30_ = buckets;
-#line 968 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1012 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp30__length1 = buckets_length1;
-#line 968 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1012 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp31_ = i;
-#line 968 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1012 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp32_ = _tmp30_[_tmp31_ - 1];
-#line 968 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1012 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					if (_tmp29_ > (2 * _tmp32_)) {
-#line 8360 "ColorTransformation.c"
+#line 8631 "ColorTransformation.c"
 						gint* _tmp33_ = NULL;
 						gint _tmp33__length1 = 0;
 						gint _tmp34_ = 0;
 						gint _tmp35_ = 0;
-#line 969 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1013 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 						_tmp33_ = buckets;
-#line 969 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1013 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 						_tmp33__length1 = buckets_length1;
-#line 969 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1013 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 						_tmp34_ = i;
-#line 969 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1013 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 						_tmp35_ = _tmp33_[_tmp34_ - 1];
-#line 969 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1013 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 						result = _tmp35_;
-#line 969 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1013 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 						return result;
-#line 8377 "ColorTransformation.c"
+#line 8648 "ColorTransformation.c"
 					}
 				}
 			}
@@ -8387,17 +8658,17 @@ static gint rgb_histogram_correct_snap_to_quantization (RGBHistogram* self, gint
 			gint _tmp36__length1 = 0;
 			gint _tmp37_ = 0;
 			gint _tmp38_ = 0;
-#line 971 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1015 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp36_ = buckets;
-#line 971 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1015 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp36__length1 = buckets_length1;
-#line 971 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1015 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp37_ = i;
-#line 971 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1015 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp38_ = _tmp36_[_tmp37_];
-#line 971 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1015 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			if (_tmp38_ > 0) {
-#line 8396 "ColorTransformation.c"
+#line 8667 "ColorTransformation.c"
 				gint* _tmp39_ = NULL;
 				gint _tmp39__length1 = 0;
 				gint _tmp40_ = 0;
@@ -8410,33 +8681,33 @@ static gint rgb_histogram_correct_snap_to_quantization (RGBHistogram* self, gint
 				gint _tmp45__length1 = 0;
 				gint _tmp46_ = 0;
 				gint _tmp47_ = 0;
-#line 972 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1016 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp39_ = buckets;
-#line 972 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1016 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp39__length1 = buckets_length1;
-#line 972 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1016 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp40_ = i;
-#line 972 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1016 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp41_ = _tmp39_[_tmp40_];
-#line 972 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1016 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp42_ = buckets;
-#line 972 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1016 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp42__length1 = buckets_length1;
-#line 972 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1016 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp43_ = i;
-#line 972 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1016 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp44_ = _tmp42_[_tmp43_ - 1];
-#line 972 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1016 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp45_ = buckets;
-#line 972 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1016 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp45__length1 = buckets_length1;
-#line 972 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1016 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp46_ = i;
-#line 972 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1016 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp47_ = _tmp45_[_tmp46_ + 1];
-#line 972 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1016 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				if (_tmp41_ > ((_tmp44_ + _tmp47_) / 2)) {
-#line 8435 "ColorTransformation.c"
+#line 8706 "ColorTransformation.c"
 					gint* _tmp48_ = NULL;
 					gint _tmp48__length1 = 0;
 					gint _tmp49_ = 0;
@@ -8445,44 +8716,44 @@ static gint rgb_histogram_correct_snap_to_quantization (RGBHistogram* self, gint
 					gint _tmp51__length1 = 0;
 					gint _tmp52_ = 0;
 					gint _tmp53_ = 0;
-#line 973 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1017 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp48_ = buckets;
-#line 973 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1017 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp48__length1 = buckets_length1;
-#line 973 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1017 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp49_ = i;
-#line 973 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1017 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp50_ = _tmp48_[_tmp49_ - 1];
-#line 973 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1017 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp51_ = buckets;
-#line 973 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1017 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp51__length1 = buckets_length1;
-#line 973 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1017 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp52_ = i;
-#line 973 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1017 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp53_ = _tmp51_[_tmp52_ + 1];
-#line 973 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1017 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					result = (_tmp50_ + _tmp53_) / 2;
-#line 973 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1017 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					return result;
-#line 8464 "ColorTransformation.c"
+#line 8735 "ColorTransformation.c"
 				}
 			}
 		}
 	}
-#line 976 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1020 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp54_ = buckets;
-#line 976 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1020 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp54__length1 = buckets_length1;
-#line 976 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1020 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp55_ = i;
-#line 976 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1020 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp56_ = _tmp54_[_tmp55_];
-#line 976 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1020 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	result = _tmp56_;
-#line 976 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1020 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return result;
-#line 8481 "ColorTransformation.c"
+#line 8752 "ColorTransformation.c"
 }
 
 
@@ -8497,124 +8768,124 @@ static gint rgb_histogram_correct_snap_from_quantization (RGBHistogram* self, gi
 	gint _tmp27__length1 = 0;
 	gint _tmp28_ = 0;
 	gint _tmp29_ = 0;
-#line 979 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1023 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_return_val_if_fail (IS_RGB_HISTOGRAM (self), 0);
-#line 980 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1024 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp0_ = buckets;
-#line 980 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1024 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp0__length1 = buckets_length1;
-#line 980 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1024 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_vala_assert (_tmp0__length1 == 256, "buckets.length == 256");
-#line 981 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1025 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp2_ = i;
-#line 981 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1025 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (_tmp2_ >= 0) {
-#line 8508 "ColorTransformation.c"
+#line 8779 "ColorTransformation.c"
 		gint _tmp3_ = 0;
-#line 981 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1025 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp3_ = i;
-#line 981 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1025 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp1_ = _tmp3_ <= 255;
-#line 8514 "ColorTransformation.c"
+#line 8785 "ColorTransformation.c"
 	} else {
-#line 981 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1025 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp1_ = FALSE;
-#line 8518 "ColorTransformation.c"
+#line 8789 "ColorTransformation.c"
 	}
-#line 981 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1025 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_vala_assert (_tmp1_, "(i >= 0) && (i <= 255)");
-#line 983 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1027 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp4_ = i;
-#line 983 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1027 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (_tmp4_ == 0) {
-#line 8526 "ColorTransformation.c"
+#line 8797 "ColorTransformation.c"
 		gint* _tmp5_ = NULL;
 		gint _tmp5__length1 = 0;
 		gint _tmp6_ = 0;
 		gint _tmp7_ = 0;
-#line 984 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1028 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp5_ = buckets;
-#line 984 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1028 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp5__length1 = buckets_length1;
-#line 984 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1028 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp6_ = i;
-#line 984 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1028 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp7_ = _tmp5_[_tmp6_];
-#line 984 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1028 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		result = _tmp7_;
-#line 984 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1028 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		return result;
-#line 8543 "ColorTransformation.c"
+#line 8814 "ColorTransformation.c"
 	} else {
 		gint _tmp8_ = 0;
-#line 985 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1029 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp8_ = i;
-#line 985 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1029 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		if (_tmp8_ == 255) {
-#line 8550 "ColorTransformation.c"
+#line 8821 "ColorTransformation.c"
 			gint* _tmp9_ = NULL;
 			gint _tmp9__length1 = 0;
 			gint _tmp10_ = 0;
 			gint _tmp11_ = 0;
-#line 986 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1030 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp9_ = buckets;
-#line 986 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1030 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp9__length1 = buckets_length1;
-#line 986 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1030 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp10_ = i;
-#line 986 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1030 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp11_ = _tmp9_[_tmp10_];
-#line 986 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1030 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			result = _tmp11_;
-#line 986 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1030 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			return result;
-#line 8567 "ColorTransformation.c"
+#line 8838 "ColorTransformation.c"
 		} else {
 			gint* _tmp12_ = NULL;
 			gint _tmp12__length1 = 0;
 			gint _tmp13_ = 0;
 			gint _tmp14_ = 0;
-#line 988 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1032 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp12_ = buckets;
-#line 988 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1032 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp12__length1 = buckets_length1;
-#line 988 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1032 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp13_ = i;
-#line 988 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1032 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp14_ = _tmp12_[_tmp13_];
-#line 988 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1032 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			if (_tmp14_ == 0) {
-#line 8583 "ColorTransformation.c"
+#line 8854 "ColorTransformation.c"
 				gint* _tmp15_ = NULL;
 				gint _tmp15__length1 = 0;
 				gint _tmp16_ = 0;
 				gint _tmp17_ = 0;
-#line 989 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1033 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp15_ = buckets;
-#line 989 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1033 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp15__length1 = buckets_length1;
-#line 989 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1033 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp16_ = i;
-#line 989 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1033 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp17_ = _tmp15_[_tmp16_ - 1];
-#line 989 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1033 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				if (_tmp17_ > 0) {
-#line 8598 "ColorTransformation.c"
+#line 8869 "ColorTransformation.c"
 					gint* _tmp18_ = NULL;
 					gint _tmp18__length1 = 0;
 					gint _tmp19_ = 0;
 					gint _tmp20_ = 0;
-#line 990 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1034 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp18_ = buckets;
-#line 990 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1034 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp18__length1 = buckets_length1;
-#line 990 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1034 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp19_ = i;
-#line 990 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1034 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp20_ = _tmp18_[_tmp19_ + 1];
-#line 990 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1034 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					if (_tmp20_ > 0) {
-#line 8613 "ColorTransformation.c"
+#line 8884 "ColorTransformation.c"
 						gint* _tmp21_ = NULL;
 						gint _tmp21__length1 = 0;
 						gint _tmp22_ = 0;
@@ -8623,45 +8894,45 @@ static gint rgb_histogram_correct_snap_from_quantization (RGBHistogram* self, gi
 						gint _tmp24__length1 = 0;
 						gint _tmp25_ = 0;
 						gint _tmp26_ = 0;
-#line 991 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1035 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 						_tmp21_ = buckets;
-#line 991 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1035 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 						_tmp21__length1 = buckets_length1;
-#line 991 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1035 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 						_tmp22_ = i;
-#line 991 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1035 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 						_tmp23_ = _tmp21_[_tmp22_ - 1];
-#line 991 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1035 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 						_tmp24_ = buckets;
-#line 991 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1035 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 						_tmp24__length1 = buckets_length1;
-#line 991 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1035 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 						_tmp25_ = i;
-#line 991 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1035 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 						_tmp26_ = _tmp24_[_tmp25_ + 1];
-#line 991 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1035 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 						result = (_tmp23_ + _tmp26_) / 2;
-#line 991 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1035 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 						return result;
-#line 8642 "ColorTransformation.c"
+#line 8913 "ColorTransformation.c"
 					}
 				}
 			}
 		}
 	}
-#line 994 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1038 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp27_ = buckets;
-#line 994 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1038 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp27__length1 = buckets_length1;
-#line 994 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1038 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp28_ = i;
-#line 994 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1038 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp29_ = _tmp27_[_tmp28_];
-#line 994 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1038 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	result = _tmp29_;
-#line 994 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1038 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return result;
-#line 8660 "ColorTransformation.c"
+#line 8931 "ColorTransformation.c"
 }
 
 
@@ -8830,359 +9101,359 @@ static void rgb_histogram_smooth_extrema (RGBHistogram* self, gint** count_data,
 	gint _tmp106__length1 = 0;
 	gint _tmp107_ = 0;
 	gint _tmp108_ = 0;
-#line 997 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1041 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_return_if_fail (IS_RGB_HISTOGRAM (self));
-#line 998 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1042 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp0_ = *count_data;
-#line 998 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1042 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp0__length1 = *count_data_length1;
-#line 998 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1042 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_vala_assert (_tmp0__length1 == 256, "count_data.length == 256");
-#line 1004 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1048 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp1_ = *count_data;
-#line 1004 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1048 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp1__length1 = *count_data_length1;
-#line 1004 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1048 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp2_ = *count_data;
-#line 1004 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1048 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp2__length1 = *count_data_length1;
-#line 1004 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1048 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp3_ = _tmp2_[0];
-#line 1004 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1048 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp4_ = *count_data;
-#line 1004 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1048 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp4__length1 = *count_data_length1;
-#line 1004 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1048 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp5_ = _tmp4_[1];
-#line 1004 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1048 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp6_ = *count_data;
-#line 1004 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1048 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp6__length1 = *count_data_length1;
-#line 1004 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1048 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp7_ = _tmp6_[2];
-#line 1004 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1048 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp1_[0] = (((5 * _tmp3_) + (3 * _tmp5_)) + (2 * _tmp7_)) / 10;
-#line 1004 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1048 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp8_ = _tmp1_[0];
-#line 1006 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1050 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp9_ = *count_data;
-#line 1006 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1050 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp9__length1 = *count_data_length1;
-#line 1006 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1050 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp10_ = *count_data;
-#line 1006 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1050 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp10__length1 = *count_data_length1;
-#line 1006 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1050 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp11_ = _tmp10_[0];
-#line 1006 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1050 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp12_ = *count_data;
-#line 1006 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1050 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp12__length1 = *count_data_length1;
-#line 1006 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1050 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp13_ = _tmp12_[1];
-#line 1006 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1050 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp14_ = *count_data;
-#line 1006 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1050 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp14__length1 = *count_data_length1;
-#line 1006 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1050 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp15_ = _tmp14_[2];
-#line 1006 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1050 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp16_ = *count_data;
-#line 1006 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1050 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp16__length1 = *count_data_length1;
-#line 1006 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1050 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp17_ = _tmp16_[3];
-#line 1006 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1050 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp9_[1] = ((((3 * _tmp11_) + (5 * _tmp13_)) + (3 * _tmp15_)) + (2 * _tmp17_)) / 13;
-#line 1006 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1050 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp18_ = _tmp9_[1];
-#line 1008 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1052 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp19_ = *count_data;
-#line 1008 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1052 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp19__length1 = *count_data_length1;
-#line 1008 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1052 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp20_ = *count_data;
-#line 1008 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1052 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp20__length1 = *count_data_length1;
-#line 1008 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1052 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp21_ = _tmp20_[0];
-#line 1008 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1052 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp22_ = *count_data;
-#line 1008 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1052 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp22__length1 = *count_data_length1;
-#line 1008 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1052 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp23_ = _tmp22_[1];
-#line 1008 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1052 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp24_ = *count_data;
-#line 1008 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1052 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp24__length1 = *count_data_length1;
-#line 1008 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1052 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp25_ = _tmp24_[2];
-#line 1008 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1052 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp26_ = *count_data;
-#line 1008 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1052 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp26__length1 = *count_data_length1;
-#line 1008 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1052 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp27_ = _tmp26_[3];
-#line 1008 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1052 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp28_ = *count_data;
-#line 1008 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1052 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp28__length1 = *count_data_length1;
-#line 1008 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1052 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp29_ = _tmp28_[4];
-#line 1008 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1052 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp19_[2] = (((((2 * _tmp21_) + (3 * _tmp23_)) + (5 * _tmp25_)) + (3 * _tmp27_)) + (2 * _tmp29_)) / 15;
-#line 1008 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1052 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp30_ = _tmp19_[2];
-#line 1010 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1054 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp31_ = *count_data;
-#line 1010 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1054 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp31__length1 = *count_data_length1;
-#line 1010 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1054 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp32_ = *count_data;
-#line 1010 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1054 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp32__length1 = *count_data_length1;
-#line 1010 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1054 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp33_ = _tmp32_[1];
-#line 1010 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1054 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp34_ = *count_data;
-#line 1010 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1054 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp34__length1 = *count_data_length1;
-#line 1010 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1054 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp35_ = _tmp34_[2];
-#line 1010 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1054 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp36_ = *count_data;
-#line 1010 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1054 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp36__length1 = *count_data_length1;
-#line 1010 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1054 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp37_ = _tmp36_[3];
-#line 1010 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1054 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp38_ = *count_data;
-#line 1010 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1054 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp38__length1 = *count_data_length1;
-#line 1010 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1054 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp39_ = _tmp38_[4];
-#line 1010 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1054 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp40_ = *count_data;
-#line 1010 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1054 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp40__length1 = *count_data_length1;
-#line 1010 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1054 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp41_ = _tmp40_[5];
-#line 1010 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1054 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp31_[3] = (((((2 * _tmp33_) + (3 * _tmp35_)) + (5 * _tmp37_)) + (3 * _tmp39_)) + (2 * _tmp41_)) / 15;
-#line 1010 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1054 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp42_ = _tmp31_[3];
-#line 1012 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1056 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp43_ = *count_data;
-#line 1012 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1056 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp43__length1 = *count_data_length1;
-#line 1012 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1056 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp44_ = *count_data;
-#line 1012 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1056 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp44__length1 = *count_data_length1;
-#line 1012 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1056 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp45_ = _tmp44_[2];
-#line 1012 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1056 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp46_ = *count_data;
-#line 1012 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1056 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp46__length1 = *count_data_length1;
-#line 1012 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1056 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp47_ = _tmp46_[3];
-#line 1012 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1056 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp48_ = *count_data;
-#line 1012 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1056 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp48__length1 = *count_data_length1;
-#line 1012 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1056 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp49_ = _tmp48_[4];
-#line 1012 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1056 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp50_ = *count_data;
-#line 1012 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1056 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp50__length1 = *count_data_length1;
-#line 1012 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1056 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp51_ = _tmp50_[5];
-#line 1012 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1056 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp52_ = *count_data;
-#line 1012 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1056 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp52__length1 = *count_data_length1;
-#line 1012 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1056 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp53_ = _tmp52_[6];
-#line 1012 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1056 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp43_[4] = (((((2 * _tmp45_) + (3 * _tmp47_)) + (5 * _tmp49_)) + (3 * _tmp51_)) + (2 * _tmp53_)) / 15;
-#line 1012 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1056 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp54_ = _tmp43_[4];
-#line 1015 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1059 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp55_ = *count_data;
-#line 1015 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1059 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp55__length1 = *count_data_length1;
-#line 1015 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1059 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp56_ = *count_data;
-#line 1015 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1059 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp56__length1 = *count_data_length1;
-#line 1015 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1059 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp57_ = _tmp56_[255];
-#line 1015 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1059 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp58_ = *count_data;
-#line 1015 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1059 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp58__length1 = *count_data_length1;
-#line 1015 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1059 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp59_ = _tmp58_[254];
-#line 1015 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1059 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp60_ = *count_data;
-#line 1015 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1059 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp60__length1 = *count_data_length1;
-#line 1015 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1059 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp61_ = _tmp60_[253];
-#line 1015 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1059 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp55_[255] = (((5 * _tmp57_) + (3 * _tmp59_)) + (2 * _tmp61_)) / 10;
-#line 1015 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1059 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp62_ = _tmp55_[255];
-#line 1017 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1061 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp63_ = *count_data;
-#line 1017 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1061 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp63__length1 = *count_data_length1;
-#line 1017 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1061 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp64_ = *count_data;
-#line 1017 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1061 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp64__length1 = *count_data_length1;
-#line 1017 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1061 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp65_ = _tmp64_[255];
-#line 1017 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1061 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp66_ = *count_data;
-#line 1017 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1061 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp66__length1 = *count_data_length1;
-#line 1017 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1061 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp67_ = _tmp66_[254];
-#line 1017 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1061 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp68_ = *count_data;
-#line 1017 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1061 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp68__length1 = *count_data_length1;
-#line 1017 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1061 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp69_ = _tmp68_[253];
-#line 1017 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1061 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp70_ = *count_data;
-#line 1017 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1061 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp70__length1 = *count_data_length1;
-#line 1017 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1061 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp71_ = _tmp70_[252];
-#line 1017 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1061 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp63_[254] = ((((3 * _tmp65_) + (5 * _tmp67_)) + (3 * _tmp69_)) + (2 * _tmp71_)) / 13;
-#line 1017 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1061 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp72_ = _tmp63_[254];
-#line 1019 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1063 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp73_ = *count_data;
-#line 1019 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1063 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp73__length1 = *count_data_length1;
-#line 1019 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1063 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp74_ = *count_data;
-#line 1019 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1063 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp74__length1 = *count_data_length1;
-#line 1019 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1063 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp75_ = _tmp74_[255];
-#line 1019 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1063 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp76_ = *count_data;
-#line 1019 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1063 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp76__length1 = *count_data_length1;
-#line 1019 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1063 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp77_ = _tmp76_[254];
-#line 1019 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1063 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp78_ = *count_data;
-#line 1019 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1063 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp78__length1 = *count_data_length1;
-#line 1019 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1063 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp79_ = _tmp78_[253];
-#line 1019 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1063 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp80_ = *count_data;
-#line 1019 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1063 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp80__length1 = *count_data_length1;
-#line 1019 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1063 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp81_ = _tmp80_[252];
-#line 1019 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1063 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp82_ = *count_data;
-#line 1019 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1063 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp82__length1 = *count_data_length1;
-#line 1019 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1063 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp83_ = _tmp82_[251];
-#line 1019 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1063 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp73_[253] = (((((2 * _tmp75_) + (3 * _tmp77_)) + (5 * _tmp79_)) + (3 * _tmp81_)) + (2 * _tmp83_)) / 15;
-#line 1019 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1063 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp84_ = _tmp73_[253];
-#line 1021 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1065 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp85_ = *count_data;
-#line 1021 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1065 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp85__length1 = *count_data_length1;
-#line 1021 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1065 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp86_ = *count_data;
-#line 1021 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1065 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp86__length1 = *count_data_length1;
-#line 1021 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1065 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp87_ = _tmp86_[254];
-#line 1021 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1065 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp88_ = *count_data;
-#line 1021 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1065 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp88__length1 = *count_data_length1;
-#line 1021 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1065 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp89_ = _tmp88_[253];
-#line 1021 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1065 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp90_ = *count_data;
-#line 1021 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1065 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp90__length1 = *count_data_length1;
-#line 1021 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1065 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp91_ = _tmp90_[252];
-#line 1021 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1065 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp92_ = *count_data;
-#line 1021 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1065 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp92__length1 = *count_data_length1;
-#line 1021 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1065 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp93_ = _tmp92_[251];
-#line 1021 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1065 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp94_ = *count_data;
-#line 1021 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1065 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp94__length1 = *count_data_length1;
-#line 1021 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1065 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp95_ = _tmp94_[250];
-#line 1021 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1065 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp85_[252] = (((((2 * _tmp87_) + (3 * _tmp89_)) + (5 * _tmp91_)) + (3 * _tmp93_)) + (2 * _tmp95_)) / 15;
-#line 1021 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1065 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp96_ = _tmp85_[252];
-#line 1023 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1067 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp97_ = *count_data;
-#line 1023 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1067 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp97__length1 = *count_data_length1;
-#line 1023 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1067 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp98_ = *count_data;
-#line 1023 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1067 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp98__length1 = *count_data_length1;
-#line 1023 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1067 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp99_ = _tmp98_[253];
-#line 1023 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1067 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp100_ = *count_data;
-#line 1023 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1067 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp100__length1 = *count_data_length1;
-#line 1023 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1067 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp101_ = _tmp100_[252];
-#line 1023 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1067 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp102_ = *count_data;
-#line 1023 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1067 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp102__length1 = *count_data_length1;
-#line 1023 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1067 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp103_ = _tmp102_[251];
-#line 1023 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1067 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp104_ = *count_data;
-#line 1023 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1067 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp104__length1 = *count_data_length1;
-#line 1023 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1067 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp105_ = _tmp104_[250];
-#line 1023 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1067 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp106_ = *count_data;
-#line 1023 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1067 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp106__length1 = *count_data_length1;
-#line 1023 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1067 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp107_ = _tmp106_[249];
-#line 1023 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1067 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp97_[251] = (((((2 * _tmp99_) + (3 * _tmp101_)) + (5 * _tmp103_)) + (3 * _tmp105_)) + (2 * _tmp107_)) / 15;
-#line 1023 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1067 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp108_ = _tmp97_[251];
-#line 9181 "ColorTransformation.c"
+#line 9452 "ColorTransformation.c"
 }
 
 
@@ -9210,119 +9481,119 @@ static void rgb_histogram_prepare_qualitative_counts (RGBHistogram* self) {
 	gint _tmp87_ = 0;
 	gint constrained_max_qual_count = 0;
 	gint _tmp88_ = 0;
-#line 1027 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1071 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_return_if_fail (IS_RGB_HISTOGRAM (self));
-#line 1028 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1072 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp2_ = self->priv->qualitative_red_counts;
-#line 1028 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1072 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp2__length1 = self->priv->qualitative_red_counts_length1;
-#line 1028 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1072 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (_tmp2_ != NULL) {
-#line 9217 "ColorTransformation.c"
+#line 9488 "ColorTransformation.c"
 		gint* _tmp3_ = NULL;
 		gint _tmp3__length1 = 0;
-#line 1028 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1072 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp3_ = self->priv->qualitative_green_counts;
-#line 1028 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1072 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp3__length1 = self->priv->qualitative_green_counts_length1;
-#line 1028 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1072 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp1_ = _tmp3_ != NULL;
-#line 9226 "ColorTransformation.c"
+#line 9497 "ColorTransformation.c"
 	} else {
-#line 1028 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1072 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp1_ = FALSE;
-#line 9230 "ColorTransformation.c"
+#line 9501 "ColorTransformation.c"
 	}
-#line 1028 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1072 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (_tmp1_) {
-#line 9234 "ColorTransformation.c"
+#line 9505 "ColorTransformation.c"
 		gint* _tmp4_ = NULL;
 		gint _tmp4__length1 = 0;
-#line 1029 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1073 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp4_ = self->priv->qualitative_blue_counts;
-#line 1029 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1073 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp4__length1 = self->priv->qualitative_blue_counts_length1;
-#line 1029 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1073 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp0_ = _tmp4_ != NULL;
-#line 9243 "ColorTransformation.c"
+#line 9514 "ColorTransformation.c"
 	} else {
-#line 1028 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1072 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp0_ = FALSE;
-#line 9247 "ColorTransformation.c"
+#line 9518 "ColorTransformation.c"
 	}
-#line 1028 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1072 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (_tmp0_) {
-#line 1030 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1074 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		return;
-#line 9253 "ColorTransformation.c"
+#line 9524 "ColorTransformation.c"
 	}
-#line 1032 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1076 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp5_ = g_new0 (gint, 256);
-#line 1032 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1076 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv->qualitative_red_counts = (g_free (self->priv->qualitative_red_counts), NULL);
-#line 1032 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1076 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv->qualitative_red_counts = _tmp5_;
-#line 1032 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1076 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv->qualitative_red_counts_length1 = 256;
-#line 1032 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1076 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv->_qualitative_red_counts_size_ = self->priv->qualitative_red_counts_length1;
-#line 1033 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1077 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp6_ = g_new0 (gint, 256);
-#line 1033 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1077 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv->qualitative_green_counts = (g_free (self->priv->qualitative_green_counts), NULL);
-#line 1033 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1077 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv->qualitative_green_counts = _tmp6_;
-#line 1033 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1077 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv->qualitative_green_counts_length1 = 256;
-#line 1033 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1077 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv->_qualitative_green_counts_size_ = self->priv->qualitative_green_counts_length1;
-#line 1034 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1078 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp7_ = g_new0 (gint, 256);
-#line 1034 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1078 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv->qualitative_blue_counts = (g_free (self->priv->qualitative_blue_counts), NULL);
-#line 1034 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1078 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv->qualitative_blue_counts = _tmp7_;
-#line 1034 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1078 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv->qualitative_blue_counts_length1 = 256;
-#line 1034 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1078 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv->_qualitative_blue_counts_size_ = self->priv->qualitative_blue_counts_length1;
-#line 1036 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1080 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp8_ = g_new0 (gint, 256);
-#line 1036 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1080 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	temp_red_counts = _tmp8_;
-#line 1036 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1080 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	temp_red_counts_length1 = 256;
-#line 1036 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1080 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_temp_red_counts_size_ = temp_red_counts_length1;
-#line 1037 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1081 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp9_ = g_new0 (gint, 256);
-#line 1037 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1081 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	temp_green_counts = _tmp9_;
-#line 1037 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1081 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	temp_green_counts_length1 = 256;
-#line 1037 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1081 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_temp_green_counts_size_ = temp_green_counts_length1;
-#line 1038 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1082 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp10_ = g_new0 (gint, 256);
-#line 1038 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1082 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	temp_blue_counts = _tmp10_;
-#line 1038 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1082 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	temp_blue_counts_length1 = 256;
-#line 1038 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1082 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_temp_blue_counts_size_ = temp_blue_counts_length1;
-#line 9309 "ColorTransformation.c"
+#line 9580 "ColorTransformation.c"
 	{
 		gint i = 0;
-#line 1044 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1088 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		i = 0;
-#line 9314 "ColorTransformation.c"
+#line 9585 "ColorTransformation.c"
 		{
 			gboolean _tmp11_ = FALSE;
-#line 1044 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1088 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp11_ = TRUE;
-#line 1044 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1088 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			while (TRUE) {
-#line 9321 "ColorTransformation.c"
+#line 9592 "ColorTransformation.c"
 				gint _tmp13_ = 0;
 				gint* _tmp14_ = NULL;
 				gint _tmp14__length1 = 0;
@@ -9348,96 +9619,96 @@ static void rgb_histogram_prepare_qualitative_counts (RGBHistogram* self) {
 				gint _tmp29_ = 0;
 				gint _tmp30_ = 0;
 				gint _tmp31_ = 0;
-#line 1044 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1088 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				if (!_tmp11_) {
-#line 9349 "ColorTransformation.c"
+#line 9620 "ColorTransformation.c"
 					gint _tmp12_ = 0;
-#line 1044 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1088 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp12_ = i;
-#line 1044 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1088 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					i = _tmp12_ + 1;
-#line 9355 "ColorTransformation.c"
+#line 9626 "ColorTransformation.c"
 				}
-#line 1044 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1088 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp11_ = FALSE;
-#line 1044 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1088 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp13_ = i;
-#line 1044 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1088 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				if (!(_tmp13_ < 256)) {
-#line 1044 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1088 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					break;
-#line 9365 "ColorTransformation.c"
+#line 9636 "ColorTransformation.c"
 				}
-#line 1045 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1089 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp14_ = self->priv->qualitative_red_counts;
-#line 1045 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1089 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp14__length1 = self->priv->qualitative_red_counts_length1;
-#line 1045 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1089 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp15_ = i;
-#line 1045 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1089 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp16_ = self->priv->red_counts;
-#line 1045 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1089 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp16__length1 = self->priv->red_counts_length1;
-#line 1045 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1089 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp17_ = i;
-#line 1045 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1089 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp18_ = rgb_histogram_correct_snap_from_quantization (self, _tmp16_, _tmp16__length1, _tmp17_);
-#line 1045 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1089 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp14_[_tmp15_] = _tmp18_;
-#line 1045 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1089 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp19_ = _tmp14_[_tmp15_];
-#line 1047 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1091 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp20_ = self->priv->qualitative_green_counts;
-#line 1047 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1091 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp20__length1 = self->priv->qualitative_green_counts_length1;
-#line 1047 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1091 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp21_ = i;
-#line 1047 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1091 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp22_ = self->priv->green_counts;
-#line 1047 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1091 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp22__length1 = self->priv->green_counts_length1;
-#line 1047 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1091 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp23_ = i;
-#line 1047 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1091 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp24_ = rgb_histogram_correct_snap_from_quantization (self, _tmp22_, _tmp22__length1, _tmp23_);
-#line 1047 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1091 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp20_[_tmp21_] = _tmp24_;
-#line 1047 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1091 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp25_ = _tmp20_[_tmp21_];
-#line 1049 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1093 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp26_ = self->priv->qualitative_blue_counts;
-#line 1049 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1093 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp26__length1 = self->priv->qualitative_blue_counts_length1;
-#line 1049 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1093 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp27_ = i;
-#line 1049 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1093 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp28_ = self->priv->blue_counts;
-#line 1049 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1093 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp28__length1 = self->priv->blue_counts_length1;
-#line 1049 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1093 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp29_ = i;
-#line 1049 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1093 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp30_ = rgb_histogram_correct_snap_from_quantization (self, _tmp28_, _tmp28__length1, _tmp29_);
-#line 1049 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1093 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp26_[_tmp27_] = _tmp30_;
-#line 1049 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1093 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp31_ = _tmp26_[_tmp27_];
-#line 9421 "ColorTransformation.c"
+#line 9692 "ColorTransformation.c"
 			}
 		}
 	}
 	{
 		gint i = 0;
-#line 1053 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1097 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		i = 0;
-#line 9429 "ColorTransformation.c"
+#line 9700 "ColorTransformation.c"
 		{
 			gboolean _tmp32_ = FALSE;
-#line 1053 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1097 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp32_ = TRUE;
-#line 1053 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1097 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			while (TRUE) {
-#line 9436 "ColorTransformation.c"
+#line 9707 "ColorTransformation.c"
 				gint _tmp34_ = 0;
 				gint* _tmp35_ = NULL;
 				gint _tmp35__length1 = 0;
@@ -9463,96 +9734,96 @@ static void rgb_histogram_prepare_qualitative_counts (RGBHistogram* self) {
 				gint _tmp50_ = 0;
 				gint _tmp51_ = 0;
 				gint _tmp52_ = 0;
-#line 1053 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1097 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				if (!_tmp32_) {
-#line 9464 "ColorTransformation.c"
+#line 9735 "ColorTransformation.c"
 					gint _tmp33_ = 0;
-#line 1053 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1097 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp33_ = i;
-#line 1053 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1097 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					i = _tmp33_ + 1;
-#line 9470 "ColorTransformation.c"
+#line 9741 "ColorTransformation.c"
 				}
-#line 1053 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1097 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp32_ = FALSE;
-#line 1053 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1097 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp34_ = i;
-#line 1053 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1097 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				if (!(_tmp34_ < 256)) {
-#line 1053 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1097 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					break;
-#line 9480 "ColorTransformation.c"
+#line 9751 "ColorTransformation.c"
 				}
-#line 1054 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1098 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp35_ = temp_red_counts;
-#line 1054 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1098 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp35__length1 = temp_red_counts_length1;
-#line 1054 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1098 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp36_ = i;
-#line 1054 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1098 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp37_ = self->priv->qualitative_red_counts;
-#line 1054 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1098 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp37__length1 = self->priv->qualitative_red_counts_length1;
-#line 1054 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1098 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp38_ = i;
-#line 1054 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1098 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp39_ = _tmp37_[_tmp38_];
-#line 1054 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1098 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp35_[_tmp36_] = _tmp39_;
-#line 1054 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1098 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp40_ = _tmp35_[_tmp36_];
-#line 1055 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1099 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp41_ = temp_green_counts;
-#line 1055 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1099 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp41__length1 = temp_green_counts_length1;
-#line 1055 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1099 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp42_ = i;
-#line 1055 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1099 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp43_ = self->priv->qualitative_green_counts;
-#line 1055 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1099 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp43__length1 = self->priv->qualitative_green_counts_length1;
-#line 1055 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1099 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp44_ = i;
-#line 1055 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1099 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp45_ = _tmp43_[_tmp44_];
-#line 1055 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1099 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp41_[_tmp42_] = _tmp45_;
-#line 1055 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1099 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp46_ = _tmp41_[_tmp42_];
-#line 1056 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1100 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp47_ = temp_blue_counts;
-#line 1056 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1100 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp47__length1 = temp_blue_counts_length1;
-#line 1056 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1100 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp48_ = i;
-#line 1056 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1100 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp49_ = self->priv->qualitative_blue_counts;
-#line 1056 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1100 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp49__length1 = self->priv->qualitative_blue_counts_length1;
-#line 1056 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1100 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp50_ = i;
-#line 1056 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1100 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp51_ = _tmp49_[_tmp50_];
-#line 1056 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1100 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp47_[_tmp48_] = _tmp51_;
-#line 1056 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1100 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp52_ = _tmp47_[_tmp48_];
-#line 9536 "ColorTransformation.c"
+#line 9807 "ColorTransformation.c"
 			}
 		}
 	}
 	{
 		gint i = 0;
-#line 1061 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1105 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		i = 0;
-#line 9544 "ColorTransformation.c"
+#line 9815 "ColorTransformation.c"
 		{
 			gboolean _tmp53_ = FALSE;
-#line 1061 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1105 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp53_ = TRUE;
-#line 1061 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1105 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			while (TRUE) {
-#line 9551 "ColorTransformation.c"
+#line 9822 "ColorTransformation.c"
 				gint _tmp55_ = 0;
 				gint* _tmp56_ = NULL;
 				gint _tmp56__length1 = 0;
@@ -9578,99 +9849,99 @@ static void rgb_histogram_prepare_qualitative_counts (RGBHistogram* self) {
 				gint _tmp71_ = 0;
 				gint _tmp72_ = 0;
 				gint _tmp73_ = 0;
-#line 1061 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1105 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				if (!_tmp53_) {
-#line 9579 "ColorTransformation.c"
+#line 9850 "ColorTransformation.c"
 					gint _tmp54_ = 0;
-#line 1061 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1105 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp54_ = i;
-#line 1061 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1105 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					i = _tmp54_ + 1;
-#line 9585 "ColorTransformation.c"
+#line 9856 "ColorTransformation.c"
 				}
-#line 1061 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1105 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp53_ = FALSE;
-#line 1061 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1105 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp55_ = i;
-#line 1061 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1105 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				if (!(_tmp55_ < 256)) {
-#line 1061 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1105 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					break;
-#line 9595 "ColorTransformation.c"
+#line 9866 "ColorTransformation.c"
 				}
-#line 1062 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1106 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp56_ = self->priv->qualitative_red_counts;
-#line 1062 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1106 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp56__length1 = self->priv->qualitative_red_counts_length1;
-#line 1062 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1106 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp57_ = i;
-#line 1062 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1106 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp58_ = temp_red_counts;
-#line 1062 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1106 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp58__length1 = temp_red_counts_length1;
-#line 1062 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1106 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp59_ = i;
-#line 1062 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1106 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp60_ = rgb_histogram_correct_snap_to_quantization (self, _tmp58_, _tmp58__length1, _tmp59_);
-#line 1062 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1106 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp56_[_tmp57_] = _tmp60_;
-#line 1062 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1106 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp61_ = _tmp56_[_tmp57_];
-#line 1064 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1108 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp62_ = self->priv->qualitative_green_counts;
-#line 1064 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1108 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp62__length1 = self->priv->qualitative_green_counts_length1;
-#line 1064 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1108 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp63_ = i;
-#line 1064 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1108 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp64_ = temp_green_counts;
-#line 1064 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1108 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp64__length1 = temp_green_counts_length1;
-#line 1064 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1108 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp65_ = i;
-#line 1064 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1108 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp66_ = rgb_histogram_correct_snap_to_quantization (self, _tmp64_, _tmp64__length1, _tmp65_);
-#line 1064 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1108 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp62_[_tmp63_] = _tmp66_;
-#line 1064 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1108 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp67_ = _tmp62_[_tmp63_];
-#line 1066 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1110 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp68_ = self->priv->qualitative_blue_counts;
-#line 1066 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1110 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp68__length1 = self->priv->qualitative_blue_counts_length1;
-#line 1066 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1110 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp69_ = i;
-#line 1066 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1110 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp70_ = temp_blue_counts;
-#line 1066 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1110 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp70__length1 = temp_blue_counts_length1;
-#line 1066 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1110 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp71_ = i;
-#line 1066 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1110 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp72_ = rgb_histogram_correct_snap_to_quantization (self, _tmp70_, _tmp70__length1, _tmp71_);
-#line 1066 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1110 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp68_[_tmp69_] = _tmp72_;
-#line 1066 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1110 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp73_ = _tmp68_[_tmp69_];
-#line 9651 "ColorTransformation.c"
+#line 9922 "ColorTransformation.c"
 			}
 		}
 	}
-#line 1072 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1116 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	mean_qual_count = 0;
-#line 9657 "ColorTransformation.c"
+#line 9928 "ColorTransformation.c"
 	{
 		gint i = 0;
-#line 1073 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1117 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		i = 0;
-#line 9662 "ColorTransformation.c"
+#line 9933 "ColorTransformation.c"
 		{
 			gboolean _tmp74_ = FALSE;
-#line 1073 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1117 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp74_ = TRUE;
-#line 1073 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1117 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			while (TRUE) {
-#line 9669 "ColorTransformation.c"
+#line 9940 "ColorTransformation.c"
 				gint _tmp76_ = 0;
 				gint _tmp77_ = 0;
 				gint* _tmp78_ = NULL;
@@ -9685,79 +9956,79 @@ static void rgb_histogram_prepare_qualitative_counts (RGBHistogram* self) {
 				gint _tmp84__length1 = 0;
 				gint _tmp85_ = 0;
 				gint _tmp86_ = 0;
-#line 1073 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1117 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				if (!_tmp74_) {
-#line 9686 "ColorTransformation.c"
+#line 9957 "ColorTransformation.c"
 					gint _tmp75_ = 0;
-#line 1073 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1117 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp75_ = i;
-#line 1073 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1117 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					i = _tmp75_ + 1;
-#line 9692 "ColorTransformation.c"
+#line 9963 "ColorTransformation.c"
 				}
-#line 1073 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1117 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp74_ = FALSE;
-#line 1073 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1117 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp76_ = i;
-#line 1073 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1117 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				if (!(_tmp76_ < 256)) {
-#line 1073 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1117 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					break;
-#line 9702 "ColorTransformation.c"
+#line 9973 "ColorTransformation.c"
 				}
-#line 1074 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1118 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp77_ = mean_qual_count;
-#line 1074 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1118 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp78_ = self->priv->qualitative_red_counts;
-#line 1074 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1118 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp78__length1 = self->priv->qualitative_red_counts_length1;
-#line 1074 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1118 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp79_ = i;
-#line 1074 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1118 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp80_ = _tmp78_[_tmp79_];
-#line 1074 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1118 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp81_ = self->priv->qualitative_green_counts;
-#line 1074 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1118 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp81__length1 = self->priv->qualitative_green_counts_length1;
-#line 1074 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1118 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp82_ = i;
-#line 1074 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1118 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp83_ = _tmp81_[_tmp82_];
-#line 1074 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1118 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp84_ = self->priv->qualitative_blue_counts;
-#line 1074 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1118 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp84__length1 = self->priv->qualitative_blue_counts_length1;
-#line 1074 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1118 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp85_ = i;
-#line 1074 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1118 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp86_ = _tmp84_[_tmp85_];
-#line 1074 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1118 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				mean_qual_count = _tmp77_ + ((_tmp80_ + _tmp83_) + _tmp86_);
-#line 9732 "ColorTransformation.c"
+#line 10003 "ColorTransformation.c"
 			}
 		}
 	}
-#line 1077 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1121 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp87_ = mean_qual_count;
-#line 1077 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1121 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	mean_qual_count = _tmp87_ / (256 * 3);
-#line 1078 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1122 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp88_ = mean_qual_count;
-#line 1078 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1122 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	constrained_max_qual_count = 8 * _tmp88_;
-#line 9744 "ColorTransformation.c"
+#line 10015 "ColorTransformation.c"
 	{
 		gint i = 0;
-#line 1079 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1123 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		i = 0;
-#line 9749 "ColorTransformation.c"
+#line 10020 "ColorTransformation.c"
 		{
 			gboolean _tmp89_ = FALSE;
-#line 1079 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1123 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp89_ = TRUE;
-#line 1079 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1123 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			while (TRUE) {
-#line 9756 "ColorTransformation.c"
+#line 10027 "ColorTransformation.c"
 				gint _tmp91_ = 0;
 				gint* _tmp92_ = NULL;
 				gint _tmp92__length1 = 0;
@@ -9774,138 +10045,138 @@ static void rgb_histogram_prepare_qualitative_counts (RGBHistogram* self) {
 				gint _tmp109_ = 0;
 				gint _tmp110_ = 0;
 				gint _tmp111_ = 0;
-#line 1079 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1123 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				if (!_tmp89_) {
-#line 9775 "ColorTransformation.c"
+#line 10046 "ColorTransformation.c"
 					gint _tmp90_ = 0;
-#line 1079 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1123 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp90_ = i;
-#line 1079 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1123 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					i = _tmp90_ + 1;
-#line 9781 "ColorTransformation.c"
+#line 10052 "ColorTransformation.c"
 				}
-#line 1079 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1123 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp89_ = FALSE;
-#line 1079 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1123 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp91_ = i;
-#line 1079 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1123 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				if (!(_tmp91_ < 256)) {
-#line 1079 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1123 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					break;
-#line 9791 "ColorTransformation.c"
+#line 10062 "ColorTransformation.c"
 				}
-#line 1080 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1124 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp92_ = self->priv->qualitative_red_counts;
-#line 1080 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1124 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp92__length1 = self->priv->qualitative_red_counts_length1;
-#line 1080 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1124 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp93_ = i;
-#line 1080 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1124 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp94_ = _tmp92_[_tmp93_];
-#line 1080 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1124 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp95_ = constrained_max_qual_count;
-#line 1080 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1124 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				if (_tmp94_ > _tmp95_) {
-#line 9805 "ColorTransformation.c"
+#line 10076 "ColorTransformation.c"
 					gint* _tmp96_ = NULL;
 					gint _tmp96__length1 = 0;
 					gint _tmp97_ = 0;
 					gint _tmp98_ = 0;
 					gint _tmp99_ = 0;
-#line 1081 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1125 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp96_ = self->priv->qualitative_red_counts;
-#line 1081 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1125 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp96__length1 = self->priv->qualitative_red_counts_length1;
-#line 1081 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1125 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp97_ = i;
-#line 1081 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1125 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp98_ = constrained_max_qual_count;
-#line 1081 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1125 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp96_[_tmp97_] = _tmp98_;
-#line 1081 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1125 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp99_ = _tmp96_[_tmp97_];
-#line 9823 "ColorTransformation.c"
+#line 10094 "ColorTransformation.c"
 				}
-#line 1083 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1127 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp100_ = self->priv->qualitative_green_counts;
-#line 1083 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1127 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp100__length1 = self->priv->qualitative_green_counts_length1;
-#line 1083 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1127 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp101_ = i;
-#line 1083 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1127 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp102_ = _tmp100_[_tmp101_];
-#line 1083 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1127 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp103_ = constrained_max_qual_count;
-#line 1083 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1127 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				if (_tmp102_ > _tmp103_) {
-#line 9837 "ColorTransformation.c"
+#line 10108 "ColorTransformation.c"
 					gint* _tmp104_ = NULL;
 					gint _tmp104__length1 = 0;
 					gint _tmp105_ = 0;
 					gint _tmp106_ = 0;
 					gint _tmp107_ = 0;
-#line 1084 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1128 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp104_ = self->priv->qualitative_green_counts;
-#line 1084 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1128 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp104__length1 = self->priv->qualitative_green_counts_length1;
-#line 1084 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1128 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp105_ = i;
-#line 1084 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1128 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp106_ = constrained_max_qual_count;
-#line 1084 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1128 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp104_[_tmp105_] = _tmp106_;
-#line 1084 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1128 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp107_ = _tmp104_[_tmp105_];
-#line 9855 "ColorTransformation.c"
+#line 10126 "ColorTransformation.c"
 				}
-#line 1086 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1130 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp108_ = self->priv->qualitative_blue_counts;
-#line 1086 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1130 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp108__length1 = self->priv->qualitative_blue_counts_length1;
-#line 1086 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1130 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp109_ = i;
-#line 1086 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1130 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp110_ = _tmp108_[_tmp109_];
-#line 1086 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1130 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp111_ = constrained_max_qual_count;
-#line 1086 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1130 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				if (_tmp110_ > _tmp111_) {
-#line 9869 "ColorTransformation.c"
+#line 10140 "ColorTransformation.c"
 					gint* _tmp112_ = NULL;
 					gint _tmp112__length1 = 0;
 					gint _tmp113_ = 0;
 					gint _tmp114_ = 0;
 					gint _tmp115_ = 0;
-#line 1087 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1131 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp112_ = self->priv->qualitative_blue_counts;
-#line 1087 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1131 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp112__length1 = self->priv->qualitative_blue_counts_length1;
-#line 1087 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1131 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp113_ = i;
-#line 1087 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1131 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp114_ = constrained_max_qual_count;
-#line 1087 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1131 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp112_[_tmp113_] = _tmp114_;
-#line 1087 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1131 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp115_ = _tmp112_[_tmp113_];
-#line 9887 "ColorTransformation.c"
+#line 10158 "ColorTransformation.c"
 				}
 			}
 		}
 	}
-#line 1090 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1134 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	rgb_histogram_smooth_extrema (self, &self->priv->qualitative_red_counts, &self->priv->qualitative_red_counts_length1);
-#line 1091 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1135 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	rgb_histogram_smooth_extrema (self, &self->priv->qualitative_green_counts, &self->priv->qualitative_green_counts_length1);
-#line 1092 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1136 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	rgb_histogram_smooth_extrema (self, &self->priv->qualitative_blue_counts, &self->priv->qualitative_blue_counts_length1);
-#line 1027 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1071 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	temp_blue_counts = (g_free (temp_blue_counts), NULL);
-#line 1027 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1071 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	temp_green_counts = (g_free (temp_green_counts), NULL);
-#line 1027 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1071 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	temp_red_counts = (g_free (temp_red_counts), NULL);
-#line 9904 "ColorTransformation.c"
+#line 10175 "ColorTransformation.c"
 }
 
 
@@ -9914,13 +10185,13 @@ GdkPixbuf* rgb_histogram_get_graphic (RGBHistogram* self) {
 	GdkPixbuf* _tmp0_ = NULL;
 	GdkPixbuf* _tmp121_ = NULL;
 	GdkPixbuf* _tmp122_ = NULL;
-#line 1095 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1139 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_return_val_if_fail (IS_RGB_HISTOGRAM (self), NULL);
-#line 1096 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1140 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp0_ = self->priv->graphic;
-#line 1096 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1140 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (_tmp0_ == NULL) {
-#line 9919 "ColorTransformation.c"
+#line 10190 "ColorTransformation.c"
 		gint max_count = 0;
 		GdkPixbuf* _tmp25_ = NULL;
 		gint rowstride = 0;
@@ -9942,23 +10213,23 @@ GdkPixbuf* rgb_histogram_get_graphic (RGBHistogram* self) {
 		gint pixel_data_length1 = 0;
 		gint _pixel_data_size_ = 0;
 		gint _tmp37_ = 0;
-#line 1097 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1141 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		rgb_histogram_prepare_qualitative_counts (self);
-#line 1098 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1142 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		max_count = 0;
-#line 9945 "ColorTransformation.c"
+#line 10216 "ColorTransformation.c"
 		{
 			gint i = 0;
-#line 1099 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1143 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			i = 0;
-#line 9950 "ColorTransformation.c"
+#line 10221 "ColorTransformation.c"
 			{
 				gboolean _tmp1_ = FALSE;
-#line 1099 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1143 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp1_ = TRUE;
-#line 1099 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1143 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				while (TRUE) {
-#line 9957 "ColorTransformation.c"
+#line 10228 "ColorTransformation.c"
 					gint _tmp3_ = 0;
 					gint* _tmp4_ = NULL;
 					gint _tmp4__length1 = 0;
@@ -9975,177 +10246,177 @@ GdkPixbuf* rgb_histogram_get_graphic (RGBHistogram* self) {
 					gint _tmp19_ = 0;
 					gint _tmp20_ = 0;
 					gint _tmp21_ = 0;
-#line 1099 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1143 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					if (!_tmp1_) {
-#line 9976 "ColorTransformation.c"
+#line 10247 "ColorTransformation.c"
 						gint _tmp2_ = 0;
-#line 1099 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1143 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 						_tmp2_ = i;
-#line 1099 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1143 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 						i = _tmp2_ + 1;
-#line 9982 "ColorTransformation.c"
+#line 10253 "ColorTransformation.c"
 					}
-#line 1099 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1143 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp1_ = FALSE;
-#line 1099 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1143 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp3_ = i;
-#line 1099 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1143 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					if (!(_tmp3_ < 256)) {
-#line 1099 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1143 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 						break;
-#line 9992 "ColorTransformation.c"
+#line 10263 "ColorTransformation.c"
 					}
-#line 1100 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1144 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp4_ = self->priv->qualitative_red_counts;
-#line 1100 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1144 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp4__length1 = self->priv->qualitative_red_counts_length1;
-#line 1100 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1144 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp5_ = i;
-#line 1100 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1144 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp6_ = _tmp4_[_tmp5_];
-#line 1100 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1144 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp7_ = max_count;
-#line 1100 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1144 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					if (_tmp6_ > _tmp7_) {
-#line 10006 "ColorTransformation.c"
+#line 10277 "ColorTransformation.c"
 						gint* _tmp8_ = NULL;
 						gint _tmp8__length1 = 0;
 						gint _tmp9_ = 0;
 						gint _tmp10_ = 0;
-#line 1101 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1145 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 						_tmp8_ = self->priv->qualitative_red_counts;
-#line 1101 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1145 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 						_tmp8__length1 = self->priv->qualitative_red_counts_length1;
-#line 1101 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1145 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 						_tmp9_ = i;
-#line 1101 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1145 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 						_tmp10_ = _tmp8_[_tmp9_];
-#line 1101 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1145 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 						max_count = _tmp10_;
-#line 10021 "ColorTransformation.c"
+#line 10292 "ColorTransformation.c"
 					}
-#line 1102 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1146 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp11_ = self->priv->qualitative_green_counts;
-#line 1102 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1146 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp11__length1 = self->priv->qualitative_green_counts_length1;
-#line 1102 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1146 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp12_ = i;
-#line 1102 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1146 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp13_ = _tmp11_[_tmp12_];
-#line 1102 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1146 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp14_ = max_count;
-#line 1102 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1146 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					if (_tmp13_ > _tmp14_) {
-#line 10035 "ColorTransformation.c"
+#line 10306 "ColorTransformation.c"
 						gint* _tmp15_ = NULL;
 						gint _tmp15__length1 = 0;
 						gint _tmp16_ = 0;
 						gint _tmp17_ = 0;
-#line 1103 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1147 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 						_tmp15_ = self->priv->qualitative_green_counts;
-#line 1103 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1147 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 						_tmp15__length1 = self->priv->qualitative_green_counts_length1;
-#line 1103 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1147 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 						_tmp16_ = i;
-#line 1103 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1147 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 						_tmp17_ = _tmp15_[_tmp16_];
-#line 1103 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1147 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 						max_count = _tmp17_;
-#line 10050 "ColorTransformation.c"
+#line 10321 "ColorTransformation.c"
 					}
-#line 1104 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1148 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp18_ = self->priv->qualitative_blue_counts;
-#line 1104 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1148 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp18__length1 = self->priv->qualitative_blue_counts_length1;
-#line 1104 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1148 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp19_ = i;
-#line 1104 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1148 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp20_ = _tmp18_[_tmp19_];
-#line 1104 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1148 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp21_ = max_count;
-#line 1104 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1148 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					if (_tmp20_ > _tmp21_) {
-#line 10064 "ColorTransformation.c"
+#line 10335 "ColorTransformation.c"
 						gint* _tmp22_ = NULL;
 						gint _tmp22__length1 = 0;
 						gint _tmp23_ = 0;
 						gint _tmp24_ = 0;
-#line 1105 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1149 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 						_tmp22_ = self->priv->qualitative_blue_counts;
-#line 1105 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1149 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 						_tmp22__length1 = self->priv->qualitative_blue_counts_length1;
-#line 1105 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1149 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 						_tmp23_ = i;
-#line 1105 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1149 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 						_tmp24_ = _tmp22_[_tmp23_];
-#line 1105 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1149 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 						max_count = _tmp24_;
-#line 10079 "ColorTransformation.c"
+#line 10350 "ColorTransformation.c"
 					}
 				}
 			}
 		}
-#line 1108 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1152 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp25_ = gdk_pixbuf_new (GDK_COLORSPACE_RGB, FALSE, 8, RGB_HISTOGRAM_GRAPHIC_WIDTH, RGB_HISTOGRAM_GRAPHIC_HEIGHT);
-#line 1108 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1152 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_g_object_unref0 (self->priv->graphic);
-#line 1108 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1152 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		self->priv->graphic = _tmp25_;
-#line 1111 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1155 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp26_ = self->priv->graphic;
-#line 1111 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1155 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp27_ = gdk_pixbuf_get_rowstride (_tmp26_);
-#line 1111 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1155 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp28_ = _tmp27_;
-#line 1111 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1155 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		rowstride = _tmp28_;
-#line 1112 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1156 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp29_ = self->priv->graphic;
-#line 1112 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1156 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp30_ = gdk_pixbuf_get_bits_per_sample (_tmp29_);
-#line 1112 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1156 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		sample_bytes = _tmp30_ / 8;
-#line 1113 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1157 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp31_ = sample_bytes;
-#line 1113 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1157 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp32_ = self->priv->graphic;
-#line 1113 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1157 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp33_ = gdk_pixbuf_get_n_channels (_tmp32_);
-#line 1113 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1157 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		pixel_bytes = _tmp31_ * _tmp33_;
-#line 1115 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1159 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp34_ = max_count;
-#line 1115 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1159 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		scale_bar = (0.98 * ((gdouble) RGB_HISTOGRAM_GRAPHIC_HEIGHT)) / ((gdouble) _tmp34_);
-#line 1118 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1162 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp35_ = self->priv->graphic;
-#line 1118 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1162 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp36_ = gdk_pixbuf_get_pixels (_tmp35_);
-#line 1118 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1162 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		pixel_data = _tmp36_;
-#line 1118 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1162 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		pixel_data_length1 = -1;
-#line 1118 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1162 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_pixel_data_size_ = pixel_data_length1;
-#line 1122 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1166 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp37_ = max_count;
-#line 1122 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1166 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		if (_tmp37_ == 0) {
-#line 10130 "ColorTransformation.c"
+#line 10401 "ColorTransformation.c"
 			GdkPixbuf* _tmp51_ = NULL;
 			GdkPixbuf* _tmp52_ = NULL;
 			{
 				gint i = 0;
-#line 1123 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1167 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				i = 0;
-#line 10137 "ColorTransformation.c"
+#line 10408 "ColorTransformation.c"
 				{
 					gboolean _tmp38_ = FALSE;
-#line 1123 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1167 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp38_ = TRUE;
-#line 1123 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1167 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					while (TRUE) {
-#line 10144 "ColorTransformation.c"
+#line 10415 "ColorTransformation.c"
 						gint _tmp40_ = 0;
 						gint _tmp41_ = 0;
 						GdkPixbuf* _tmp42_ = NULL;
@@ -10158,76 +10429,76 @@ GdkPixbuf* rgb_histogram_get_graphic (RGBHistogram* self) {
 						gint _tmp48__length1 = 0;
 						gint _tmp49_ = 0;
 						guchar _tmp50_ = '\0';
-#line 1123 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1167 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 						if (!_tmp38_) {
-#line 10159 "ColorTransformation.c"
+#line 10430 "ColorTransformation.c"
 							gint _tmp39_ = 0;
-#line 1123 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1167 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp39_ = i;
-#line 1123 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1167 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							i = _tmp39_ + 1;
-#line 10165 "ColorTransformation.c"
+#line 10436 "ColorTransformation.c"
 						}
-#line 1123 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1167 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 						_tmp38_ = FALSE;
-#line 1123 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1167 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 						_tmp40_ = i;
-#line 1123 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1167 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 						_tmp41_ = pixel_bytes;
-#line 1123 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1167 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 						_tmp42_ = self->priv->graphic;
-#line 1123 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1167 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 						_tmp43_ = gdk_pixbuf_get_width (_tmp42_);
-#line 1123 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1167 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 						_tmp44_ = _tmp43_;
-#line 1123 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1167 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 						_tmp45_ = self->priv->graphic;
-#line 1123 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1167 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 						_tmp46_ = gdk_pixbuf_get_height (_tmp45_);
-#line 1123 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1167 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 						_tmp47_ = _tmp46_;
-#line 1123 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1167 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 						if (!(_tmp40_ < ((_tmp41_ * _tmp44_) * _tmp47_))) {
-#line 1123 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1167 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							break;
-#line 10189 "ColorTransformation.c"
+#line 10460 "ColorTransformation.c"
 						}
-#line 1124 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1168 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 						_tmp48_ = pixel_data;
-#line 1124 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1168 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 						_tmp48__length1 = pixel_data_length1;
-#line 1124 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1168 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 						_tmp49_ = i;
-#line 1124 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1168 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 						_tmp48_[_tmp49_] = RGB_HISTOGRAM_UNMARKED_BACKGROUND;
-#line 1124 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1168 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 						_tmp50_ = _tmp48_[_tmp49_];
-#line 10201 "ColorTransformation.c"
+#line 10472 "ColorTransformation.c"
 					}
 				}
 			}
-#line 1126 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1170 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp51_ = self->priv->graphic;
-#line 1126 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1170 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp52_ = _g_object_ref0 (_tmp51_);
-#line 1126 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1170 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			result = _tmp52_;
-#line 1126 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1170 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			return result;
-#line 10213 "ColorTransformation.c"
+#line 10484 "ColorTransformation.c"
 		}
 		{
 			gint x = 0;
-#line 1129 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1173 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			x = 0;
-#line 10219 "ColorTransformation.c"
+#line 10490 "ColorTransformation.c"
 			{
 				gboolean _tmp53_ = FALSE;
-#line 1129 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1173 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp53_ = TRUE;
-#line 1129 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1173 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				while (TRUE) {
-#line 10226 "ColorTransformation.c"
+#line 10497 "ColorTransformation.c"
 					gint _tmp55_ = 0;
 					gint red_bar_height = 0;
 					gint* _tmp56_ = NULL;
@@ -10259,94 +10530,94 @@ GdkPixbuf* rgb_histogram_get_graphic (RGBHistogram* self) {
 					gint _tmp74_ = 0;
 					gint _tmp75_ = 0;
 					gint _tmp76_ = 0;
-#line 1129 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1173 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					if (!_tmp53_) {
-#line 10260 "ColorTransformation.c"
+#line 10531 "ColorTransformation.c"
 						gint _tmp54_ = 0;
-#line 1129 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1173 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 						_tmp54_ = x;
-#line 1129 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1173 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 						x = _tmp54_ + 1;
-#line 10266 "ColorTransformation.c"
+#line 10537 "ColorTransformation.c"
 					}
-#line 1129 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1173 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp53_ = FALSE;
-#line 1129 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1173 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp55_ = x;
-#line 1129 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1173 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					if (!(_tmp55_ < 256)) {
-#line 1129 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1173 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 						break;
-#line 10276 "ColorTransformation.c"
+#line 10547 "ColorTransformation.c"
 					}
-#line 1130 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1174 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp56_ = self->priv->qualitative_red_counts;
-#line 1130 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1174 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp56__length1 = self->priv->qualitative_red_counts_length1;
-#line 1130 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1174 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp57_ = x;
-#line 1130 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1174 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp58_ = _tmp56_[_tmp57_];
-#line 1130 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1174 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp59_ = scale_bar;
-#line 1130 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1174 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					red_bar_height = (gint) (((gdouble) _tmp58_) * _tmp59_);
-#line 1132 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1176 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp60_ = self->priv->qualitative_green_counts;
-#line 1132 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1176 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp60__length1 = self->priv->qualitative_green_counts_length1;
-#line 1132 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1176 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp61_ = x;
-#line 1132 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1176 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp62_ = _tmp60_[_tmp61_];
-#line 1132 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1176 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp63_ = scale_bar;
-#line 1132 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1176 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					green_bar_height = (gint) (((gdouble) _tmp62_) * _tmp63_);
-#line 1134 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1178 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp64_ = self->priv->qualitative_blue_counts;
-#line 1134 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1178 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp64__length1 = self->priv->qualitative_blue_counts_length1;
-#line 1134 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1178 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp65_ = x;
-#line 1134 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1178 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp66_ = _tmp64_[_tmp65_];
-#line 1134 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1178 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp67_ = scale_bar;
-#line 1134 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1178 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					blue_bar_height = (gint) (((gdouble) _tmp66_) * _tmp67_);
-#line 1137 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1181 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp68_ = red_bar_height;
-#line 1137 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1181 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp69_ = green_bar_height;
-#line 1137 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1181 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp70_ = MAX (_tmp68_, _tmp69_);
-#line 1137 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1181 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp71_ = blue_bar_height;
-#line 1137 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1181 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp72_ = MAX (_tmp70_, _tmp71_);
-#line 1137 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1181 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					max_bar_height = _tmp72_;
-#line 1140 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1184 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					y = RGB_HISTOGRAM_GRAPHIC_HEIGHT - 1;
-#line 1141 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1185 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp73_ = x;
-#line 1141 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1185 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp74_ = pixel_bytes;
-#line 1141 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1185 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp75_ = y;
-#line 1141 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1185 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp76_ = rowstride;
-#line 1141 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1185 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					pixel_index = (_tmp73_ * _tmp74_) + (_tmp75_ * _tmp76_);
-#line 10338 "ColorTransformation.c"
+#line 10609 "ColorTransformation.c"
 					{
 						gboolean _tmp77_ = FALSE;
-#line 1142 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1186 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 						_tmp77_ = TRUE;
-#line 1142 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1186 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 						while (TRUE) {
-#line 10345 "ColorTransformation.c"
+#line 10616 "ColorTransformation.c"
 							gint _tmp79_ = 0;
 							gint _tmp80_ = 0;
 							guchar* _tmp81_ = NULL;
@@ -10369,143 +10640,143 @@ GdkPixbuf* rgb_histogram_get_graphic (RGBHistogram* self) {
 							gint _tmp101_ = 0;
 							gint _tmp105_ = 0;
 							gint _tmp106_ = 0;
-#line 1142 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1186 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							if (!_tmp77_) {
-#line 10370 "ColorTransformation.c"
+#line 10641 "ColorTransformation.c"
 								gint _tmp78_ = 0;
-#line 1142 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1186 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 								_tmp78_ = y;
-#line 1142 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1186 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 								y = _tmp78_ - 1;
-#line 10376 "ColorTransformation.c"
+#line 10647 "ColorTransformation.c"
 							}
-#line 1142 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1186 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp77_ = FALSE;
-#line 1142 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1186 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp79_ = y;
-#line 1142 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1186 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp80_ = max_bar_height;
-#line 1142 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1186 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							if (!(_tmp79_ >= (RGB_HISTOGRAM_GRAPHIC_HEIGHT - _tmp80_))) {
-#line 1142 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1186 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 								break;
-#line 10388 "ColorTransformation.c"
+#line 10659 "ColorTransformation.c"
 							}
-#line 1143 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1187 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp81_ = pixel_data;
-#line 1143 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1187 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp81__length1 = pixel_data_length1;
-#line 1143 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1187 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp82_ = pixel_index;
-#line 1143 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1187 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp81_[_tmp82_] = RGB_HISTOGRAM_MARKED_BACKGROUND;
-#line 1143 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1187 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp83_ = _tmp81_[_tmp82_];
-#line 1144 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1188 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp84_ = pixel_data;
-#line 1144 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1188 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp84__length1 = pixel_data_length1;
-#line 1144 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1188 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp85_ = pixel_index;
-#line 1144 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1188 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp84_[_tmp85_ + 1] = RGB_HISTOGRAM_MARKED_BACKGROUND;
-#line 1144 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1188 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp86_ = _tmp84_[_tmp85_ + 1];
-#line 1145 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1189 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp87_ = pixel_data;
-#line 1145 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1189 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp87__length1 = pixel_data_length1;
-#line 1145 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1189 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp88_ = pixel_index;
-#line 1145 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1189 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp87_[_tmp88_ + 2] = RGB_HISTOGRAM_MARKED_BACKGROUND;
-#line 1145 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1189 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp89_ = _tmp87_[_tmp88_ + 2];
-#line 1147 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1191 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp90_ = y;
-#line 1147 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1191 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp91_ = red_bar_height;
-#line 1147 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1191 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							if (_tmp90_ >= ((RGB_HISTOGRAM_GRAPHIC_HEIGHT - _tmp91_) - 1)) {
-#line 10426 "ColorTransformation.c"
+#line 10697 "ColorTransformation.c"
 								guchar* _tmp92_ = NULL;
 								gint _tmp92__length1 = 0;
 								gint _tmp93_ = 0;
 								guchar _tmp94_ = '\0';
-#line 1148 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1192 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 								_tmp92_ = pixel_data;
-#line 1148 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1192 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 								_tmp92__length1 = pixel_data_length1;
-#line 1148 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1192 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 								_tmp93_ = pixel_index;
-#line 1148 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1192 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 								_tmp92_[_tmp93_] = RGB_HISTOGRAM_MARKED_FOREGROUND;
-#line 1148 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1192 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 								_tmp94_ = _tmp92_[_tmp93_];
-#line 10441 "ColorTransformation.c"
+#line 10712 "ColorTransformation.c"
 							}
-#line 1149 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1193 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp95_ = y;
-#line 1149 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1193 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp96_ = green_bar_height;
-#line 1149 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1193 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							if (_tmp95_ >= ((RGB_HISTOGRAM_GRAPHIC_HEIGHT - _tmp96_) - 1)) {
-#line 10449 "ColorTransformation.c"
+#line 10720 "ColorTransformation.c"
 								guchar* _tmp97_ = NULL;
 								gint _tmp97__length1 = 0;
 								gint _tmp98_ = 0;
 								guchar _tmp99_ = '\0';
-#line 1150 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1194 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 								_tmp97_ = pixel_data;
-#line 1150 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1194 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 								_tmp97__length1 = pixel_data_length1;
-#line 1150 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1194 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 								_tmp98_ = pixel_index;
-#line 1150 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1194 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 								_tmp97_[_tmp98_ + 1] = RGB_HISTOGRAM_MARKED_FOREGROUND;
-#line 1150 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1194 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 								_tmp99_ = _tmp97_[_tmp98_ + 1];
-#line 10464 "ColorTransformation.c"
+#line 10735 "ColorTransformation.c"
 							}
-#line 1151 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1195 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp100_ = y;
-#line 1151 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1195 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp101_ = blue_bar_height;
-#line 1151 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1195 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							if (_tmp100_ >= ((RGB_HISTOGRAM_GRAPHIC_HEIGHT - _tmp101_) - 1)) {
-#line 10472 "ColorTransformation.c"
+#line 10743 "ColorTransformation.c"
 								guchar* _tmp102_ = NULL;
 								gint _tmp102__length1 = 0;
 								gint _tmp103_ = 0;
 								guchar _tmp104_ = '\0';
-#line 1152 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1196 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 								_tmp102_ = pixel_data;
-#line 1152 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1196 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 								_tmp102__length1 = pixel_data_length1;
-#line 1152 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1196 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 								_tmp103_ = pixel_index;
-#line 1152 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1196 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 								_tmp102_[_tmp103_ + 2] = RGB_HISTOGRAM_MARKED_FOREGROUND;
-#line 1152 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1196 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 								_tmp104_ = _tmp102_[_tmp103_ + 2];
-#line 10487 "ColorTransformation.c"
+#line 10758 "ColorTransformation.c"
 							}
-#line 1154 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1198 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp105_ = pixel_index;
-#line 1154 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1198 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp106_ = rowstride;
-#line 1154 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1198 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							pixel_index = _tmp105_ - _tmp106_;
-#line 10495 "ColorTransformation.c"
+#line 10766 "ColorTransformation.c"
 						}
 					}
 					{
 						gboolean _tmp107_ = FALSE;
-#line 1157 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1201 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 						_tmp107_ = TRUE;
-#line 1157 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1201 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 						while (TRUE) {
-#line 10504 "ColorTransformation.c"
+#line 10775 "ColorTransformation.c"
 							gint _tmp109_ = 0;
 							guchar* _tmp110_ = NULL;
 							gint _tmp110__length1 = 0;
@@ -10521,269 +10792,269 @@ GdkPixbuf* rgb_histogram_get_graphic (RGBHistogram* self) {
 							guchar _tmp118_ = '\0';
 							gint _tmp119_ = 0;
 							gint _tmp120_ = 0;
-#line 1157 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1201 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							if (!_tmp107_) {
-#line 10522 "ColorTransformation.c"
+#line 10793 "ColorTransformation.c"
 								gint _tmp108_ = 0;
-#line 1157 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1201 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 								_tmp108_ = y;
-#line 1157 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1201 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 								y = _tmp108_ - 1;
-#line 10528 "ColorTransformation.c"
+#line 10799 "ColorTransformation.c"
 							}
-#line 1157 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1201 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp107_ = FALSE;
-#line 1157 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1201 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp109_ = y;
-#line 1157 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1201 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							if (!(_tmp109_ >= 0)) {
-#line 1157 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1201 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 								break;
-#line 10538 "ColorTransformation.c"
+#line 10809 "ColorTransformation.c"
 							}
-#line 1158 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1202 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp110_ = pixel_data;
-#line 1158 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1202 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp110__length1 = pixel_data_length1;
-#line 1158 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1202 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp111_ = pixel_index;
-#line 1158 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1202 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp110_[_tmp111_] = RGB_HISTOGRAM_UNMARKED_BACKGROUND;
-#line 1158 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1202 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp112_ = _tmp110_[_tmp111_];
-#line 1159 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1203 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp113_ = pixel_data;
-#line 1159 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1203 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp113__length1 = pixel_data_length1;
-#line 1159 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1203 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp114_ = pixel_index;
-#line 1159 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1203 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp113_[_tmp114_ + 1] = RGB_HISTOGRAM_UNMARKED_BACKGROUND;
-#line 1159 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1203 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp115_ = _tmp113_[_tmp114_ + 1];
-#line 1160 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1204 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp116_ = pixel_data;
-#line 1160 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1204 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp116__length1 = pixel_data_length1;
-#line 1160 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1204 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp117_ = pixel_index;
-#line 1160 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1204 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp116_[_tmp117_ + 2] = RGB_HISTOGRAM_UNMARKED_BACKGROUND;
-#line 1160 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1204 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp118_ = _tmp116_[_tmp117_ + 2];
-#line 1162 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1206 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp119_ = pixel_index;
-#line 1162 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1206 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp120_ = rowstride;
-#line 1162 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1206 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							pixel_index = _tmp119_ - _tmp120_;
-#line 10576 "ColorTransformation.c"
+#line 10847 "ColorTransformation.c"
 						}
 					}
 				}
 			}
 		}
 	}
-#line 1167 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1211 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp121_ = self->priv->graphic;
-#line 1167 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1211 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp122_ = _g_object_ref0 (_tmp121_);
-#line 1167 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1211 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	result = _tmp122_;
-#line 1167 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1211 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return result;
-#line 10591 "ColorTransformation.c"
+#line 10862 "ColorTransformation.c"
 }
 
 
 static void value_rgb_histogram_init (GValue* value) {
-#line 914 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 958 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	value->data[0].v_pointer = NULL;
-#line 10598 "ColorTransformation.c"
+#line 10869 "ColorTransformation.c"
 }
 
 
 static void value_rgb_histogram_free_value (GValue* value) {
-#line 914 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 958 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (value->data[0].v_pointer) {
-#line 914 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 958 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		rgb_histogram_unref (value->data[0].v_pointer);
-#line 10607 "ColorTransformation.c"
+#line 10878 "ColorTransformation.c"
 	}
 }
 
 
 static void value_rgb_histogram_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 914 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 958 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (src_value->data[0].v_pointer) {
-#line 914 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 958 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		dest_value->data[0].v_pointer = rgb_histogram_ref (src_value->data[0].v_pointer);
-#line 10617 "ColorTransformation.c"
+#line 10888 "ColorTransformation.c"
 	} else {
-#line 914 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 958 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 10621 "ColorTransformation.c"
+#line 10892 "ColorTransformation.c"
 	}
 }
 
 
 static gpointer value_rgb_histogram_peek_pointer (const GValue* value) {
-#line 914 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 958 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return value->data[0].v_pointer;
-#line 10629 "ColorTransformation.c"
+#line 10900 "ColorTransformation.c"
 }
 
 
 static gchar* value_rgb_histogram_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 914 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 958 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (collect_values[0].v_pointer) {
-#line 10636 "ColorTransformation.c"
+#line 10907 "ColorTransformation.c"
 		RGBHistogram* object;
 		object = collect_values[0].v_pointer;
-#line 914 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 958 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		if (object->parent_instance.g_class == NULL) {
-#line 914 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 958 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 10643 "ColorTransformation.c"
+#line 10914 "ColorTransformation.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 914 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 958 "/home/jens/Source/shotwell/src/ColorTransformation.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 10647 "ColorTransformation.c"
+#line 10918 "ColorTransformation.c"
 		}
-#line 914 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 958 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		value->data[0].v_pointer = rgb_histogram_ref (object);
-#line 10651 "ColorTransformation.c"
+#line 10922 "ColorTransformation.c"
 	} else {
-#line 914 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 958 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		value->data[0].v_pointer = NULL;
-#line 10655 "ColorTransformation.c"
+#line 10926 "ColorTransformation.c"
 	}
-#line 914 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 958 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return NULL;
-#line 10659 "ColorTransformation.c"
+#line 10930 "ColorTransformation.c"
 }
 
 
 static gchar* value_rgb_histogram_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 	RGBHistogram** object_p;
 	object_p = collect_values[0].v_pointer;
-#line 914 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 958 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (!object_p) {
-#line 914 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 958 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 10670 "ColorTransformation.c"
+#line 10941 "ColorTransformation.c"
 	}
-#line 914 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 958 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (!value->data[0].v_pointer) {
-#line 914 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 958 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		*object_p = NULL;
-#line 10676 "ColorTransformation.c"
+#line 10947 "ColorTransformation.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 914 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 958 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		*object_p = value->data[0].v_pointer;
-#line 10680 "ColorTransformation.c"
+#line 10951 "ColorTransformation.c"
 	} else {
-#line 914 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 958 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		*object_p = rgb_histogram_ref (value->data[0].v_pointer);
-#line 10684 "ColorTransformation.c"
+#line 10955 "ColorTransformation.c"
 	}
-#line 914 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 958 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return NULL;
-#line 10688 "ColorTransformation.c"
+#line 10959 "ColorTransformation.c"
 }
 
 
 GParamSpec* param_spec_rgb_histogram (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
 	ParamSpecRGBHistogram* spec;
-#line 914 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 958 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, TYPE_RGB_HISTOGRAM), NULL);
-#line 914 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 958 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 914 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 958 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 914 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 958 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return G_PARAM_SPEC (spec);
-#line 10702 "ColorTransformation.c"
+#line 10973 "ColorTransformation.c"
 }
 
 
 gpointer value_get_rgb_histogram (const GValue* value) {
-#line 914 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 958 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_RGB_HISTOGRAM), NULL);
-#line 914 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 958 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return value->data[0].v_pointer;
-#line 10711 "ColorTransformation.c"
+#line 10982 "ColorTransformation.c"
 }
 
 
 void value_set_rgb_histogram (GValue* value, gpointer v_object) {
 	RGBHistogram* old;
-#line 914 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 958 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_RGB_HISTOGRAM));
-#line 914 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 958 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	old = value->data[0].v_pointer;
-#line 914 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 958 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (v_object) {
-#line 914 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 958 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_RGB_HISTOGRAM));
-#line 914 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 958 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 914 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 958 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		value->data[0].v_pointer = v_object;
-#line 914 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 958 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		rgb_histogram_ref (value->data[0].v_pointer);
-#line 10731 "ColorTransformation.c"
+#line 11002 "ColorTransformation.c"
 	} else {
-#line 914 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 958 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		value->data[0].v_pointer = NULL;
-#line 10735 "ColorTransformation.c"
+#line 11006 "ColorTransformation.c"
 	}
-#line 914 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 958 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (old) {
-#line 914 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 958 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		rgb_histogram_unref (old);
-#line 10741 "ColorTransformation.c"
+#line 11012 "ColorTransformation.c"
 	}
 }
 
 
 void value_take_rgb_histogram (GValue* value, gpointer v_object) {
 	RGBHistogram* old;
-#line 914 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 958 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_RGB_HISTOGRAM));
-#line 914 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 958 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	old = value->data[0].v_pointer;
-#line 914 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 958 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (v_object) {
-#line 914 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 958 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_RGB_HISTOGRAM));
-#line 914 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 958 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 914 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 958 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		value->data[0].v_pointer = v_object;
-#line 10760 "ColorTransformation.c"
+#line 11031 "ColorTransformation.c"
 	} else {
-#line 914 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 958 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		value->data[0].v_pointer = NULL;
-#line 10764 "ColorTransformation.c"
+#line 11035 "ColorTransformation.c"
 	}
-#line 914 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 958 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (old) {
-#line 914 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 958 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		rgb_histogram_unref (old);
-#line 10770 "ColorTransformation.c"
+#line 11041 "ColorTransformation.c"
 	}
 }
 
 
 static void rgb_histogram_class_init (RGBHistogramClass * klass) {
-#line 914 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 958 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	rgb_histogram_parent_class = g_type_class_peek_parent (klass);
-#line 914 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 958 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	((RGBHistogramClass *) klass)->finalize = rgb_histogram_finalize;
-#line 914 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 958 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_type_class_add_private (klass, sizeof (RGBHistogramPrivate));
-#line 10782 "ColorTransformation.c"
+#line 11053 "ColorTransformation.c"
 }
 
 
@@ -10791,79 +11062,79 @@ static void rgb_histogram_instance_init (RGBHistogram * self) {
 	gint* _tmp0_ = NULL;
 	gint* _tmp1_ = NULL;
 	gint* _tmp2_ = NULL;
-#line 914 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 958 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv = RGB_HISTOGRAM_GET_PRIVATE (self);
-#line 922 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 966 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp0_ = g_new0 (gint, 256);
-#line 922 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 966 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv->red_counts = _tmp0_;
-#line 922 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 966 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv->red_counts_length1 = 256;
-#line 922 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 966 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv->_red_counts_size_ = self->priv->red_counts_length1;
-#line 923 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 967 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp1_ = g_new0 (gint, 256);
-#line 923 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 967 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv->green_counts = _tmp1_;
-#line 923 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 967 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv->green_counts_length1 = 256;
-#line 923 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 967 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv->_green_counts_size_ = self->priv->green_counts_length1;
-#line 924 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 968 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp2_ = g_new0 (gint, 256);
-#line 924 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 968 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv->blue_counts = _tmp2_;
-#line 924 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 968 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv->blue_counts_length1 = 256;
-#line 924 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 968 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv->_blue_counts_size_ = self->priv->blue_counts_length1;
-#line 925 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 969 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv->qualitative_red_counts = NULL;
-#line 925 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 969 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv->qualitative_red_counts_length1 = 0;
-#line 925 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 969 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv->_qualitative_red_counts_size_ = self->priv->qualitative_red_counts_length1;
-#line 926 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 970 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv->qualitative_green_counts = NULL;
-#line 926 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 970 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv->qualitative_green_counts_length1 = 0;
-#line 926 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 970 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv->_qualitative_green_counts_size_ = self->priv->qualitative_green_counts_length1;
-#line 927 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 971 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv->qualitative_blue_counts = NULL;
-#line 927 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 971 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv->qualitative_blue_counts_length1 = 0;
-#line 927 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 971 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv->_qualitative_blue_counts_size_ = self->priv->qualitative_blue_counts_length1;
-#line 928 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 972 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv->graphic = NULL;
-#line 914 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 958 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->ref_count = 1;
-#line 10838 "ColorTransformation.c"
+#line 11109 "ColorTransformation.c"
 }
 
 
 static void rgb_histogram_finalize (RGBHistogram* obj) {
 	RGBHistogram * self;
-#line 914 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 958 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_RGB_HISTOGRAM, RGBHistogram);
-#line 914 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 958 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_signal_handlers_destroy (self);
-#line 922 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 966 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv->red_counts = (g_free (self->priv->red_counts), NULL);
-#line 923 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 967 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv->green_counts = (g_free (self->priv->green_counts), NULL);
-#line 924 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 968 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv->blue_counts = (g_free (self->priv->blue_counts), NULL);
-#line 925 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 969 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv->qualitative_red_counts = (g_free (self->priv->qualitative_red_counts), NULL);
-#line 926 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 970 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv->qualitative_green_counts = (g_free (self->priv->qualitative_green_counts), NULL);
-#line 927 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 971 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv->qualitative_blue_counts = (g_free (self->priv->qualitative_blue_counts), NULL);
-#line 928 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 972 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_g_object_unref0 (self->priv->graphic);
-#line 10862 "ColorTransformation.c"
+#line 11133 "ColorTransformation.c"
 }
 
 
@@ -10884,24 +11155,24 @@ GType rgb_histogram_get_type (void) {
 gpointer rgb_histogram_ref (gpointer instance) {
 	RGBHistogram* self;
 	self = instance;
-#line 914 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 958 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_atomic_int_inc (&self->ref_count);
-#line 914 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 958 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return instance;
-#line 10887 "ColorTransformation.c"
+#line 11158 "ColorTransformation.c"
 }
 
 
 void rgb_histogram_unref (gpointer instance) {
 	RGBHistogram* self;
 	self = instance;
-#line 914 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 958 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 914 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 958 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		RGB_HISTOGRAM_GET_CLASS (self)->finalize (self);
-#line 914 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 958 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 10900 "ColorTransformation.c"
+#line 11171 "ColorTransformation.c"
 	}
 }
 
@@ -10936,63 +11207,63 @@ IntensityHistogram* intensity_histogram_construct (GType object_type, GdkPixbuf*
 	gint _tmp45_ = 0;
 	gint _tmp46_ = 0;
 	gfloat accumulator = 0.0F;
-#line 1176 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1220 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_return_val_if_fail (GDK_IS_PIXBUF (pixbuf), NULL);
-#line 1176 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1220 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self = (IntensityHistogram*) g_type_create_instance (object_type);
-#line 1177 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1221 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp0_ = pixbuf;
-#line 1177 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1221 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp1_ = gdk_pixbuf_get_n_channels (_tmp0_);
-#line 1177 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1221 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	n_channels = _tmp1_;
-#line 1178 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1222 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp2_ = pixbuf;
-#line 1178 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1222 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp3_ = gdk_pixbuf_get_rowstride (_tmp2_);
-#line 1178 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1222 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	rowstride = _tmp3_;
-#line 1179 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1223 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp4_ = pixbuf;
-#line 1179 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1223 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp5_ = gdk_pixbuf_get_width (_tmp4_);
-#line 1179 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1223 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	width = _tmp5_;
-#line 1180 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1224 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp6_ = pixbuf;
-#line 1180 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1224 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp7_ = gdk_pixbuf_get_height (_tmp6_);
-#line 1180 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1224 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	height = _tmp7_;
-#line 1181 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1225 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp8_ = n_channels;
-#line 1181 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1225 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp9_ = width;
-#line 1181 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1225 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	rowbytes = _tmp8_ * _tmp9_;
-#line 1182 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1226 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp10_ = pixbuf;
-#line 1182 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1226 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp11_ = gdk_pixbuf_get_pixels (_tmp10_);
-#line 1182 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1226 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	pixels = _tmp11_;
-#line 1182 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1226 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	pixels_length1 = -1;
-#line 1182 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1226 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_pixels_size_ = pixels_length1;
-#line 10979 "ColorTransformation.c"
+#line 11250 "ColorTransformation.c"
 	{
 		gint j = 0;
-#line 1183 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1227 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		j = 0;
-#line 10984 "ColorTransformation.c"
+#line 11255 "ColorTransformation.c"
 		{
 			gboolean _tmp12_ = FALSE;
-#line 1183 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1227 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp12_ = TRUE;
-#line 1183 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1227 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			while (TRUE) {
-#line 10991 "ColorTransformation.c"
+#line 11262 "ColorTransformation.c"
 				gint _tmp14_ = 0;
 				gint _tmp15_ = 0;
 				gint row_start_index = 0;
@@ -11001,56 +11272,56 @@ IntensityHistogram* intensity_histogram_construct (GType object_type, GdkPixbuf*
 				gint row_end_index = 0;
 				gint _tmp18_ = 0;
 				gint _tmp19_ = 0;
-#line 1183 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1227 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				if (!_tmp12_) {
-#line 11002 "ColorTransformation.c"
+#line 11273 "ColorTransformation.c"
 					gint _tmp13_ = 0;
-#line 1183 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1227 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp13_ = j;
-#line 1183 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1227 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					j = _tmp13_ + 1;
-#line 11008 "ColorTransformation.c"
+#line 11279 "ColorTransformation.c"
 				}
-#line 1183 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1227 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp12_ = FALSE;
-#line 1183 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1227 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp14_ = j;
-#line 1183 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1227 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp15_ = height;
-#line 1183 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1227 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				if (!(_tmp14_ < _tmp15_)) {
-#line 1183 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1227 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					break;
-#line 11020 "ColorTransformation.c"
+#line 11291 "ColorTransformation.c"
 				}
-#line 1184 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1228 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp16_ = j;
-#line 1184 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1228 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp17_ = rowstride;
-#line 1184 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1228 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				row_start_index = _tmp16_ * _tmp17_;
-#line 1185 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1229 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp18_ = row_start_index;
-#line 1185 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1229 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp19_ = rowbytes;
-#line 1185 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1229 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				row_end_index = _tmp18_ + _tmp19_;
-#line 11034 "ColorTransformation.c"
+#line 11305 "ColorTransformation.c"
 				{
 					gint i = 0;
 					gint _tmp20_ = 0;
-#line 1186 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1230 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp20_ = row_start_index;
-#line 1186 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1230 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					i = _tmp20_;
-#line 11042 "ColorTransformation.c"
+#line 11313 "ColorTransformation.c"
 					{
 						gboolean _tmp21_ = FALSE;
-#line 1186 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1230 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 						_tmp21_ = TRUE;
-#line 1186 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1230 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 						while (TRUE) {
-#line 11049 "ColorTransformation.c"
+#line 11320 "ColorTransformation.c"
 							gint _tmp24_ = 0;
 							gint _tmp25_ = 0;
 							RGBAnalyticPixel pix_rgb = {0};
@@ -11075,113 +11346,113 @@ IntensityHistogram* intensity_histogram_construct (GType object_type, GdkPixbuf*
 							gint _tmp38__length1 = 0;
 							gint _tmp39_ = 0;
 							gint _tmp40_ = 0;
-#line 1186 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1230 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							if (!_tmp21_) {
-#line 11076 "ColorTransformation.c"
+#line 11347 "ColorTransformation.c"
 								gint _tmp22_ = 0;
 								gint _tmp23_ = 0;
-#line 1186 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1230 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 								_tmp22_ = i;
-#line 1186 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1230 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 								_tmp23_ = n_channels;
-#line 1186 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1230 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 								i = _tmp22_ + _tmp23_;
-#line 11085 "ColorTransformation.c"
+#line 11356 "ColorTransformation.c"
 							}
-#line 1186 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1230 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp21_ = FALSE;
-#line 1186 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1230 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp24_ = i;
-#line 1186 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1230 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp25_ = row_end_index;
-#line 1186 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1230 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							if (!(_tmp24_ < _tmp25_)) {
-#line 1186 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1230 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 								break;
-#line 11097 "ColorTransformation.c"
+#line 11368 "ColorTransformation.c"
 							}
-#line 1187 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1231 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp26_ = pixels;
-#line 1187 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1231 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp26__length1 = pixels_length1;
-#line 1187 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1231 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp27_ = i;
-#line 1187 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1231 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp28_ = _tmp26_[_tmp27_];
-#line 1187 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1231 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp29_ = pixels;
-#line 1187 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1231 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp29__length1 = pixels_length1;
-#line 1187 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1231 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp30_ = i;
-#line 1187 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1231 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp31_ = _tmp29_[_tmp30_ + 1];
-#line 1187 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1231 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp32_ = pixels;
-#line 1187 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1231 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp32__length1 = pixels_length1;
-#line 1187 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1231 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp33_ = i;
-#line 1187 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1231 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp34_ = _tmp32_[_tmp33_ + 2];
-#line 1187 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1231 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							rgb_analytic_pixel_init_from_quantized_components (&pix_rgb, _tmp28_, _tmp31_, _tmp34_);
-#line 1189 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1233 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp35_ = pix_rgb;
-#line 1189 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1233 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							hsv_analytic_pixel_init_from_rgb (&pix_hsi, &_tmp35_);
-#line 1190 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1234 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp36_ = pix_hsi;
-#line 1190 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1234 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp37_ = _tmp36_.light_value;
-#line 1190 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1234 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							quantized_light_value = (gint) (_tmp37_ * 255.0f);
-#line 1191 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1235 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp38_ = self->priv->counts;
-#line 1191 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1235 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp38__length1 = self->priv->counts_length1;
-#line 1191 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1235 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp39_ = quantized_light_value;
-#line 1191 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1235 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp38_[_tmp39_] += 1;
-#line 1191 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1235 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 							_tmp40_ = _tmp38_[_tmp39_];
-#line 11145 "ColorTransformation.c"
+#line 11416 "ColorTransformation.c"
 						}
 					}
 				}
 			}
 		}
 	}
-#line 1195 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1239 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp41_ = pixbuf;
-#line 1195 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1239 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp42_ = gdk_pixbuf_get_width (_tmp41_);
-#line 1195 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1239 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp43_ = _tmp42_;
-#line 1195 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1239 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp44_ = pixbuf;
-#line 1195 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1239 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp45_ = gdk_pixbuf_get_height (_tmp44_);
-#line 1195 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1239 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp46_ = _tmp45_;
-#line 1195 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1239 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	pixel_count = (gfloat) (_tmp43_ * _tmp46_);
-#line 1196 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1240 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	accumulator = 0.0f;
-#line 11168 "ColorTransformation.c"
+#line 11439 "ColorTransformation.c"
 	{
 		gint i = 0;
-#line 1197 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1241 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		i = 0;
-#line 11173 "ColorTransformation.c"
+#line 11444 "ColorTransformation.c"
 		{
 			gboolean _tmp47_ = FALSE;
-#line 1197 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1241 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp47_ = TRUE;
-#line 1197 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1241 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			while (TRUE) {
-#line 11180 "ColorTransformation.c"
+#line 11451 "ColorTransformation.c"
 				gint _tmp49_ = 0;
 				gfloat* _tmp50_ = NULL;
 				gint _tmp50__length1 = 0;
@@ -11202,84 +11473,84 @@ IntensityHistogram* intensity_histogram_construct (GType object_type, GdkPixbuf*
 				gint _tmp62_ = 0;
 				gfloat _tmp63_ = 0.0F;
 				gfloat _tmp64_ = 0.0F;
-#line 1197 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1241 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				if (!_tmp47_) {
-#line 11203 "ColorTransformation.c"
+#line 11474 "ColorTransformation.c"
 					gint _tmp48_ = 0;
-#line 1197 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1241 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp48_ = i;
-#line 1197 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1241 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					i = _tmp48_ + 1;
-#line 11209 "ColorTransformation.c"
+#line 11480 "ColorTransformation.c"
 				}
-#line 1197 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1241 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp47_ = FALSE;
-#line 1197 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1241 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp49_ = i;
-#line 1197 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1241 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				if (!(_tmp49_ < 256)) {
-#line 1197 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1241 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					break;
-#line 11219 "ColorTransformation.c"
+#line 11490 "ColorTransformation.c"
 				}
-#line 1198 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1242 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp50_ = self->priv->probabilities;
-#line 1198 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1242 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp50__length1 = self->priv->probabilities_length1;
-#line 1198 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1242 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp51_ = i;
-#line 1198 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1242 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp52_ = self->priv->counts;
-#line 1198 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1242 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp52__length1 = self->priv->counts_length1;
-#line 1198 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1242 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp53_ = i;
-#line 1198 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1242 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp54_ = _tmp52_[_tmp53_];
-#line 1198 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1242 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp55_ = pixel_count;
-#line 1198 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1242 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp50_[_tmp51_] = ((gfloat) _tmp54_) / _tmp55_;
-#line 1198 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1242 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp56_ = _tmp50_[_tmp51_];
-#line 1199 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1243 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp57_ = accumulator;
-#line 1199 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1243 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp58_ = self->priv->probabilities;
-#line 1199 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1243 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp58__length1 = self->priv->probabilities_length1;
-#line 1199 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1243 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp59_ = i;
-#line 1199 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1243 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp60_ = _tmp58_[_tmp59_];
-#line 1199 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1243 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				accumulator = _tmp57_ + _tmp60_;
-#line 1200 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1244 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp61_ = self->priv->cumulative_probabilities;
-#line 1200 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1244 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp61__length1 = self->priv->cumulative_probabilities_length1;
-#line 1200 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1244 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp62_ = i;
-#line 1200 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1244 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp63_ = accumulator;
-#line 1200 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1244 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp61_[_tmp62_] = _tmp63_;
-#line 1200 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1244 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp64_ = _tmp61_[_tmp62_];
-#line 11265 "ColorTransformation.c"
+#line 11536 "ColorTransformation.c"
 			}
 		}
 	}
-#line 1176 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1220 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return self;
-#line 11271 "ColorTransformation.c"
+#line 11542 "ColorTransformation.c"
 }
 
 
 IntensityHistogram* intensity_histogram_new (GdkPixbuf* pixbuf) {
-#line 1176 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1220 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return intensity_histogram_construct (TYPE_INTENSITY_HISTOGRAM, pixbuf);
-#line 11278 "ColorTransformation.c"
+#line 11549 "ColorTransformation.c"
 }
 
 
@@ -11291,218 +11562,218 @@ gfloat intensity_histogram_get_cumulative_probability (IntensityHistogram* self,
 	gint _tmp2__length1 = 0;
 	gint _tmp3_ = 0;
 	gfloat _tmp4_ = 0.0F;
-#line 1204 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1248 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_return_val_if_fail (IS_INTENSITY_HISTOGRAM (self), 0.0F);
-#line 1206 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1250 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp0_ = level;
-#line 1206 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1250 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp1_ = CLAMP (_tmp0_, 0, 255);
-#line 1206 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1250 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	level = _tmp1_;
-#line 1207 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1251 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp2_ = self->priv->cumulative_probabilities;
-#line 1207 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1251 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp2__length1 = self->priv->cumulative_probabilities_length1;
-#line 1207 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1251 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp3_ = level;
-#line 1207 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1251 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp4_ = _tmp2_[_tmp3_];
-#line 1207 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1251 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	result = _tmp4_;
-#line 1207 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1251 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return result;
-#line 11310 "ColorTransformation.c"
+#line 11581 "ColorTransformation.c"
 }
 
 
 static void value_intensity_histogram_init (GValue* value) {
-#line 1171 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1215 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	value->data[0].v_pointer = NULL;
-#line 11317 "ColorTransformation.c"
+#line 11588 "ColorTransformation.c"
 }
 
 
 static void value_intensity_histogram_free_value (GValue* value) {
-#line 1171 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1215 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (value->data[0].v_pointer) {
-#line 1171 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1215 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		intensity_histogram_unref (value->data[0].v_pointer);
-#line 11326 "ColorTransformation.c"
+#line 11597 "ColorTransformation.c"
 	}
 }
 
 
 static void value_intensity_histogram_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 1171 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1215 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (src_value->data[0].v_pointer) {
-#line 1171 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1215 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		dest_value->data[0].v_pointer = intensity_histogram_ref (src_value->data[0].v_pointer);
-#line 11336 "ColorTransformation.c"
+#line 11607 "ColorTransformation.c"
 	} else {
-#line 1171 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1215 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 11340 "ColorTransformation.c"
+#line 11611 "ColorTransformation.c"
 	}
 }
 
 
 static gpointer value_intensity_histogram_peek_pointer (const GValue* value) {
-#line 1171 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1215 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return value->data[0].v_pointer;
-#line 11348 "ColorTransformation.c"
+#line 11619 "ColorTransformation.c"
 }
 
 
 static gchar* value_intensity_histogram_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 1171 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1215 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (collect_values[0].v_pointer) {
-#line 11355 "ColorTransformation.c"
+#line 11626 "ColorTransformation.c"
 		IntensityHistogram* object;
 		object = collect_values[0].v_pointer;
-#line 1171 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1215 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		if (object->parent_instance.g_class == NULL) {
-#line 1171 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1215 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 11362 "ColorTransformation.c"
+#line 11633 "ColorTransformation.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 1171 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1215 "/home/jens/Source/shotwell/src/ColorTransformation.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 11366 "ColorTransformation.c"
+#line 11637 "ColorTransformation.c"
 		}
-#line 1171 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1215 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		value->data[0].v_pointer = intensity_histogram_ref (object);
-#line 11370 "ColorTransformation.c"
+#line 11641 "ColorTransformation.c"
 	} else {
-#line 1171 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1215 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		value->data[0].v_pointer = NULL;
-#line 11374 "ColorTransformation.c"
+#line 11645 "ColorTransformation.c"
 	}
-#line 1171 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1215 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return NULL;
-#line 11378 "ColorTransformation.c"
+#line 11649 "ColorTransformation.c"
 }
 
 
 static gchar* value_intensity_histogram_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 	IntensityHistogram** object_p;
 	object_p = collect_values[0].v_pointer;
-#line 1171 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1215 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (!object_p) {
-#line 1171 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1215 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 11389 "ColorTransformation.c"
+#line 11660 "ColorTransformation.c"
 	}
-#line 1171 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1215 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (!value->data[0].v_pointer) {
-#line 1171 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1215 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		*object_p = NULL;
-#line 11395 "ColorTransformation.c"
+#line 11666 "ColorTransformation.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 1171 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1215 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		*object_p = value->data[0].v_pointer;
-#line 11399 "ColorTransformation.c"
+#line 11670 "ColorTransformation.c"
 	} else {
-#line 1171 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1215 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		*object_p = intensity_histogram_ref (value->data[0].v_pointer);
-#line 11403 "ColorTransformation.c"
+#line 11674 "ColorTransformation.c"
 	}
-#line 1171 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1215 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return NULL;
-#line 11407 "ColorTransformation.c"
+#line 11678 "ColorTransformation.c"
 }
 
 
 GParamSpec* param_spec_intensity_histogram (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
 	ParamSpecIntensityHistogram* spec;
-#line 1171 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1215 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, TYPE_INTENSITY_HISTOGRAM), NULL);
-#line 1171 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1215 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 1171 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1215 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 1171 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1215 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return G_PARAM_SPEC (spec);
-#line 11421 "ColorTransformation.c"
+#line 11692 "ColorTransformation.c"
 }
 
 
 gpointer value_get_intensity_histogram (const GValue* value) {
-#line 1171 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1215 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_INTENSITY_HISTOGRAM), NULL);
-#line 1171 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1215 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return value->data[0].v_pointer;
-#line 11430 "ColorTransformation.c"
+#line 11701 "ColorTransformation.c"
 }
 
 
 void value_set_intensity_histogram (GValue* value, gpointer v_object) {
 	IntensityHistogram* old;
-#line 1171 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1215 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_INTENSITY_HISTOGRAM));
-#line 1171 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1215 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	old = value->data[0].v_pointer;
-#line 1171 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1215 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (v_object) {
-#line 1171 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1215 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_INTENSITY_HISTOGRAM));
-#line 1171 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1215 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 1171 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1215 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		value->data[0].v_pointer = v_object;
-#line 1171 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1215 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		intensity_histogram_ref (value->data[0].v_pointer);
-#line 11450 "ColorTransformation.c"
+#line 11721 "ColorTransformation.c"
 	} else {
-#line 1171 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1215 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		value->data[0].v_pointer = NULL;
-#line 11454 "ColorTransformation.c"
+#line 11725 "ColorTransformation.c"
 	}
-#line 1171 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1215 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (old) {
-#line 1171 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1215 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		intensity_histogram_unref (old);
-#line 11460 "ColorTransformation.c"
+#line 11731 "ColorTransformation.c"
 	}
 }
 
 
 void value_take_intensity_histogram (GValue* value, gpointer v_object) {
 	IntensityHistogram* old;
-#line 1171 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1215 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_INTENSITY_HISTOGRAM));
-#line 1171 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1215 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	old = value->data[0].v_pointer;
-#line 1171 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1215 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (v_object) {
-#line 1171 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1215 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_INTENSITY_HISTOGRAM));
-#line 1171 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1215 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 1171 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1215 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		value->data[0].v_pointer = v_object;
-#line 11479 "ColorTransformation.c"
+#line 11750 "ColorTransformation.c"
 	} else {
-#line 1171 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1215 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		value->data[0].v_pointer = NULL;
-#line 11483 "ColorTransformation.c"
+#line 11754 "ColorTransformation.c"
 	}
-#line 1171 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1215 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (old) {
-#line 1171 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1215 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		intensity_histogram_unref (old);
-#line 11489 "ColorTransformation.c"
+#line 11760 "ColorTransformation.c"
 	}
 }
 
 
 static void intensity_histogram_class_init (IntensityHistogramClass * klass) {
-#line 1171 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1215 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	intensity_histogram_parent_class = g_type_class_peek_parent (klass);
-#line 1171 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1215 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	((IntensityHistogramClass *) klass)->finalize = intensity_histogram_finalize;
-#line 1171 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1215 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_type_class_add_private (klass, sizeof (IntensityHistogramPrivate));
-#line 11501 "ColorTransformation.c"
+#line 11772 "ColorTransformation.c"
 }
 
 
@@ -11510,51 +11781,51 @@ static void intensity_histogram_instance_init (IntensityHistogram * self) {
 	gint* _tmp0_ = NULL;
 	gfloat* _tmp1_ = NULL;
 	gfloat* _tmp2_ = NULL;
-#line 1171 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1215 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv = INTENSITY_HISTOGRAM_GET_PRIVATE (self);
-#line 1172 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1216 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp0_ = g_new0 (gint, 256);
-#line 1172 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1216 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv->counts = _tmp0_;
-#line 1172 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1216 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv->counts_length1 = 256;
-#line 1172 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1216 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv->_counts_size_ = self->priv->counts_length1;
-#line 1173 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1217 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp1_ = g_new0 (gfloat, 256);
-#line 1173 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1217 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv->probabilities = _tmp1_;
-#line 1173 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1217 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv->probabilities_length1 = 256;
-#line 1173 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1217 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv->_probabilities_size_ = self->priv->probabilities_length1;
-#line 1174 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1218 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp2_ = g_new0 (gfloat, 256);
-#line 1174 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1218 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv->cumulative_probabilities = _tmp2_;
-#line 1174 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1218 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv->cumulative_probabilities_length1 = 256;
-#line 1174 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1218 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv->_cumulative_probabilities_size_ = self->priv->cumulative_probabilities_length1;
-#line 1171 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1215 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->ref_count = 1;
-#line 11537 "ColorTransformation.c"
+#line 11808 "ColorTransformation.c"
 }
 
 
 static void intensity_histogram_finalize (IntensityHistogram* obj) {
 	IntensityHistogram * self;
-#line 1171 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1215 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_INTENSITY_HISTOGRAM, IntensityHistogram);
-#line 1171 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1215 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_signal_handlers_destroy (self);
-#line 1172 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1216 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv->counts = (g_free (self->priv->counts), NULL);
-#line 1173 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1217 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv->probabilities = (g_free (self->priv->probabilities), NULL);
-#line 1174 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1218 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv->cumulative_probabilities = (g_free (self->priv->cumulative_probabilities), NULL);
-#line 11553 "ColorTransformation.c"
+#line 11824 "ColorTransformation.c"
 }
 
 
@@ -11575,24 +11846,24 @@ GType intensity_histogram_get_type (void) {
 gpointer intensity_histogram_ref (gpointer instance) {
 	IntensityHistogram* self;
 	self = instance;
-#line 1171 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1215 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_atomic_int_inc (&self->ref_count);
-#line 1171 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1215 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return instance;
-#line 11578 "ColorTransformation.c"
+#line 11849 "ColorTransformation.c"
 }
 
 
 void intensity_histogram_unref (gpointer instance) {
 	IntensityHistogram* self;
 	self = instance;
-#line 1171 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1215 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 1171 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1215 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		INTENSITY_HISTOGRAM_GET_CLASS (self)->finalize (self);
-#line 1171 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1215 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 11591 "ColorTransformation.c"
+#line 11862 "ColorTransformation.c"
 	}
 }
 
@@ -11602,111 +11873,111 @@ ExpansionTransformation* expansion_transformation_construct (GType object_type,
 	gfloat* _tmp0_ = NULL;
 	gfloat LOW_KINK_MASS = 0.0F;
 	gfloat HIGH_KINK_MASS = 0.0F;
-#line 1219 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1263 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_return_val_if_fail (IS_INTENSITY_HISTOGRAM (histogram), NULL);
-#line 1220 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1264 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self = (ExpansionTransformation*) hsv_transformation_construct (object_type, PIXEL_TRANSFORMATION_TYPE_TONE_EXPANSION);
-#line 1222 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1266 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp0_ = g_new0 (gfloat, 256);
-#line 1222 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1266 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv->remap_table = (g_free (self->priv->remap_table), NULL);
-#line 1222 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1266 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv->remap_table = _tmp0_;
-#line 1222 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1266 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv->remap_table_length1 = 256;
-#line 1222 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1266 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv->_remap_table_size_ = self->priv->remap_table_length1;
-#line 1224 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1268 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	LOW_KINK_MASS = EXPANSION_TRANSFORMATION_LOW_DISCARD_MASS;
-#line 1225 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1269 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv->low_kink = 0;
-#line 1226 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1270 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	while (TRUE) {
-#line 11621 "ColorTransformation.c"
+#line 11892 "ColorTransformation.c"
 		IntensityHistogram* _tmp1_ = NULL;
 		gint _tmp2_ = 0;
 		gfloat _tmp3_ = 0.0F;
 		gfloat _tmp4_ = 0.0F;
 		gint _tmp5_ = 0;
-#line 1226 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1270 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp1_ = histogram;
-#line 1226 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1270 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp2_ = self->priv->low_kink;
-#line 1226 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1270 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp3_ = intensity_histogram_get_cumulative_probability (_tmp1_, _tmp2_);
-#line 1226 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1270 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp4_ = LOW_KINK_MASS;
-#line 1226 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1270 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		if (!(_tmp3_ < _tmp4_)) {
-#line 1226 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1270 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			break;
-#line 11639 "ColorTransformation.c"
+#line 11910 "ColorTransformation.c"
 		}
-#line 1227 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1271 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp5_ = self->priv->low_kink;
-#line 1227 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1271 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		self->priv->low_kink = _tmp5_ + 1;
-#line 11645 "ColorTransformation.c"
+#line 11916 "ColorTransformation.c"
 	}
-#line 1229 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1273 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	HIGH_KINK_MASS = 1.0f - EXPANSION_TRANSFORMATION_HIGH_DISCARD_MASS;
-#line 1230 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1274 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv->high_kink = 255;
-#line 1231 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1275 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	while (TRUE) {
-#line 11653 "ColorTransformation.c"
+#line 11924 "ColorTransformation.c"
 		gboolean _tmp6_ = FALSE;
 		IntensityHistogram* _tmp7_ = NULL;
 		gint _tmp8_ = 0;
 		gfloat _tmp9_ = 0.0F;
 		gfloat _tmp10_ = 0.0F;
 		gint _tmp12_ = 0;
-#line 1231 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1275 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp7_ = histogram;
-#line 1231 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1275 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp8_ = self->priv->high_kink;
-#line 1231 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1275 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp9_ = intensity_histogram_get_cumulative_probability (_tmp7_, _tmp8_);
-#line 1231 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1275 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp10_ = HIGH_KINK_MASS;
-#line 1231 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1275 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		if (_tmp9_ > _tmp10_) {
-#line 11670 "ColorTransformation.c"
+#line 11941 "ColorTransformation.c"
 			gint _tmp11_ = 0;
-#line 1231 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1275 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp11_ = self->priv->high_kink;
-#line 1231 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1275 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp6_ = _tmp11_ > 0;
-#line 11676 "ColorTransformation.c"
+#line 11947 "ColorTransformation.c"
 		} else {
-#line 1231 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1275 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp6_ = FALSE;
-#line 11680 "ColorTransformation.c"
+#line 11951 "ColorTransformation.c"
 		}
-#line 1231 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1275 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		if (!_tmp6_) {
-#line 1231 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1275 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			break;
-#line 11686 "ColorTransformation.c"
+#line 11957 "ColorTransformation.c"
 		}
-#line 1232 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1276 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp12_ = self->priv->high_kink;
-#line 1232 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1276 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		self->priv->high_kink = _tmp12_ - 1;
-#line 11692 "ColorTransformation.c"
+#line 11963 "ColorTransformation.c"
 	}
-#line 1234 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1278 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	expansion_transformation_build_remap_table (self);
-#line 1219 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1263 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return self;
-#line 11698 "ColorTransformation.c"
+#line 11969 "ColorTransformation.c"
 }
 
 
 ExpansionTransformation* expansion_transformation_new (IntensityHistogram* histogram) {
-#line 1219 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1263 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return expansion_transformation_construct (TYPE_EXPANSION_TRANSFORMATION, histogram);
-#line 11705 "ColorTransformation.c"
+#line 11976 "ColorTransformation.c"
 }
 
 
@@ -11720,74 +11991,74 @@ ExpansionTransformation* expansion_transformation_construct_from_extrema (GType
 	gint _tmp5_ = 0;
 	gint _tmp9_ = 0;
 	gint _tmp10_ = 0;
-#line 1238 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1282 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self = (ExpansionTransformation*) hsv_transformation_construct (object_type, PIXEL_TRANSFORMATION_TYPE_TONE_EXPANSION);
-#line 1240 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1284 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp0_ = white_point;
-#line 1240 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1284 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp1_ = CLAMP (_tmp0_, 0, 255);
-#line 1240 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1284 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	white_point = _tmp1_;
-#line 1241 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1285 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp2_ = black_point;
-#line 1241 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1285 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp3_ = CLAMP (_tmp2_, 0, 255);
-#line 1241 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1285 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	black_point = _tmp3_;
-#line 1243 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1287 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp4_ = black_point;
-#line 1243 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1287 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp5_ = white_point;
-#line 1243 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1287 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (_tmp4_ == _tmp5_) {
-#line 11739 "ColorTransformation.c"
+#line 12010 "ColorTransformation.c"
 		gint _tmp6_ = 0;
-#line 1244 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1288 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp6_ = black_point;
-#line 1244 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1288 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		if (_tmp6_ == 0) {
-#line 1245 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1289 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			white_point = 1;
-#line 11747 "ColorTransformation.c"
+#line 12018 "ColorTransformation.c"
 		} else {
 			gint _tmp7_ = 0;
-#line 1246 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1290 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp7_ = white_point;
-#line 1246 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1290 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			if (_tmp7_ == 255) {
-#line 1247 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1291 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				black_point = 254;
-#line 11756 "ColorTransformation.c"
+#line 12027 "ColorTransformation.c"
 			} else {
 				gint _tmp8_ = 0;
-#line 1249 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1293 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp8_ = white_point;
-#line 1249 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1293 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				black_point = _tmp8_ - 1;
-#line 11763 "ColorTransformation.c"
+#line 12034 "ColorTransformation.c"
 			}
 		}
 	}
-#line 1252 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1296 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp9_ = black_point;
-#line 1252 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1296 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv->low_kink = _tmp9_;
-#line 1253 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1297 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp10_ = white_point;
-#line 1253 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1297 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv->high_kink = _tmp10_;
-#line 1255 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1299 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	expansion_transformation_build_remap_table (self);
-#line 1237 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1281 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return self;
-#line 11779 "ColorTransformation.c"
+#line 12050 "ColorTransformation.c"
 }
 
 
 ExpansionTransformation* expansion_transformation_new_from_extrema (gint black_point, gint white_point) {
-#line 1237 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1281 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return expansion_transformation_construct_from_extrema (TYPE_EXPANSION_TRANSFORMATION, black_point, white_point);
-#line 11786 "ColorTransformation.c"
+#line 12057 "ColorTransformation.c"
 }
 
 
@@ -11810,7 +12081,7 @@ static gchar* string_chug (const gchar* self) {
 	result = _result_;
 #line 1202 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
-#line 11809 "ColorTransformation.c"
+#line 12080 "ColorTransformation.c"
 }
 
 
@@ -11833,7 +12104,7 @@ static gchar* string_chomp (const gchar* self) {
 	result = _result_;
 #line 1194 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
-#line 11832 "ColorTransformation.c"
+#line 12103 "ColorTransformation.c"
 }
 
 
@@ -11849,50 +12120,50 @@ ExpansionTransformation* expansion_transformation_construct_from_string (GType o
 	gint num_captured = 0;
 	const gchar* _tmp7_ = NULL;
 	gint _tmp8_ = 0;
-#line 1258 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1302 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_return_val_if_fail (encoded_transformation != NULL, NULL);
-#line 1259 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1303 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self = (ExpansionTransformation*) hsv_transformation_construct (object_type, PIXEL_TRANSFORMATION_TYPE_TONE_EXPANSION);
-#line 1261 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1305 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp0_ = encoded_transformation;
-#line 1261 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1305 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_strcanon (_tmp0_, "0123456789. ", ' ');
-#line 1262 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1306 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp1_ = encoded_transformation;
-#line 1262 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1306 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp2_ = string_chug (_tmp1_);
-#line 1262 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1306 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp3_ = _tmp2_;
-#line 1262 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1306 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_g_free0 (_tmp3_);
-#line 1263 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1307 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp4_ = encoded_transformation;
-#line 1263 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1307 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp5_ = string_chomp (_tmp4_);
-#line 1263 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1307 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp6_ = _tmp5_;
-#line 1263 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1307 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_g_free0 (_tmp6_);
-#line 1265 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1309 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp7_ = encoded_transformation;
-#line 1265 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1309 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp8_ = sscanf (_tmp7_, "%d %d", &self->priv->low_kink, &self->priv->high_kink);
-#line 1265 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1309 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	num_captured = _tmp8_;
-#line 1268 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1312 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_vala_assert (num_captured == 2, "num_captured == 2");
-#line 1270 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1314 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	expansion_transformation_build_remap_table (self);
-#line 1258 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1302 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return self;
-#line 11884 "ColorTransformation.c"
+#line 12155 "ColorTransformation.c"
 }
 
 
 ExpansionTransformation* expansion_transformation_new_from_string (const gchar* encoded_transformation) {
-#line 1258 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1302 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return expansion_transformation_construct_from_string (TYPE_EXPANSION_TRANSFORMATION, encoded_transformation);
-#line 11891 "ColorTransformation.c"
+#line 12162 "ColorTransformation.c"
 }
 
 
@@ -11911,108 +12182,108 @@ static void expansion_transformation_build_remap_table (ExpansionTransformation*
 	gfloat _tmp7_ = 0.0F;
 	gfloat _tmp8_ = 0.0F;
 	gint i = 0;
-#line 1273 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1317 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_return_if_fail (IS_EXPANSION_TRANSFORMATION (self));
-#line 1274 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1318 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp0_ = self->priv->remap_table;
-#line 1274 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1318 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp0__length1 = self->priv->remap_table_length1;
-#line 1274 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1318 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (_tmp0_ == NULL) {
-#line 11918 "ColorTransformation.c"
+#line 12189 "ColorTransformation.c"
 		gfloat* _tmp1_ = NULL;
-#line 1275 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1319 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp1_ = g_new0 (gfloat, 256);
-#line 1275 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1319 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		self->priv->remap_table = (g_free (self->priv->remap_table), NULL);
-#line 1275 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1319 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		self->priv->remap_table = _tmp1_;
-#line 1275 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1319 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		self->priv->remap_table_length1 = 256;
-#line 1275 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1319 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		self->priv->_remap_table_size_ = self->priv->remap_table_length1;
-#line 11930 "ColorTransformation.c"
+#line 12201 "ColorTransformation.c"
 	}
-#line 1277 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1321 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp2_ = self->priv->low_kink;
-#line 1277 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1321 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	low_kink_f = ((gfloat) _tmp2_) / 255.0f;
-#line 1278 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1322 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp3_ = self->priv->high_kink;
-#line 1278 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1322 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	high_kink_f = ((gfloat) _tmp3_) / 255.0f;
-#line 1280 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1324 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp4_ = high_kink_f;
-#line 1280 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1324 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp5_ = low_kink_f;
-#line 1280 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1324 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	slope = 1.0f / (_tmp4_ - _tmp5_);
-#line 1281 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1325 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp6_ = low_kink_f;
-#line 1281 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1325 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp7_ = high_kink_f;
-#line 1281 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1325 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp8_ = low_kink_f;
-#line 1281 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1325 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	intercept = -(_tmp6_ / (_tmp7_ - _tmp8_));
-#line 1283 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1327 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	i = 0;
-#line 11956 "ColorTransformation.c"
+#line 12227 "ColorTransformation.c"
 	{
 		gboolean _tmp9_ = FALSE;
-#line 1284 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1328 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp9_ = TRUE;
-#line 1284 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1328 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		while (TRUE) {
-#line 11963 "ColorTransformation.c"
+#line 12234 "ColorTransformation.c"
 			gint _tmp11_ = 0;
 			gint _tmp12_ = 0;
 			gfloat* _tmp13_ = NULL;
 			gint _tmp13__length1 = 0;
 			gint _tmp14_ = 0;
 			gfloat _tmp15_ = 0.0F;
-#line 1284 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1328 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			if (!_tmp9_) {
-#line 11972 "ColorTransformation.c"
+#line 12243 "ColorTransformation.c"
 				gint _tmp10_ = 0;
-#line 1284 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1328 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp10_ = i;
-#line 1284 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1328 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				i = _tmp10_ + 1;
-#line 11978 "ColorTransformation.c"
+#line 12249 "ColorTransformation.c"
 			}
-#line 1284 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1328 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp9_ = FALSE;
-#line 1284 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1328 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp11_ = i;
-#line 1284 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1328 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp12_ = self->priv->low_kink;
-#line 1284 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1328 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			if (!(_tmp11_ <= _tmp12_)) {
-#line 1284 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1328 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				break;
-#line 11990 "ColorTransformation.c"
+#line 12261 "ColorTransformation.c"
 			}
-#line 1285 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1329 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp13_ = self->priv->remap_table;
-#line 1285 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1329 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp13__length1 = self->priv->remap_table_length1;
-#line 1285 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1329 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp14_ = i;
-#line 1285 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1329 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp13_[_tmp14_] = 0.0f;
-#line 1285 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1329 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp15_ = _tmp13_[_tmp14_];
-#line 12002 "ColorTransformation.c"
+#line 12273 "ColorTransformation.c"
 		}
 	}
 	{
 		gboolean _tmp16_ = FALSE;
-#line 1287 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1331 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp16_ = TRUE;
-#line 1287 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1331 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		while (TRUE) {
-#line 12011 "ColorTransformation.c"
+#line 12282 "ColorTransformation.c"
 			gint _tmp18_ = 0;
 			gint _tmp19_ = 0;
 			gfloat* _tmp20_ = NULL;
@@ -12022,90 +12293,90 @@ static void expansion_transformation_build_remap_table (ExpansionTransformation*
 			gint _tmp23_ = 0;
 			gfloat _tmp24_ = 0.0F;
 			gfloat _tmp25_ = 0.0F;
-#line 1287 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1331 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			if (!_tmp16_) {
-#line 12023 "ColorTransformation.c"
+#line 12294 "ColorTransformation.c"
 				gint _tmp17_ = 0;
-#line 1287 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1331 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp17_ = i;
-#line 1287 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1331 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				i = _tmp17_ + 1;
-#line 12029 "ColorTransformation.c"
+#line 12300 "ColorTransformation.c"
 			}
-#line 1287 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1331 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp16_ = FALSE;
-#line 1287 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1331 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp18_ = i;
-#line 1287 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1331 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp19_ = self->priv->high_kink;
-#line 1287 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1331 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			if (!(_tmp18_ < _tmp19_)) {
-#line 1287 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1331 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				break;
-#line 12041 "ColorTransformation.c"
+#line 12312 "ColorTransformation.c"
 			}
-#line 1288 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1332 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp20_ = self->priv->remap_table;
-#line 1288 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1332 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp20__length1 = self->priv->remap_table_length1;
-#line 1288 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1332 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp21_ = i;
-#line 1288 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1332 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp22_ = slope;
-#line 1288 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1332 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp23_ = i;
-#line 1288 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1332 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp24_ = intercept;
-#line 1288 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1332 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp20_[_tmp21_] = (_tmp22_ * (((gfloat) _tmp23_) / 255.0f)) + _tmp24_;
-#line 1288 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1332 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp25_ = _tmp20_[_tmp21_];
-#line 12059 "ColorTransformation.c"
+#line 12330 "ColorTransformation.c"
 		}
 	}
 	{
 		gboolean _tmp26_ = FALSE;
-#line 1290 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1334 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp26_ = TRUE;
-#line 1290 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1334 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		while (TRUE) {
-#line 12068 "ColorTransformation.c"
+#line 12339 "ColorTransformation.c"
 			gint _tmp28_ = 0;
 			gfloat* _tmp29_ = NULL;
 			gint _tmp29__length1 = 0;
 			gint _tmp30_ = 0;
 			gfloat _tmp31_ = 0.0F;
-#line 1290 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1334 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			if (!_tmp26_) {
-#line 12076 "ColorTransformation.c"
+#line 12347 "ColorTransformation.c"
 				gint _tmp27_ = 0;
-#line 1290 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1334 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp27_ = i;
-#line 1290 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1334 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				i = _tmp27_ + 1;
-#line 12082 "ColorTransformation.c"
+#line 12353 "ColorTransformation.c"
 			}
-#line 1290 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1334 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp26_ = FALSE;
-#line 1290 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1334 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp28_ = i;
-#line 1290 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1334 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			if (!(_tmp28_ < 256)) {
-#line 1290 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1334 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				break;
-#line 12092 "ColorTransformation.c"
+#line 12363 "ColorTransformation.c"
 			}
-#line 1291 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1335 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp29_ = self->priv->remap_table;
-#line 1291 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1335 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp29__length1 = self->priv->remap_table_length1;
-#line 1291 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1335 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp30_ = i;
-#line 1291 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1335 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp29_[_tmp30_] = 1.0f;
-#line 1291 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1335 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp31_ = _tmp29_[_tmp30_];
-#line 12104 "ColorTransformation.c"
+#line 12375 "ColorTransformation.c"
 		}
 	}
 }
@@ -12124,41 +12395,41 @@ static void expansion_transformation_real_transform_pixel_hsv (PixelTransformati
 	HSVAnalyticPixel _tmp5_ = {0};
 	gfloat _tmp6_ = 0.0F;
 	gfloat _tmp7_ = 0.0F;
-#line 1294 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1338 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EXPANSION_TRANSFORMATION, ExpansionTransformation);
-#line 1294 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1338 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_return_if_fail (pixel != NULL);
-#line 1295 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1339 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp0_ = *pixel;
-#line 1295 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1339 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp1_ = _tmp0_.light_value;
-#line 1295 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1339 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	remap_index = (gint) (_tmp1_ * 255.0f);
-#line 1297 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1341 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp2_ = *pixel;
-#line 1297 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1341 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_result_ = _tmp2_;
-#line 1298 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1342 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp3_ = self->priv->remap_table;
-#line 1298 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1342 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp3__length1 = self->priv->remap_table_length1;
-#line 1298 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1342 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp4_ = _tmp3_[remap_index];
-#line 1298 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1342 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_result_.light_value = _tmp4_;
-#line 1300 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1344 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp5_ = _result_;
-#line 1300 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1344 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp6_ = _tmp5_.light_value;
-#line 1300 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1344 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp7_ = CLAMP (_tmp6_, 0.0f, 1.0f);
-#line 1300 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1344 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_result_.light_value = _tmp7_;
-#line 1302 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1346 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	*result = _result_;
-#line 1302 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1346 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return;
-#line 12157 "ColorTransformation.c"
+#line 12428 "ColorTransformation.c"
 }
 
 
@@ -12168,49 +12439,49 @@ static gchar* expansion_transformation_real_to_string (PixelTransformation* base
 	gint _tmp0_ = 0;
 	gint _tmp1_ = 0;
 	gchar* _tmp2_ = NULL;
-#line 1305 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1349 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EXPANSION_TRANSFORMATION, ExpansionTransformation);
-#line 1306 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1350 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp0_ = self->priv->low_kink;
-#line 1306 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1350 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp1_ = self->priv->high_kink;
-#line 1306 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1350 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp2_ = g_strdup_printf ("{ %d, %d }", _tmp0_, _tmp1_);
-#line 1306 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1350 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	result = _tmp2_;
-#line 1306 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1350 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return result;
-#line 12179 "ColorTransformation.c"
+#line 12450 "ColorTransformation.c"
 }
 
 
 gint expansion_transformation_get_white_point (ExpansionTransformation* self) {
 	gint result = 0;
 	gint _tmp0_ = 0;
-#line 1309 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1353 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_return_val_if_fail (IS_EXPANSION_TRANSFORMATION (self), 0);
-#line 1310 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1354 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp0_ = self->priv->high_kink;
-#line 1310 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1354 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	result = _tmp0_;
-#line 1310 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1354 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return result;
-#line 12194 "ColorTransformation.c"
+#line 12465 "ColorTransformation.c"
 }
 
 
 gint expansion_transformation_get_black_point (ExpansionTransformation* self) {
 	gint result = 0;
 	gint _tmp0_ = 0;
-#line 1313 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1357 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_return_val_if_fail (IS_EXPANSION_TRANSFORMATION (self), 0);
-#line 1314 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1358 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp0_ = self->priv->low_kink;
-#line 1314 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1358 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	result = _tmp0_;
-#line 1314 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1358 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return result;
-#line 12209 "ColorTransformation.c"
+#line 12480 "ColorTransformation.c"
 }
 
 
@@ -12219,29 +12490,29 @@ static gboolean expansion_transformation_real_is_identity (PixelTransformation*
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
 	gint _tmp1_ = 0;
-#line 1317 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1361 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EXPANSION_TRANSFORMATION, ExpansionTransformation);
-#line 1318 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1362 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp1_ = self->priv->low_kink;
-#line 1318 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1362 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (_tmp1_ == 0) {
-#line 12224 "ColorTransformation.c"
+#line 12495 "ColorTransformation.c"
 		gint _tmp2_ = 0;
-#line 1318 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1362 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp2_ = self->priv->high_kink;
-#line 1318 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1362 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp0_ = _tmp2_ == 255;
-#line 12230 "ColorTransformation.c"
+#line 12501 "ColorTransformation.c"
 	} else {
-#line 1318 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1362 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp0_ = FALSE;
-#line 12234 "ColorTransformation.c"
+#line 12505 "ColorTransformation.c"
 	}
-#line 1318 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1362 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	result = _tmp0_;
-#line 1318 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1362 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return result;
-#line 12240 "ColorTransformation.c"
+#line 12511 "ColorTransformation.c"
 }
 
 
@@ -12251,63 +12522,63 @@ static PixelTransformation* expansion_transformation_real_copy (PixelTransformat
 	gint _tmp0_ = 0;
 	gint _tmp1_ = 0;
 	ExpansionTransformation* _tmp2_ = NULL;
-#line 1321 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1365 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EXPANSION_TRANSFORMATION, ExpansionTransformation);
-#line 1322 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1366 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp0_ = self->priv->low_kink;
-#line 1322 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1366 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp1_ = self->priv->high_kink;
-#line 1322 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1366 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp2_ = expansion_transformation_new_from_extrema (_tmp0_, _tmp1_);
-#line 1322 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1366 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_PIXEL_TRANSFORMATION, PixelTransformation);
-#line 1322 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1366 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return result;
-#line 12262 "ColorTransformation.c"
+#line 12533 "ColorTransformation.c"
 }
 
 
 static void expansion_transformation_class_init (ExpansionTransformationClass * klass) {
-#line 1211 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1255 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	expansion_transformation_parent_class = g_type_class_peek_parent (klass);
-#line 1211 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1255 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	((PixelTransformationClass *) klass)->finalize = expansion_transformation_finalize;
-#line 1211 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1255 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_type_class_add_private (klass, sizeof (ExpansionTransformationPrivate));
-#line 1211 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1255 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	((PixelTransformationClass *) klass)->transform_pixel_hsv = expansion_transformation_real_transform_pixel_hsv;
-#line 1211 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1255 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	((PixelTransformationClass *) klass)->to_string = expansion_transformation_real_to_string;
-#line 1211 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1255 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	((PixelTransformationClass *) klass)->is_identity = expansion_transformation_real_is_identity;
-#line 1211 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1255 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	((PixelTransformationClass *) klass)->copy = expansion_transformation_real_copy;
-#line 12281 "ColorTransformation.c"
+#line 12552 "ColorTransformation.c"
 }
 
 
 static void expansion_transformation_instance_init (ExpansionTransformation * self) {
-#line 1211 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1255 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv = EXPANSION_TRANSFORMATION_GET_PRIVATE (self);
-#line 1212 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1256 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv->remap_table = NULL;
-#line 1212 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1256 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv->remap_table_length1 = 0;
-#line 1212 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1256 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv->_remap_table_size_ = self->priv->remap_table_length1;
-#line 12294 "ColorTransformation.c"
+#line 12565 "ColorTransformation.c"
 }
 
 
 static void expansion_transformation_finalize (PixelTransformation* obj) {
 	ExpansionTransformation * self;
-#line 1211 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1255 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_EXPANSION_TRANSFORMATION, ExpansionTransformation);
-#line 1212 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1256 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv->remap_table = (g_free (self->priv->remap_table), NULL);
-#line 1211 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1255 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	PIXEL_TRANSFORMATION_CLASS (expansion_transformation_parent_class)->finalize (obj);
-#line 12306 "ColorTransformation.c"
+#line 12577 "ColorTransformation.c"
 }
 
 
@@ -12334,49 +12605,49 @@ ShadowDetailTransformation* shadow_detail_transformation_construct (GType object
 	HermiteGammaApproximationFunction* func = NULL;
 	HermiteGammaApproximationFunction* _tmp4_ = NULL;
 	gfloat* _tmp5_ = NULL;
-#line 1339 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1383 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self = (ShadowDetailTransformation*) hsv_transformation_construct (object_type, PIXEL_TRANSFORMATION_TYPE_SHADOWS);
-#line 1341 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1385 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp0_ = user_intensity;
-#line 1341 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1385 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv->intensity = _tmp0_;
-#line 1342 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1386 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp1_ = self->priv->intensity;
-#line 1342 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1386 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp2_ = CLAMP (_tmp1_ / SHADOW_DETAIL_TRANSFORMATION_MAX_PARAMETER, 0.0f, 1.0f);
-#line 1342 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1386 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	intensity_adj = _tmp2_;
-#line 1344 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1388 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp3_ = intensity_adj;
-#line 1344 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1388 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	effect_shift = SHADOW_DETAIL_TRANSFORMATION_MAX_EFFECT_SHIFT * _tmp3_;
-#line 1345 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1389 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp4_ = hermite_gamma_approximation_function_new (SHADOW_DETAIL_TRANSFORMATION_TONAL_WIDTH);
-#line 1345 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1389 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	func = _tmp4_;
-#line 1348 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1392 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp5_ = g_new0 (gfloat, 256);
-#line 1348 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1392 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv->remap_table = (g_free (self->priv->remap_table), NULL);
-#line 1348 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1392 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv->remap_table = _tmp5_;
-#line 1348 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1392 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv->remap_table_length1 = 256;
-#line 1348 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1392 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv->_remap_table_size_ = self->priv->remap_table_length1;
-#line 12363 "ColorTransformation.c"
+#line 12634 "ColorTransformation.c"
 	{
 		gint i = 0;
-#line 1349 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1393 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		i = 0;
-#line 12368 "ColorTransformation.c"
+#line 12639 "ColorTransformation.c"
 		{
 			gboolean _tmp6_ = FALSE;
-#line 1349 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1393 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp6_ = TRUE;
-#line 1349 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1393 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			while (TRUE) {
-#line 12375 "ColorTransformation.c"
+#line 12646 "ColorTransformation.c"
 				gint _tmp8_ = 0;
 				gfloat x = 0.0F;
 				gint _tmp9_ = 0;
@@ -12393,74 +12664,74 @@ ShadowDetailTransformation* shadow_detail_transformation_construct (GType object
 				gfloat _tmp18_ = 0.0F;
 				gfloat _tmp19_ = 0.0F;
 				gfloat _tmp20_ = 0.0F;
-#line 1349 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1393 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				if (!_tmp6_) {
-#line 12394 "ColorTransformation.c"
+#line 12665 "ColorTransformation.c"
 					gint _tmp7_ = 0;
-#line 1349 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1393 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp7_ = i;
-#line 1349 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1393 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					i = _tmp7_ + 1;
-#line 12400 "ColorTransformation.c"
+#line 12671 "ColorTransformation.c"
 				}
-#line 1349 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1393 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp6_ = FALSE;
-#line 1349 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1393 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp8_ = i;
-#line 1349 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1393 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				if (!(_tmp8_ < 256)) {
-#line 1349 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1393 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					break;
-#line 12410 "ColorTransformation.c"
+#line 12681 "ColorTransformation.c"
 				}
-#line 1350 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1394 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp9_ = i;
-#line 1350 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1394 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				x = ((gfloat) _tmp9_) / 255.0f;
-#line 1351 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1395 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp10_ = func;
-#line 1351 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1395 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp11_ = x;
-#line 1351 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1395 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp12_ = hermite_gamma_approximation_function_evaluate (_tmp10_, _tmp11_);
-#line 1351 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1395 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				weight = _tmp12_;
-#line 1352 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1396 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp13_ = self->priv->remap_table;
-#line 1352 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1396 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp13__length1 = self->priv->remap_table_length1;
-#line 1352 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1396 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp14_ = i;
-#line 1352 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1396 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp15_ = weight;
-#line 1352 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1396 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp16_ = x;
-#line 1352 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1396 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp17_ = effect_shift;
-#line 1352 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1396 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp18_ = weight;
-#line 1352 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1396 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp19_ = x;
-#line 1352 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1396 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp13_[_tmp14_] = (_tmp15_ * (_tmp16_ + _tmp17_)) + ((1.0f - _tmp18_) * _tmp19_);
-#line 1352 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1396 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp20_ = _tmp13_[_tmp14_];
-#line 12444 "ColorTransformation.c"
+#line 12715 "ColorTransformation.c"
 			}
 		}
 	}
-#line 1338 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1382 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_hermite_gamma_approximation_function_unref0 (func);
-#line 1338 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1382 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return self;
-#line 12452 "ColorTransformation.c"
+#line 12723 "ColorTransformation.c"
 }
 
 
 ShadowDetailTransformation* shadow_detail_transformation_new (gfloat user_intensity) {
-#line 1338 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1382 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return shadow_detail_transformation_construct (TYPE_SHADOW_DETAIL_TRANSFORMATION, user_intensity);
-#line 12459 "ColorTransformation.c"
+#line 12730 "ColorTransformation.c"
 }
 
 
@@ -12474,33 +12745,33 @@ static void shadow_detail_transformation_real_transform_pixel_hsv (PixelTransfor
 	gfloat _tmp3_ = 0.0F;
 	gfloat _tmp4_ = 0.0F;
 	gfloat _tmp5_ = 0.0F;
-#line 1356 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1400 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SHADOW_DETAIL_TRANSFORMATION, ShadowDetailTransformation);
-#line 1356 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1400 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_return_if_fail (pixel != NULL);
-#line 1357 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1401 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp0_ = *pixel;
-#line 1357 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1401 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_result_ = _tmp0_;
-#line 1358 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1402 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp1_ = self->priv->remap_table;
-#line 1358 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1402 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp1__length1 = self->priv->remap_table_length1;
-#line 1358 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1402 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp2_ = *pixel;
-#line 1358 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1402 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp3_ = _tmp2_.light_value;
-#line 1358 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1402 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp4_ = _tmp1_[(gint) (_tmp3_ * 255.0f)];
-#line 1358 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1402 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp5_ = CLAMP (_tmp4_, 0.0f, 1.0f);
-#line 1358 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1402 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_result_.light_value = _tmp5_;
-#line 1359 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1403 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	*result = _result_;
-#line 1359 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1403 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return;
-#line 12499 "ColorTransformation.c"
+#line 12770 "ColorTransformation.c"
 }
 
 
@@ -12509,17 +12780,17 @@ static PixelTransformation* shadow_detail_transformation_real_copy (PixelTransfo
 	PixelTransformation* result = NULL;
 	gfloat _tmp0_ = 0.0F;
 	ShadowDetailTransformation* _tmp1_ = NULL;
-#line 1362 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1406 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SHADOW_DETAIL_TRANSFORMATION, ShadowDetailTransformation);
-#line 1363 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1407 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp0_ = self->priv->intensity;
-#line 1363 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1407 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp1_ = shadow_detail_transformation_new (_tmp0_);
-#line 1363 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1407 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PIXEL_TRANSFORMATION, PixelTransformation);
-#line 1363 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1407 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return result;
-#line 12518 "ColorTransformation.c"
+#line 12789 "ColorTransformation.c"
 }
 
 
@@ -12527,74 +12798,74 @@ static gboolean shadow_detail_transformation_real_is_identity (PixelTransformati
 	ShadowDetailTransformation * self;
 	gboolean result = FALSE;
 	gfloat _tmp0_ = 0.0F;
-#line 1366 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1410 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SHADOW_DETAIL_TRANSFORMATION, ShadowDetailTransformation);
-#line 1367 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1411 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp0_ = self->priv->intensity;
-#line 1367 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1411 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	result = _tmp0_ == 0.0f;
-#line 1367 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1411 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return result;
-#line 12534 "ColorTransformation.c"
+#line 12805 "ColorTransformation.c"
 }
 
 
 gfloat shadow_detail_transformation_get_parameter (ShadowDetailTransformation* self) {
 	gfloat result = 0.0F;
 	gfloat _tmp0_ = 0.0F;
-#line 1370 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1414 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_return_val_if_fail (IS_SHADOW_DETAIL_TRANSFORMATION (self), 0.0F);
-#line 1371 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1415 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp0_ = self->priv->intensity;
-#line 1371 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1415 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	result = _tmp0_;
-#line 1371 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1415 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return result;
-#line 12549 "ColorTransformation.c"
+#line 12820 "ColorTransformation.c"
 }
 
 
 static void shadow_detail_transformation_class_init (ShadowDetailTransformationClass * klass) {
-#line 1326 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1370 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	shadow_detail_transformation_parent_class = g_type_class_peek_parent (klass);
-#line 1326 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1370 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	((PixelTransformationClass *) klass)->finalize = shadow_detail_transformation_finalize;
-#line 1326 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1370 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_type_class_add_private (klass, sizeof (ShadowDetailTransformationPrivate));
-#line 1326 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1370 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	((PixelTransformationClass *) klass)->transform_pixel_hsv = shadow_detail_transformation_real_transform_pixel_hsv;
-#line 1326 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1370 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	((PixelTransformationClass *) klass)->copy = shadow_detail_transformation_real_copy;
-#line 1326 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1370 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	((PixelTransformationClass *) klass)->is_identity = shadow_detail_transformation_real_is_identity;
-#line 12566 "ColorTransformation.c"
+#line 12837 "ColorTransformation.c"
 }
 
 
 static void shadow_detail_transformation_instance_init (ShadowDetailTransformation * self) {
-#line 1326 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1370 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv = SHADOW_DETAIL_TRANSFORMATION_GET_PRIVATE (self);
-#line 1332 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1376 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv->intensity = 0.0f;
-#line 1333 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1377 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv->remap_table = NULL;
-#line 1333 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1377 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv->remap_table_length1 = 0;
-#line 1333 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1377 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv->_remap_table_size_ = self->priv->remap_table_length1;
-#line 12581 "ColorTransformation.c"
+#line 12852 "ColorTransformation.c"
 }
 
 
 static void shadow_detail_transformation_finalize (PixelTransformation* obj) {
 	ShadowDetailTransformation * self;
-#line 1326 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1370 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SHADOW_DETAIL_TRANSFORMATION, ShadowDetailTransformation);
-#line 1333 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1377 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv->remap_table = (g_free (self->priv->remap_table), NULL);
-#line 1326 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1370 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	PIXEL_TRANSFORMATION_CLASS (shadow_detail_transformation_parent_class)->finalize (obj);
-#line 12593 "ColorTransformation.c"
+#line 12864 "ColorTransformation.c"
 }
 
 
@@ -12615,59 +12886,59 @@ HermiteGammaApproximationFunction* hermite_gamma_approximation_function_construc
 	gfloat _tmp0_ = 0.0F;
 	gfloat _tmp1_ = 0.0F;
 	gfloat _tmp2_ = 0.0F;
-#line 1379 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1423 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self = (HermiteGammaApproximationFunction*) g_type_create_instance (object_type);
-#line 1380 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1424 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp0_ = user_interval_upper;
-#line 1380 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1424 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp1_ = CLAMP (_tmp0_, 0.1f, 1.0f);
-#line 1380 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1424 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv->nonzero_interval_upper = _tmp1_;
-#line 1381 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1425 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp2_ = self->priv->nonzero_interval_upper;
-#line 1381 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1425 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv->x_scale = 1.0f / _tmp2_;
-#line 1379 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1423 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return self;
-#line 12628 "ColorTransformation.c"
+#line 12899 "ColorTransformation.c"
 }
 
 
 HermiteGammaApproximationFunction* hermite_gamma_approximation_function_new (gfloat user_interval_upper) {
-#line 1379 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1423 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return hermite_gamma_approximation_function_construct (TYPE_HERMITE_GAMMA_APPROXIMATION_FUNCTION, user_interval_upper);
-#line 12635 "ColorTransformation.c"
+#line 12906 "ColorTransformation.c"
 }
 
 
 gfloat hermite_gamma_approximation_function_evaluate (HermiteGammaApproximationFunction* self, gfloat x) {
 	gfloat result = 0.0F;
 	gfloat _tmp0_ = 0.0F;
-#line 1384 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1428 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_return_val_if_fail (IS_HERMITE_GAMMA_APPROXIMATION_FUNCTION (self), 0.0F);
-#line 1385 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1429 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp0_ = x;
-#line 1385 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1429 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (_tmp0_ < 0.0f) {
-#line 1386 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1430 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		result = 0.0f;
-#line 1386 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1430 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		return result;
-#line 12652 "ColorTransformation.c"
+#line 12923 "ColorTransformation.c"
 	} else {
 		gfloat _tmp1_ = 0.0F;
 		gfloat _tmp2_ = 0.0F;
-#line 1387 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1431 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp1_ = x;
-#line 1387 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1431 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp2_ = self->priv->nonzero_interval_upper;
-#line 1387 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1431 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		if (_tmp1_ > _tmp2_) {
-#line 1388 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1432 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			result = 0.0f;
-#line 1388 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1432 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			return result;
-#line 12666 "ColorTransformation.c"
+#line 12937 "ColorTransformation.c"
 		} else {
 			gfloat indep_var = 0.0F;
 			gfloat _tmp3_ = 0.0F;
@@ -12681,251 +12952,251 @@ gfloat hermite_gamma_approximation_function_evaluate (HermiteGammaApproximationF
 			gfloat _tmp10_ = 0.0F;
 			gfloat _tmp11_ = 0.0F;
 			gfloat _tmp12_ = 0.0F;
-#line 1390 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1434 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp3_ = self->priv->x_scale;
-#line 1390 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1434 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp4_ = x;
-#line 1390 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1434 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			indep_var = _tmp3_ * _tmp4_;
-#line 1392 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1436 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp5_ = indep_var;
-#line 1392 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1436 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp6_ = indep_var;
-#line 1392 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1436 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp7_ = indep_var;
-#line 1392 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1436 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp8_ = indep_var;
-#line 1392 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1436 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp9_ = indep_var;
-#line 1392 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1436 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp10_ = indep_var;
-#line 1392 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1436 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			dep_var = 6.0f * ((((_tmp5_ * _tmp6_) * _tmp7_) - (2.0f * (_tmp8_ * _tmp9_))) + _tmp10_);
-#line 1395 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1439 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp11_ = dep_var;
-#line 1395 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1439 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp12_ = CLAMP (_tmp11_, 0.0f, 1.0f);
-#line 1395 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1439 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			result = _tmp12_;
-#line 1395 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1439 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			return result;
-#line 12708 "ColorTransformation.c"
+#line 12979 "ColorTransformation.c"
 		}
 	}
 }
 
 
 static void value_hermite_gamma_approximation_function_init (GValue* value) {
-#line 1375 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1419 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	value->data[0].v_pointer = NULL;
-#line 12717 "ColorTransformation.c"
+#line 12988 "ColorTransformation.c"
 }
 
 
 static void value_hermite_gamma_approximation_function_free_value (GValue* value) {
-#line 1375 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1419 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (value->data[0].v_pointer) {
-#line 1375 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1419 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		hermite_gamma_approximation_function_unref (value->data[0].v_pointer);
-#line 12726 "ColorTransformation.c"
+#line 12997 "ColorTransformation.c"
 	}
 }
 
 
 static void value_hermite_gamma_approximation_function_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 1375 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1419 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (src_value->data[0].v_pointer) {
-#line 1375 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1419 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		dest_value->data[0].v_pointer = hermite_gamma_approximation_function_ref (src_value->data[0].v_pointer);
-#line 12736 "ColorTransformation.c"
+#line 13007 "ColorTransformation.c"
 	} else {
-#line 1375 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1419 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 12740 "ColorTransformation.c"
+#line 13011 "ColorTransformation.c"
 	}
 }
 
 
 static gpointer value_hermite_gamma_approximation_function_peek_pointer (const GValue* value) {
-#line 1375 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1419 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return value->data[0].v_pointer;
-#line 12748 "ColorTransformation.c"
+#line 13019 "ColorTransformation.c"
 }
 
 
 static gchar* value_hermite_gamma_approximation_function_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 1375 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1419 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (collect_values[0].v_pointer) {
-#line 12755 "ColorTransformation.c"
+#line 13026 "ColorTransformation.c"
 		HermiteGammaApproximationFunction* object;
 		object = collect_values[0].v_pointer;
-#line 1375 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1419 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		if (object->parent_instance.g_class == NULL) {
-#line 1375 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1419 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 12762 "ColorTransformation.c"
+#line 13033 "ColorTransformation.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 1375 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1419 "/home/jens/Source/shotwell/src/ColorTransformation.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 12766 "ColorTransformation.c"
+#line 13037 "ColorTransformation.c"
 		}
-#line 1375 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1419 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		value->data[0].v_pointer = hermite_gamma_approximation_function_ref (object);
-#line 12770 "ColorTransformation.c"
+#line 13041 "ColorTransformation.c"
 	} else {
-#line 1375 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1419 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		value->data[0].v_pointer = NULL;
-#line 12774 "ColorTransformation.c"
+#line 13045 "ColorTransformation.c"
 	}
-#line 1375 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1419 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return NULL;
-#line 12778 "ColorTransformation.c"
+#line 13049 "ColorTransformation.c"
 }
 
 
 static gchar* value_hermite_gamma_approximation_function_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 	HermiteGammaApproximationFunction** object_p;
 	object_p = collect_values[0].v_pointer;
-#line 1375 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1419 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (!object_p) {
-#line 1375 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1419 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 12789 "ColorTransformation.c"
+#line 13060 "ColorTransformation.c"
 	}
-#line 1375 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1419 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (!value->data[0].v_pointer) {
-#line 1375 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1419 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		*object_p = NULL;
-#line 12795 "ColorTransformation.c"
+#line 13066 "ColorTransformation.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 1375 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1419 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		*object_p = value->data[0].v_pointer;
-#line 12799 "ColorTransformation.c"
+#line 13070 "ColorTransformation.c"
 	} else {
-#line 1375 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1419 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		*object_p = hermite_gamma_approximation_function_ref (value->data[0].v_pointer);
-#line 12803 "ColorTransformation.c"
+#line 13074 "ColorTransformation.c"
 	}
-#line 1375 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1419 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return NULL;
-#line 12807 "ColorTransformation.c"
+#line 13078 "ColorTransformation.c"
 }
 
 
 GParamSpec* param_spec_hermite_gamma_approximation_function (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
 	ParamSpecHermiteGammaApproximationFunction* spec;
-#line 1375 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1419 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, TYPE_HERMITE_GAMMA_APPROXIMATION_FUNCTION), NULL);
-#line 1375 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1419 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 1375 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1419 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 1375 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1419 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return G_PARAM_SPEC (spec);
-#line 12821 "ColorTransformation.c"
+#line 13092 "ColorTransformation.c"
 }
 
 
 gpointer value_get_hermite_gamma_approximation_function (const GValue* value) {
-#line 1375 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1419 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_HERMITE_GAMMA_APPROXIMATION_FUNCTION), NULL);
-#line 1375 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1419 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return value->data[0].v_pointer;
-#line 12830 "ColorTransformation.c"
+#line 13101 "ColorTransformation.c"
 }
 
 
 void value_set_hermite_gamma_approximation_function (GValue* value, gpointer v_object) {
 	HermiteGammaApproximationFunction* old;
-#line 1375 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1419 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_HERMITE_GAMMA_APPROXIMATION_FUNCTION));
-#line 1375 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1419 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	old = value->data[0].v_pointer;
-#line 1375 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1419 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (v_object) {
-#line 1375 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1419 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_HERMITE_GAMMA_APPROXIMATION_FUNCTION));
-#line 1375 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1419 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 1375 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1419 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		value->data[0].v_pointer = v_object;
-#line 1375 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1419 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		hermite_gamma_approximation_function_ref (value->data[0].v_pointer);
-#line 12850 "ColorTransformation.c"
+#line 13121 "ColorTransformation.c"
 	} else {
-#line 1375 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1419 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		value->data[0].v_pointer = NULL;
-#line 12854 "ColorTransformation.c"
+#line 13125 "ColorTransformation.c"
 	}
-#line 1375 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1419 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (old) {
-#line 1375 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1419 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		hermite_gamma_approximation_function_unref (old);
-#line 12860 "ColorTransformation.c"
+#line 13131 "ColorTransformation.c"
 	}
 }
 
 
 void value_take_hermite_gamma_approximation_function (GValue* value, gpointer v_object) {
 	HermiteGammaApproximationFunction* old;
-#line 1375 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1419 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_HERMITE_GAMMA_APPROXIMATION_FUNCTION));
-#line 1375 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1419 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	old = value->data[0].v_pointer;
-#line 1375 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1419 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (v_object) {
-#line 1375 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1419 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_HERMITE_GAMMA_APPROXIMATION_FUNCTION));
-#line 1375 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1419 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 1375 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1419 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		value->data[0].v_pointer = v_object;
-#line 12879 "ColorTransformation.c"
+#line 13150 "ColorTransformation.c"
 	} else {
-#line 1375 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1419 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		value->data[0].v_pointer = NULL;
-#line 12883 "ColorTransformation.c"
+#line 13154 "ColorTransformation.c"
 	}
-#line 1375 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1419 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (old) {
-#line 1375 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1419 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		hermite_gamma_approximation_function_unref (old);
-#line 12889 "ColorTransformation.c"
+#line 13160 "ColorTransformation.c"
 	}
 }
 
 
 static void hermite_gamma_approximation_function_class_init (HermiteGammaApproximationFunctionClass * klass) {
-#line 1375 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1419 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	hermite_gamma_approximation_function_parent_class = g_type_class_peek_parent (klass);
-#line 1375 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1419 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	((HermiteGammaApproximationFunctionClass *) klass)->finalize = hermite_gamma_approximation_function_finalize;
-#line 1375 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1419 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_type_class_add_private (klass, sizeof (HermiteGammaApproximationFunctionPrivate));
-#line 12901 "ColorTransformation.c"
+#line 13172 "ColorTransformation.c"
 }
 
 
 static void hermite_gamma_approximation_function_instance_init (HermiteGammaApproximationFunction * self) {
-#line 1375 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1419 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv = HERMITE_GAMMA_APPROXIMATION_FUNCTION_GET_PRIVATE (self);
-#line 1376 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1420 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv->x_scale = 1.0f;
-#line 1377 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1421 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv->nonzero_interval_upper = 1.0f;
-#line 1375 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1419 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->ref_count = 1;
-#line 12914 "ColorTransformation.c"
+#line 13185 "ColorTransformation.c"
 }
 
 
 static void hermite_gamma_approximation_function_finalize (HermiteGammaApproximationFunction* obj) {
 	HermiteGammaApproximationFunction * self;
-#line 1375 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1419 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_HERMITE_GAMMA_APPROXIMATION_FUNCTION, HermiteGammaApproximationFunction);
-#line 1375 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1419 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_signal_handlers_destroy (self);
-#line 12924 "ColorTransformation.c"
+#line 13195 "ColorTransformation.c"
 }
 
 
@@ -12946,24 +13217,24 @@ GType hermite_gamma_approximation_function_get_type (void) {
 gpointer hermite_gamma_approximation_function_ref (gpointer instance) {
 	HermiteGammaApproximationFunction* self;
 	self = instance;
-#line 1375 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1419 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_atomic_int_inc (&self->ref_count);
-#line 1375 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1419 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return instance;
-#line 12949 "ColorTransformation.c"
+#line 13220 "ColorTransformation.c"
 }
 
 
 void hermite_gamma_approximation_function_unref (gpointer instance) {
 	HermiteGammaApproximationFunction* self;
 	self = instance;
-#line 1375 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1419 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 1375 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1419 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		HERMITE_GAMMA_APPROXIMATION_FUNCTION_GET_CLASS (self)->finalize (self);
-#line 1375 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1419 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 12962 "ColorTransformation.c"
+#line 13233 "ColorTransformation.c"
 	}
 }
 
@@ -12979,49 +13250,49 @@ HighlightDetailTransformation* highlight_detail_transformation_construct (GType
 	HermiteGammaApproximationFunction* func = NULL;
 	HermiteGammaApproximationFunction* _tmp4_ = NULL;
 	gfloat* _tmp5_ = NULL;
-#line 1413 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1457 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self = (HighlightDetailTransformation*) hsv_transformation_construct (object_type, PIXEL_TRANSFORMATION_TYPE_HIGHLIGHTS);
-#line 1415 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1459 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp0_ = user_intensity;
-#line 1415 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1459 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv->intensity = _tmp0_;
-#line 1416 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1460 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp1_ = self->priv->intensity;
-#line 1416 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1460 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp2_ = CLAMP (_tmp1_ / HIGHLIGHT_DETAIL_TRANSFORMATION_MIN_PARAMETER, 0.0f, 1.0f);
-#line 1416 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1460 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	intensity_adj = _tmp2_;
-#line 1418 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1462 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp3_ = intensity_adj;
-#line 1418 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1462 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	effect_shift = HIGHLIGHT_DETAIL_TRANSFORMATION_MAX_EFFECT_SHIFT * _tmp3_;
-#line 1419 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1463 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp4_ = hermite_gamma_approximation_function_new (HIGHLIGHT_DETAIL_TRANSFORMATION_TONAL_WIDTH);
-#line 1419 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1463 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	func = _tmp4_;
-#line 1422 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1466 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp5_ = g_new0 (gfloat, 256);
-#line 1422 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1466 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv->remap_table = (g_free (self->priv->remap_table), NULL);
-#line 1422 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1466 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv->remap_table = _tmp5_;
-#line 1422 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1466 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv->remap_table_length1 = 256;
-#line 1422 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1466 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv->_remap_table_size_ = self->priv->remap_table_length1;
-#line 13008 "ColorTransformation.c"
+#line 13279 "ColorTransformation.c"
 	{
 		gint i = 0;
-#line 1423 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1467 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		i = 0;
-#line 13013 "ColorTransformation.c"
+#line 13284 "ColorTransformation.c"
 		{
 			gboolean _tmp6_ = FALSE;
-#line 1423 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1467 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp6_ = TRUE;
-#line 1423 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1467 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			while (TRUE) {
-#line 13020 "ColorTransformation.c"
+#line 13291 "ColorTransformation.c"
 				gint _tmp8_ = 0;
 				gfloat x = 0.0F;
 				gint _tmp9_ = 0;
@@ -13038,74 +13309,74 @@ HighlightDetailTransformation* highlight_detail_transformation_construct (GType
 				gfloat _tmp18_ = 0.0F;
 				gfloat _tmp19_ = 0.0F;
 				gfloat _tmp20_ = 0.0F;
-#line 1423 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1467 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				if (!_tmp6_) {
-#line 13039 "ColorTransformation.c"
+#line 13310 "ColorTransformation.c"
 					gint _tmp7_ = 0;
-#line 1423 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1467 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp7_ = i;
-#line 1423 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1467 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					i = _tmp7_ + 1;
-#line 13045 "ColorTransformation.c"
+#line 13316 "ColorTransformation.c"
 				}
-#line 1423 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1467 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp6_ = FALSE;
-#line 1423 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1467 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp8_ = i;
-#line 1423 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1467 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				if (!(_tmp8_ < 256)) {
-#line 1423 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1467 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					break;
-#line 13055 "ColorTransformation.c"
+#line 13326 "ColorTransformation.c"
 				}
-#line 1424 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1468 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp9_ = i;
-#line 1424 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1468 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				x = ((gfloat) _tmp9_) / 255.0f;
-#line 1425 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1469 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp10_ = func;
-#line 1425 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1469 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp11_ = x;
-#line 1425 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1469 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp12_ = hermite_gamma_approximation_function_evaluate (_tmp10_, 1.0f - _tmp11_);
-#line 1425 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1469 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				weight = _tmp12_;
-#line 1426 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1470 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp13_ = self->priv->remap_table;
-#line 1426 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1470 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp13__length1 = self->priv->remap_table_length1;
-#line 1426 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1470 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp14_ = i;
-#line 1426 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1470 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp15_ = weight;
-#line 1426 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1470 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp16_ = x;
-#line 1426 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1470 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp17_ = effect_shift;
-#line 1426 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1470 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp18_ = weight;
-#line 1426 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1470 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp19_ = x;
-#line 1426 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1470 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp13_[_tmp14_] = (_tmp15_ * (_tmp16_ - _tmp17_)) + ((1.0f - _tmp18_) * _tmp19_);
-#line 1426 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1470 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp20_ = _tmp13_[_tmp14_];
-#line 13089 "ColorTransformation.c"
+#line 13360 "ColorTransformation.c"
 			}
 		}
 	}
-#line 1412 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1456 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_hermite_gamma_approximation_function_unref0 (func);
-#line 1412 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1456 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return self;
-#line 13097 "ColorTransformation.c"
+#line 13368 "ColorTransformation.c"
 }
 
 
 HighlightDetailTransformation* highlight_detail_transformation_new (gfloat user_intensity) {
-#line 1412 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1456 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return highlight_detail_transformation_construct (TYPE_HIGHLIGHT_DETAIL_TRANSFORMATION, user_intensity);
-#line 13104 "ColorTransformation.c"
+#line 13375 "ColorTransformation.c"
 }
 
 
@@ -13119,33 +13390,33 @@ static void highlight_detail_transformation_real_transform_pixel_hsv (PixelTrans
 	gfloat _tmp3_ = 0.0F;
 	gfloat _tmp4_ = 0.0F;
 	gfloat _tmp5_ = 0.0F;
-#line 1430 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1474 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_HIGHLIGHT_DETAIL_TRANSFORMATION, HighlightDetailTransformation);
-#line 1430 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1474 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_return_if_fail (pixel != NULL);
-#line 1431 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1475 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp0_ = *pixel;
-#line 1431 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1475 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_result_ = _tmp0_;
-#line 1432 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1476 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp1_ = self->priv->remap_table;
-#line 1432 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1476 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp1__length1 = self->priv->remap_table_length1;
-#line 1432 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1476 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp2_ = *pixel;
-#line 1432 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1476 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp3_ = _tmp2_.light_value;
-#line 1432 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1476 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp4_ = _tmp1_[(gint) (_tmp3_ * 255.0f)];
-#line 1432 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1476 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp5_ = CLAMP (_tmp4_, 0.0f, 1.0f);
-#line 1432 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1476 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_result_.light_value = _tmp5_;
-#line 1433 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1477 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	*result = _result_;
-#line 1433 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1477 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return;
-#line 13144 "ColorTransformation.c"
+#line 13415 "ColorTransformation.c"
 }
 
 
@@ -13154,17 +13425,17 @@ static PixelTransformation* highlight_detail_transformation_real_copy (PixelTran
 	PixelTransformation* result = NULL;
 	gfloat _tmp0_ = 0.0F;
 	HighlightDetailTransformation* _tmp1_ = NULL;
-#line 1436 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1480 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_HIGHLIGHT_DETAIL_TRANSFORMATION, HighlightDetailTransformation);
-#line 1437 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1481 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp0_ = self->priv->intensity;
-#line 1437 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1481 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp1_ = highlight_detail_transformation_new (_tmp0_);
-#line 1437 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1481 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PIXEL_TRANSFORMATION, PixelTransformation);
-#line 1437 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1481 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return result;
-#line 13163 "ColorTransformation.c"
+#line 13434 "ColorTransformation.c"
 }
 
 
@@ -13172,74 +13443,74 @@ static gboolean highlight_detail_transformation_real_is_identity (PixelTransform
 	HighlightDetailTransformation * self;
 	gboolean result = FALSE;
 	gfloat _tmp0_ = 0.0F;
-#line 1440 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1484 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_HIGHLIGHT_DETAIL_TRANSFORMATION, HighlightDetailTransformation);
-#line 1441 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1485 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp0_ = self->priv->intensity;
-#line 1441 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1485 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	result = _tmp0_ == 0.0f;
-#line 1441 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1485 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return result;
-#line 13179 "ColorTransformation.c"
+#line 13450 "ColorTransformation.c"
 }
 
 
 gfloat highlight_detail_transformation_get_parameter (HighlightDetailTransformation* self) {
 	gfloat result = 0.0F;
 	gfloat _tmp0_ = 0.0F;
-#line 1444 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1488 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_return_val_if_fail (IS_HIGHLIGHT_DETAIL_TRANSFORMATION (self), 0.0F);
-#line 1445 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1489 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp0_ = self->priv->intensity;
-#line 1445 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1489 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	result = _tmp0_;
-#line 1445 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1489 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return result;
-#line 13194 "ColorTransformation.c"
+#line 13465 "ColorTransformation.c"
 }
 
 
 static void highlight_detail_transformation_class_init (HighlightDetailTransformationClass * klass) {
-#line 1400 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1444 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	highlight_detail_transformation_parent_class = g_type_class_peek_parent (klass);
-#line 1400 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1444 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	((PixelTransformationClass *) klass)->finalize = highlight_detail_transformation_finalize;
-#line 1400 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1444 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_type_class_add_private (klass, sizeof (HighlightDetailTransformationPrivate));
-#line 1400 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1444 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	((PixelTransformationClass *) klass)->transform_pixel_hsv = highlight_detail_transformation_real_transform_pixel_hsv;
-#line 1400 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1444 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	((PixelTransformationClass *) klass)->copy = highlight_detail_transformation_real_copy;
-#line 1400 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1444 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	((PixelTransformationClass *) klass)->is_identity = highlight_detail_transformation_real_is_identity;
-#line 13211 "ColorTransformation.c"
+#line 13482 "ColorTransformation.c"
 }
 
 
 static void highlight_detail_transformation_instance_init (HighlightDetailTransformation * self) {
-#line 1400 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1444 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv = HIGHLIGHT_DETAIL_TRANSFORMATION_GET_PRIVATE (self);
-#line 1406 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1450 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv->intensity = 0.0f;
-#line 1407 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1451 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv->remap_table = NULL;
-#line 1407 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1451 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv->remap_table_length1 = 0;
-#line 1407 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1451 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv->_remap_table_size_ = self->priv->remap_table_length1;
-#line 13226 "ColorTransformation.c"
+#line 13497 "ColorTransformation.c"
 }
 
 
 static void highlight_detail_transformation_finalize (PixelTransformation* obj) {
 	HighlightDetailTransformation * self;
-#line 1400 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1444 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_HIGHLIGHT_DETAIL_TRANSFORMATION, HighlightDetailTransformation);
-#line 1407 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1451 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	self->priv->remap_table = (g_free (self->priv->remap_table), NULL);
-#line 1400 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1444 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	PIXEL_TRANSFORMATION_CLASS (highlight_detail_transformation_parent_class)->finalize (obj);
-#line 13238 "ColorTransformation.c"
+#line 13509 "ColorTransformation.c"
 }
 
 
@@ -13288,124 +13559,127 @@ PixelTransformationBundle* auto_enhance_create_auto_enhance_adjustments (GdkPixb
 	ExposureTransformation* _tmp56_ = NULL;
 	ExposureTransformation* _tmp57_ = NULL;
 	PixelTransformationBundle* _tmp58_ = NULL;
-	SaturationTransformation* _tmp59_ = NULL;
-	SaturationTransformation* _tmp60_ = NULL;
-#line 1458 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	ContrastTransformation* _tmp59_ = NULL;
+	ContrastTransformation* _tmp60_ = NULL;
+	PixelTransformationBundle* _tmp61_ = NULL;
+	SaturationTransformation* _tmp62_ = NULL;
+	SaturationTransformation* _tmp63_ = NULL;
+#line 1502 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	g_return_val_if_fail (GDK_IS_PIXBUF (pixbuf), NULL);
-#line 1459 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1503 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp0_ = pixel_transformation_bundle_new ();
-#line 1459 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1503 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	adjustments = _tmp0_;
-#line 1461 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1505 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp1_ = pixbuf;
-#line 1461 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1505 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp2_ = intensity_histogram_new (_tmp1_);
-#line 1461 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1505 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	analysis_histogram = _tmp2_;
-#line 1464 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1508 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp3_ = analysis_histogram;
-#line 1464 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1508 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp4_ = intensity_histogram_get_cumulative_probability (_tmp3_, AUTO_ENHANCE_SHADOW_DETECT_MAX_INTENSITY);
-#line 1464 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1508 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp5_ = analysis_histogram;
-#line 1464 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1508 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp6_ = intensity_histogram_get_cumulative_probability (_tmp5_, AUTO_ENHANCE_SHADOW_DETECT_MIN_INTENSITY);
-#line 1464 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1508 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	pct_in_range = 100.0f * (_tmp4_ - _tmp6_);
-#line 1470 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1514 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp7_ = analysis_histogram;
-#line 1470 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1514 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp8_ = intensity_histogram_get_cumulative_probability (_tmp7_, AUTO_ENHANCE_SHADOW_DETECT_MIN_INTENSITY);
-#line 1470 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1514 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp9_ = analysis_histogram;
-#line 1470 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1514 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp10_ = intensity_histogram_get_cumulative_probability (_tmp9_, AUTO_ENHANCE_SHADOW_DETECT_MAX_INTENSITY);
-#line 1470 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1514 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	shadow_range_mean_prob_val = (_tmp8_ + _tmp10_) * 0.5f;
-#line 1473 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1517 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	shadow_mean_intensity = AUTO_ENHANCE_SHADOW_DETECT_MIN_INTENSITY;
-#line 13323 "ColorTransformation.c"
+#line 13597 "ColorTransformation.c"
 	{
 		gboolean _tmp11_ = FALSE;
-#line 1474 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1518 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp11_ = TRUE;
-#line 1474 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1518 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		while (TRUE) {
-#line 13330 "ColorTransformation.c"
+#line 13604 "ColorTransformation.c"
 			gint _tmp13_ = 0;
 			IntensityHistogram* _tmp14_ = NULL;
 			gint _tmp15_ = 0;
 			gfloat _tmp16_ = 0.0F;
 			gfloat _tmp17_ = 0.0F;
-#line 1474 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1518 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			if (!_tmp11_) {
-#line 13338 "ColorTransformation.c"
+#line 13612 "ColorTransformation.c"
 				gint _tmp12_ = 0;
-#line 1474 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1518 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp12_ = shadow_mean_intensity;
-#line 1474 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1518 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				shadow_mean_intensity = _tmp12_ + 1;
-#line 13344 "ColorTransformation.c"
+#line 13618 "ColorTransformation.c"
 			}
-#line 1474 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1518 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp11_ = FALSE;
-#line 1474 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1518 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp13_ = shadow_mean_intensity;
-#line 1474 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1518 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			if (!(_tmp13_ <= AUTO_ENHANCE_SHADOW_DETECT_MAX_INTENSITY)) {
-#line 1474 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1518 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				break;
-#line 13354 "ColorTransformation.c"
+#line 13628 "ColorTransformation.c"
 			}
-#line 1475 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1519 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp14_ = analysis_histogram;
-#line 1475 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1519 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp15_ = shadow_mean_intensity;
-#line 1475 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1519 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp16_ = intensity_histogram_get_cumulative_probability (_tmp14_, _tmp15_);
-#line 1475 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1519 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp17_ = shadow_range_mean_prob_val;
-#line 1475 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1519 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			if (_tmp16_ >= _tmp17_) {
-#line 1476 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1520 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				break;
-#line 13368 "ColorTransformation.c"
+#line 13642 "ColorTransformation.c"
 			}
 		}
 	}
-#line 1484 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1528 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp19_ = pct_in_range;
-#line 1484 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1528 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (_tmp19_ > 40.0f) {
-#line 1484 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1528 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp18_ = TRUE;
-#line 13378 "ColorTransformation.c"
+#line 13652 "ColorTransformation.c"
 	} else {
 		gboolean _tmp20_ = FALSE;
 		gfloat _tmp21_ = 0.0F;
-#line 1484 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1528 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp21_ = pct_in_range;
-#line 1484 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1528 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		if (_tmp21_ > 20.0f) {
-#line 13386 "ColorTransformation.c"
+#line 13660 "ColorTransformation.c"
 			gint _tmp22_ = 0;
-#line 1484 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1528 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp22_ = shadow_mean_intensity;
-#line 1484 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1528 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp20_ = _tmp22_ < AUTO_ENHANCE_EMPIRICAL_DARK;
-#line 13392 "ColorTransformation.c"
+#line 13666 "ColorTransformation.c"
 		} else {
-#line 1484 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1528 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp20_ = FALSE;
-#line 13396 "ColorTransformation.c"
+#line 13670 "ColorTransformation.c"
 		}
-#line 1484 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1528 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp18_ = _tmp20_;
-#line 13400 "ColorTransformation.c"
+#line 13674 "ColorTransformation.c"
 	}
-#line 1484 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1528 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	if (_tmp18_) {
-#line 13404 "ColorTransformation.c"
+#line 13678 "ColorTransformation.c"
 		gfloat shadow_trans_effect_size = 0.0F;
 		gint _tmp23_ = 0;
 		gfloat _tmp24_ = 0.0F;
@@ -13418,87 +13692,87 @@ PixelTransformationBundle* auto_enhance_create_auto_enhance_adjustments (GdkPixb
 		gint _tmp36_ = 0;
 		ExpansionTransformation* _tmp37_ = NULL;
 		ExpansionTransformation* _tmp38_ = NULL;
-#line 1485 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1529 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp23_ = shadow_mean_intensity;
-#line 1485 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1529 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		shadow_trans_effect_size = ((((gfloat) AUTO_ENHANCE_SHADOW_DETECT_MAX_INTENSITY) - ((gfloat) _tmp23_)) / ((gfloat) AUTO_ENHANCE_SHADOW_DETECT_INTENSITY_RANGE)) * SHADOW_DETAIL_TRANSFORMATION_MAX_PARAMETER;
-#line 1489 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1533 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp24_ = shadow_trans_effect_size;
-#line 1489 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1533 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		shadow_trans_effect_size = _tmp24_ * AUTO_ENHANCE_SHADOW_AGGRESSIVENESS_MUL;
-#line 1491 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1535 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp25_ = adjustments;
-#line 1491 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1535 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp26_ = shadow_trans_effect_size;
-#line 1491 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1535 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp27_ = shadow_detail_transformation_new (_tmp26_);
-#line 1491 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1535 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp28_ = _tmp27_;
-#line 1491 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1535 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		pixel_transformation_bundle_set (_tmp25_, G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, TYPE_PIXEL_TRANSFORMATION, PixelTransformation));
-#line 1491 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1535 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_pixel_transformation_unref0 (_tmp28_);
-#line 1495 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1539 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		discard_point = 255;
-#line 13439 "ColorTransformation.c"
+#line 13713 "ColorTransformation.c"
 		{
 			gboolean _tmp29_ = FALSE;
-#line 1496 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1540 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			_tmp29_ = TRUE;
-#line 1496 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1540 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 			while (TRUE) {
-#line 13446 "ColorTransformation.c"
+#line 13720 "ColorTransformation.c"
 				gint _tmp31_ = 0;
 				IntensityHistogram* _tmp32_ = NULL;
 				gint _tmp33_ = 0;
 				gfloat _tmp34_ = 0.0F;
-#line 1496 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1540 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				if (!_tmp29_) {
-#line 13453 "ColorTransformation.c"
+#line 13727 "ColorTransformation.c"
 					gint _tmp30_ = 0;
-#line 1496 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1540 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					_tmp30_ = discard_point;
-#line 1496 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1540 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					discard_point = _tmp30_ - 1;
-#line 13459 "ColorTransformation.c"
+#line 13733 "ColorTransformation.c"
 				}
-#line 1496 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1540 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp29_ = FALSE;
-#line 1496 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1540 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp31_ = discard_point;
-#line 1496 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1540 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				if (!(_tmp31_ > -1)) {
-#line 1496 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1540 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					break;
-#line 13469 "ColorTransformation.c"
+#line 13743 "ColorTransformation.c"
 				}
-#line 1497 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1541 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp32_ = analysis_histogram;
-#line 1497 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1541 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp33_ = discard_point;
-#line 1497 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1541 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				_tmp34_ = intensity_histogram_get_cumulative_probability (_tmp32_, _tmp33_);
-#line 1497 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1541 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 				if ((1.0f - _tmp34_) > AUTO_ENHANCE_SHADOW_MODE_HIGH_DISCARD_MASS) {
-#line 1499 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1543 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 					break;
-#line 13481 "ColorTransformation.c"
+#line 13755 "ColorTransformation.c"
 				}
 			}
 		}
-#line 1502 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1546 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp35_ = adjustments;
-#line 1502 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1546 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp36_ = discard_point;
-#line 1502 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1546 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp37_ = expansion_transformation_new_from_extrema (0, _tmp36_);
-#line 1502 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1546 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp38_ = _tmp37_;
-#line 1502 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1546 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		pixel_transformation_bundle_set (_tmp35_, G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, TYPE_PIXEL_TRANSFORMATION, PixelTransformation));
-#line 1502 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1546 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_pixel_transformation_unref0 (_tmp38_);
-#line 13497 "ColorTransformation.c"
+#line 13771 "ColorTransformation.c"
 	} else {
 		PixelTransformationBundle* _tmp39_ = NULL;
 		IntensityHistogram* _tmp40_ = NULL;
@@ -13507,87 +13781,97 @@ PixelTransformationBundle* auto_enhance_create_auto_enhance_adjustments (GdkPixb
 		PixelTransformationBundle* _tmp43_ = NULL;
 		ShadowDetailTransformation* _tmp44_ = NULL;
 		ShadowDetailTransformation* _tmp45_ = NULL;
-#line 1505 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1549 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp39_ = adjustments;
-#line 1505 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1549 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp40_ = analysis_histogram;
-#line 1505 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1549 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp41_ = expansion_transformation_new (_tmp40_);
-#line 1505 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1549 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp42_ = _tmp41_;
-#line 1505 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1549 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		pixel_transformation_bundle_set (_tmp39_, G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, TYPE_PIXEL_TRANSFORMATION, PixelTransformation));
-#line 1505 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1549 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_pixel_transformation_unref0 (_tmp42_);
-#line 1506 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1550 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp43_ = adjustments;
-#line 1506 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1550 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp44_ = shadow_detail_transformation_new ((gfloat) 0);
-#line 1506 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1550 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_tmp45_ = _tmp44_;
-#line 1506 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1550 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		pixel_transformation_bundle_set (_tmp43_, G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, TYPE_PIXEL_TRANSFORMATION, PixelTransformation));
-#line 1506 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1550 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 		_pixel_transformation_unref0 (_tmp45_);
-#line 13528 "ColorTransformation.c"
+#line 13802 "ColorTransformation.c"
 	}
-#line 1510 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1554 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp46_ = adjustments;
-#line 1510 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1554 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp47_ = highlight_detail_transformation_new (0.0f);
-#line 1510 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1554 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp48_ = _tmp47_;
-#line 1510 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1554 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	pixel_transformation_bundle_set (_tmp46_, G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, TYPE_PIXEL_TRANSFORMATION, PixelTransformation));
-#line 1510 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1554 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_pixel_transformation_unref0 (_tmp48_);
-#line 1511 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1555 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp49_ = adjustments;
-#line 1511 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1555 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp50_ = temperature_transformation_new (0.0f);
-#line 1511 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1555 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp51_ = _tmp50_;
-#line 1511 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1555 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	pixel_transformation_bundle_set (_tmp49_, G_TYPE_CHECK_INSTANCE_CAST (_tmp51_, TYPE_PIXEL_TRANSFORMATION, PixelTransformation));
-#line 1511 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1555 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_pixel_transformation_unref0 (_tmp51_);
-#line 1512 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1556 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp52_ = adjustments;
-#line 1512 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1556 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp53_ = tint_transformation_new (0.0f);
-#line 1512 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1556 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp54_ = _tmp53_;
-#line 1512 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1556 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	pixel_transformation_bundle_set (_tmp52_, G_TYPE_CHECK_INSTANCE_CAST (_tmp54_, TYPE_PIXEL_TRANSFORMATION, PixelTransformation));
-#line 1512 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1556 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_pixel_transformation_unref0 (_tmp54_);
-#line 1513 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1557 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp55_ = adjustments;
-#line 1513 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1557 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp56_ = exposure_transformation_new (0.0f);
-#line 1513 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1557 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp57_ = _tmp56_;
-#line 1513 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1557 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	pixel_transformation_bundle_set (_tmp55_, G_TYPE_CHECK_INSTANCE_CAST (_tmp57_, TYPE_PIXEL_TRANSFORMATION, PixelTransformation));
-#line 1513 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1557 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_pixel_transformation_unref0 (_tmp57_);
-#line 1514 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1558 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp58_ = adjustments;
-#line 1514 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
-	_tmp59_ = saturation_transformation_new (0.0f);
-#line 1514 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1558 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	_tmp59_ = contrast_transformation_new (0.0f);
+#line 1558 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_tmp60_ = _tmp59_;
-#line 1514 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1558 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	pixel_transformation_bundle_set (_tmp58_, G_TYPE_CHECK_INSTANCE_CAST (_tmp60_, TYPE_PIXEL_TRANSFORMATION, PixelTransformation));
-#line 1514 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1558 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_pixel_transformation_unref0 (_tmp60_);
-#line 1516 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1559 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	_tmp61_ = adjustments;
+#line 1559 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	_tmp62_ = saturation_transformation_new (0.0f);
+#line 1559 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	_tmp63_ = _tmp62_;
+#line 1559 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	pixel_transformation_bundle_set (_tmp61_, G_TYPE_CHECK_INSTANCE_CAST (_tmp63_, TYPE_PIXEL_TRANSFORMATION, PixelTransformation));
+#line 1559 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+	_pixel_transformation_unref0 (_tmp63_);
+#line 1561 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	result = adjustments;
-#line 1516 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1561 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	_intensity_histogram_unref0 (analysis_histogram);
-#line 1516 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
+#line 1561 "/home/jens/Source/shotwell/src/ColorTransformation.vala"
 	return result;
-#line 13586 "ColorTransformation.c"
+#line 13870 "ColorTransformation.c"
 }
 
 
diff --git a/src/ColorTransformation.vala b/src/ColorTransformation.vala
index a7b7452..435d3f4 100644
--- a/src/ColorTransformation.vala
+++ b/src/ColorTransformation.vala
@@ -227,7 +227,8 @@ public enum PixelTransformationType {
     TEMPERATURE,
     TINT,
     SATURATION,
-    EXPOSURE
+    EXPOSURE,
+    CONTRAST
 }
 
 public class PixelTransformationBundle {
@@ -263,6 +264,7 @@ public class PixelTransformationBundle {
         set(new TintTransformation(0.0f));
         set(new SaturationTransformation(0.0f));
         set(new ExposureTransformation(0.0f));
+        set(new ContrastTransformation(0.0f));
     }
     
     public void load(KeyValueMap store) {
@@ -278,6 +280,7 @@ public class PixelTransformationBundle {
         set(new TintTransformation(store.get_float("tint", 0.0f)));
         set(new SaturationTransformation(store.get_float("saturation", 0.0f)));
         set(new ExposureTransformation(store.get_float("exposure", 0.0f)));
+        set(new ContrastTransformation(store.get_float("contrast", 0.0f)));
     }
     
     public KeyValueMap save(string group) {
@@ -318,6 +321,11 @@ public class PixelTransformationBundle {
         assert(new_exposure_trans != null);
         store.set_float("exposure", new_exposure_trans.get_parameter());
         
+        ContrastTransformation? new_contrast_trans =
+            (ContrastTransformation) get_transformation(PixelTransformationType.CONTRAST);
+        assert(new_contrast_trans != null);
+        store.set_float("contrast", new_contrast_trans.get_parameter());
+
         return store;
     }
     
@@ -728,6 +736,42 @@ public class ExposureTransformation : RGBTransformation {
     }
 }
 
+public class ContrastTransformation : RGBTransformation {
+    public const float MIN_PARAMETER = -16.0f;
+    public const float MAX_PARAMETER = 16.0f;
+
+    const float MAX_CONTRAST_ADJUSTMENT = 0.5f;  // must be less than 1.0
+
+    float parameter;
+
+    public ContrastTransformation(float client_parameter) {
+        base(PixelTransformationType.CONTRAST);
+
+        parameter = client_parameter.clamp(MIN_PARAMETER, MAX_PARAMETER);
+
+        if (parameter != 0.0f) {
+
+            float contrast_adjustment = (parameter / 16.0f) * MAX_CONTRAST_ADJUSTMENT;
+            float component_coefficient = 1.0f + contrast_adjustment;
+            float component_offset = contrast_adjustment / -2.0f;
+
+            matrix_entries[0] = component_coefficient;
+            matrix_entries[5] = component_coefficient;
+            matrix_entries[10] = component_coefficient;
+
+            matrix_entries[3] = component_offset;
+            matrix_entries[7] = component_offset;
+            matrix_entries[11] = component_offset;
+
+            identity = false;
+        }
+    }
+
+    public float get_parameter() {
+        return parameter;
+    }
+}
+
 public class PixelTransformer {
     private Gee.ArrayList<PixelTransformation> transformations =
         new Gee.ArrayList<PixelTransformation>();
@@ -1511,6 +1555,7 @@ public PixelTransformationBundle create_auto_enhance_adjustments(Gdk.Pixbuf pixb
     adjustments.set(new TemperatureTransformation(0.0f));
     adjustments.set(new TintTransformation(0.0f));
     adjustments.set(new ExposureTransformation(0.0f));
+    adjustments.set(new ContrastTransformation(0.0f));
     adjustments.set(new SaturationTransformation(0.0f));
     
     return adjustments;
diff --git a/src/Commands.c b/src/Commands.c
index 1e59698..8005488 100644
--- a/src/Commands.c
+++ b/src/Commands.c
@@ -2277,7 +2277,7 @@ enum  {
 EnhanceSingleCommand* enhance_single_command_new (Photo* photo);
 EnhanceSingleCommand* enhance_single_command_construct (GType object_type, Photo* photo);
 #define RESOURCES_ENHANCE_LABEL _ ("Enhance")
-#define RESOURCES_ENHANCE_TOOLTIP _ ("Automatically improve the photo's appearance")
+#define RESOURCES_ENHANCE_TOOLTIP _ ("Automatically improve the photo’s appearance")
 static void enhance_single_command_real_execute_on_photo (GenericPhotoTransformationCommand* base, Photo* photo);
 gboolean photo_enhance (Photo* self);
 static gboolean enhance_single_command_real_compress (Command* base, Command* command);
@@ -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 __catch444_database_error;
+				goto __catch457_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 __finally444;
-	__catch444_database_error:
+	goto __finally457;
+	__catch457_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"
 	}
-	__finally444:
+	__finally457:
 	{
 		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 __catch445_database_error;
+				goto __catch458_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 __finally445;
-	__catch445_database_error:
+	goto __finally458;
+	__catch458_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"
 	}
-	__finally445:
+	__finally458:
 	{
 		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 __catch446_g_error;
+			goto __catch459_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 __finally446;
-	__catch446_g_error:
+	goto __finally459;
+	__catch459_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"
 	}
-	__finally446:
+	__finally459:
 #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 __catch447_g_error;
+				goto __catch460_g_error;
 			}
 		}
-		goto __finally447;
-		__catch447_g_error:
+		goto __finally460;
+		__catch460_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"
 		}
-		__finally447:
+		__finally460:
 #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 __catch448_g_error;
+				goto __catch461_g_error;
 			}
 		}
-		goto __finally448;
-		__catch448_g_error:
+		goto __finally461;
+		__catch461_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"
 		}
-		__finally448:
+		__finally461:
 #line 1434 "/home/jens/Source/shotwell/src/Commands.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1434 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -14262,7 +14262,7 @@ ReparentTagCommand* reparent_tag_command_construct (GType object_type, Tag* tag,
 #line 1694 "/home/jens/Source/shotwell/src/Commands.vala"
 	g_return_val_if_fail (new_parent_path != NULL, NULL);
 #line 1695 "/home/jens/Source/shotwell/src/Commands.vala"
-	_tmp0_ = _ ("Move Tag \"%s\"");
+	_tmp0_ = _ ("Move Tag “%s”");
 #line 1695 "/home/jens/Source/shotwell/src/Commands.vala"
 	_tmp1_ = tag;
 #line 1695 "/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 __catch449_g_regex_error;
+				goto __catch462_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 __catch449_g_regex_error;
+				goto __catch462_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 __finally449;
-	__catch449_g_regex_error:
+	goto __finally462;
+	__catch462_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"
 	}
-	__finally449:
+	__finally462:
 #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/Commands.vala b/src/Commands.vala
index d922c7d..73e6c8d 100644
--- a/src/Commands.vala
+++ b/src/Commands.vala
@@ -1692,7 +1692,7 @@ public class ReparentTagCommand : PageCommand {
     bool to_path_exists = false;
     
     public ReparentTagCommand(Tag tag, string new_parent_path) {
-        base (_("Move Tag \"%s\"").printf(tag.get_user_visible_name()), "");
+        base (_("Move Tag “%s”").printf(tag.get_user_visible_name()), "");
 
         this.from_path = tag.get_path();
 
diff --git a/src/Debug.c b/src/Debug.c
index afacca4..253bd51 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 __catch421_g_error;
+					goto __catch434_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 __finally421;
-		__catch421_g_error:
+		goto __finally434;
+		__catch434_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"
 		}
-		__finally421:
+		__finally434:
 #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 26190e3..1b5019f 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 __catch554_g_error;
+			goto __catch567_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 __finally554;
-	__catch554_g_error:
+	goto __finally567;
+	__catch567_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"
 	}
-	__finally554:
+	__finally567:
 #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 __catch555_g_error;
+			goto __catch568_g_error;
 		}
 	}
-	goto __finally555;
-	__catch555_g_error:
+	goto __finally568;
+	__catch568_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"
 	}
-	__finally555:
+	__finally568:
 #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 __catch556_g_error;
+			goto __catch569_g_error;
 		}
 	}
-	goto __finally556;
-	__catch556_g_error:
+	goto __finally569;
+	__catch569_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"
 	}
-	__finally556:
+	__finally569:
 #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 __catch557_g_error;
+			goto __catch570_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 __catch557_g_error;
+						goto __catch570_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 __catch557_g_error;
+			goto __catch570_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 __finally557;
-	__catch557_g_error:
+	goto __finally570;
+	__catch570_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"
 	}
-	__finally557:
+	__finally570:
 #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 7f02943..0820882 100644
--- a/src/Dialogs.c
+++ b/src/Dialogs.c
@@ -17,9 +17,9 @@
 #include <gtk/gtk.h>
 #include <gio/gio.h>
 #include <gee.h>
+#include <gdk/gdk.h>
 #include <float.h>
 #include <math.h>
-#include <gdk/gdk.h>
 #include <time.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include <gobject/gvaluecollector.h>
@@ -149,6 +149,26 @@ typedef struct _ExportDialogPrivate ExportDialogPrivate;
 #define JPEG_TYPE_QUALITY (jpeg_quality_get_type ())
 typedef struct _ExportFormatParameters ExportFormatParameters;
 
+#define TYPE_CONFIGURATION_FACADE (configuration_facade_get_type ())
+#define CONFIGURATION_FACADE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_CONFIGURATION_FACADE, ConfigurationFacade))
+#define CONFIGURATION_FACADE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_CONFIGURATION_FACADE, ConfigurationFacadeClass))
+#define IS_CONFIGURATION_FACADE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_CONFIGURATION_FACADE))
+#define IS_CONFIGURATION_FACADE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_CONFIGURATION_FACADE))
+#define CONFIGURATION_FACADE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_CONFIGURATION_FACADE, ConfigurationFacadeClass))
+
+typedef struct _ConfigurationFacade ConfigurationFacade;
+typedef struct _ConfigurationFacadeClass ConfigurationFacadeClass;
+
+#define CONFIG_TYPE_FACADE (config_facade_get_type ())
+#define CONFIG_FACADE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), CONFIG_TYPE_FACADE, ConfigFacade))
+#define CONFIG_FACADE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), CONFIG_TYPE_FACADE, ConfigFacadeClass))
+#define CONFIG_IS_FACADE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), CONFIG_TYPE_FACADE))
+#define CONFIG_IS_FACADE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), CONFIG_TYPE_FACADE))
+#define CONFIG_FACADE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), CONFIG_TYPE_FACADE, ConfigFacadeClass))
+
+typedef struct _ConfigFacade ConfigFacade;
+typedef struct _ConfigFacadeClass ConfigFacadeClass;
+
 #define TYPE_PHOTO_FILE_FORMAT_PROPERTIES (photo_file_format_properties_get_type ())
 #define PHOTO_FILE_FORMAT_PROPERTIES(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_PHOTO_FILE_FORMAT_PROPERTIES, PhotoFileFormatProperties))
 #define PHOTO_FILE_FORMAT_PROPERTIES_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_PHOTO_FILE_FORMAT_PROPERTIES, PhotoFileFormatPropertiesClass))
@@ -375,26 +395,6 @@ typedef struct _AdjustDateTimeDialogPrivate AdjustDateTimeDialogPrivate;
 typedef struct _Dateable Dateable;
 typedef struct _DateableIface DateableIface;
 
-#define TYPE_CONFIGURATION_FACADE (configuration_facade_get_type ())
-#define CONFIGURATION_FACADE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_CONFIGURATION_FACADE, ConfigurationFacade))
-#define CONFIGURATION_FACADE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_CONFIGURATION_FACADE, ConfigurationFacadeClass))
-#define IS_CONFIGURATION_FACADE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_CONFIGURATION_FACADE))
-#define IS_CONFIGURATION_FACADE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_CONFIGURATION_FACADE))
-#define CONFIGURATION_FACADE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_CONFIGURATION_FACADE, ConfigurationFacadeClass))
-
-typedef struct _ConfigurationFacade ConfigurationFacade;
-typedef struct _ConfigurationFacadeClass ConfigurationFacadeClass;
-
-#define CONFIG_TYPE_FACADE (config_facade_get_type ())
-#define CONFIG_FACADE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), CONFIG_TYPE_FACADE, ConfigFacade))
-#define CONFIG_FACADE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), CONFIG_TYPE_FACADE, ConfigFacadeClass))
-#define CONFIG_IS_FACADE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), CONFIG_TYPE_FACADE))
-#define CONFIG_IS_FACADE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), CONFIG_TYPE_FACADE))
-#define CONFIG_FACADE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), CONFIG_TYPE_FACADE, ConfigFacadeClass))
-
-typedef struct _ConfigFacade ConfigFacade;
-typedef struct _ConfigFacadeClass ConfigFacadeClass;
-
 #define TYPE_TAGS_DIALOG (tags_dialog_get_type ())
 #define TAGS_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_TAGS_DIALOG, TagsDialog))
 #define TAGS_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_TAGS_DIALOG, TagsDialogClass))
@@ -646,7 +646,7 @@ struct _ExportDialogPrivate {
 	GtkComboBoxText* quality_combo;
 	GtkComboBoxText* constraint_combo;
 	GtkComboBoxText* format_combo;
-	GtkCheckButton* export_metadata;
+	GtkSwitch* export_metadata;
 	GeeArrayList* format_options;
 	GtkEntry* pixels_entry;
 	GtkWidget* ok_button;
@@ -1168,8 +1168,6 @@ AppWindow* app_window_get_instance (void);
 GFile* export_ui_choose_file (const gchar* current_file_basename);
 gboolean video_reader_is_supported_video_filename (const gchar* filename);
 #define RESOURCES_SAVE_LABEL _ ("_Save")
-void suppress_warnings (const gchar* log_domain, GLogLevelFlags log_levels, const gchar* message);
-static void _suppress_warnings_glog_func (const gchar* log_domain, GLogLevelFlags log_levels, const gchar* message, gpointer self);
 GFile* export_ui_choose_dir (const gchar* user_title);
 #define RESOURCES_OK_LABEL _ ("_OK")
 GType thumbnail_source_get_type (void) G_GNUC_CONST;
@@ -1201,6 +1199,15 @@ void export_format_parameters_current (ExportFormatParameters* result);
 #define EXPORT_DIALOG_CURRENT_FORMAT_LABEL _ ("Current")
 ExportDialog* export_dialog_new (const gchar* title);
 ExportDialog* export_dialog_construct (GType object_type, const gchar* title);
+GType configuration_facade_get_type (void) G_GNUC_CONST;
+GType config_facade_get_type (void) G_GNUC_CONST;
+ConfigFacade* config_facade_get_instance (void);
+ExportFormatMode configuration_facade_get_export_export_format_mode (ConfigurationFacade* self);
+PhotoFileFormat configuration_facade_get_export_photo_file_format (ConfigurationFacade* self);
+JpegQuality configuration_facade_get_export_quality (ConfigurationFacade* self);
+gboolean configuration_facade_get_export_export_metadata (ConfigurationFacade* self);
+ScaleConstraint configuration_facade_get_export_constraint (ConfigurationFacade* self);
+gint configuration_facade_get_export_scale (ConfigurationFacade* self);
 gchar* jpeg_quality_to_string (JpegQuality self);
 gchar* scale_constraint_to_string (ScaleConstraint self);
 static void export_dialog_format_add_option (ExportDialog* self, const gchar* format_name);
@@ -1232,9 +1239,15 @@ static gchar* export_dialog_get_label_for_parameters (ExportDialog* self, Export
 gboolean export_dialog_execute (ExportDialog* self, gint* scale, ScaleConstraint* constraint, ExportFormatParameters* parameters);
 gboolean photo_file_format_can_write (PhotoFileFormat self);
 PhotoFileFormat photo_file_format_get_system_default_format (void);
+void configuration_facade_set_export_export_format_mode (ConfigurationFacade* self, ExportFormatMode export_format_mode);
+void configuration_facade_set_export_photo_file_format (ConfigurationFacade* self, PhotoFileFormat photo_file_format);
+void configuration_facade_set_export_quality (ConfigurationFacade* self, JpegQuality quality);
+void configuration_facade_set_export_export_metadata (ConfigurationFacade* self, gboolean export_metadata);
+void configuration_facade_set_export_constraint (ConfigurationFacade* self, ScaleConstraint constraint);
+void configuration_facade_set_export_scale (ConfigurationFacade* self, gint scale);
 static void export_dialog_finalize (GObject* obj);
 #define IMPORT_UI_REPORT_FAILURE_COUNT 4
-#define IMPORT_UI_SAVE_RESULTS_BUTTON_NAME _ ("Save Details...")
+#define IMPORT_UI_SAVE_RESULTS_BUTTON_NAME _ ("Save Details…")
 #define IMPORT_UI_SAVE_RESULTS_FILE_CHOOSER_TITLE _ ("Save Details")
 #define IMPORT_UI_SAVE_RESULTS_RESPONSE_ID 1024
 gpointer batch_import_result_ref (gpointer instance);
@@ -1469,9 +1482,6 @@ static void _adjust_date_time_dialog_on_time_changed_gtk_calendar_day_selected (
 static void _adjust_date_time_dialog_on_time_changed_gtk_calendar_month_changed (GtkCalendar* _sender, gpointer self);
 static void _adjust_date_time_dialog_on_time_changed_gtk_calendar_next_year (GtkCalendar* _sender, gpointer self);
 static void _adjust_date_time_dialog_on_time_changed_gtk_calendar_prev_year (GtkCalendar* _sender, gpointer self);
-GType configuration_facade_get_type (void) G_GNUC_CONST;
-GType config_facade_get_type (void) G_GNUC_CONST;
-ConfigFacade* config_facade_get_instance (void);
 gboolean configuration_facade_get_use_24_hour_time (ConfigurationFacade* self);
 static gboolean adjust_date_time_dialog_on_spin_button_output (AdjustDateTimeDialog* self, GtkSpinButton* button);
 static gboolean _adjust_date_time_dialog_on_spin_button_output_gtk_spin_button_output (GtkSpinButton* _sender, gpointer self);
@@ -1742,12 +1752,12 @@ gboolean dialogs_confirm_delete_tag (Tag* tag) {
 		result = TRUE;
 #line 14 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		return result;
-#line 1746 "Dialogs.c"
+#line 1756 "Dialogs.c"
 	}
 #line 15 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = count;
 #line 15 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp4_ = ngettext ("This will remove the tag \"%s\" from one photo.  Continue?", "This will remove the tag \"%s\" from %d photos.  Continue?", (gulong) _tmp3_);
+	_tmp4_ = ngettext ("This will remove the tag “%s” from one photo. Continue?", "This will remove the tag “%s” from %d photos. Continue?", (gulong) _tmp3_);
 #line 15 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp5_ = tag;
 #line 15 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -1778,7 +1788,7 @@ gboolean dialogs_confirm_delete_tag (Tag* tag) {
 	_g_free0 (msg);
 #line 20 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 1782 "Dialogs.c"
+#line 1792 "Dialogs.c"
 }
 
 
@@ -1797,7 +1807,7 @@ gboolean dialogs_confirm_delete_saved_search (SavedSearch* search) {
 #line 24 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (IS_SAVED_SEARCH (search), FALSE);
 #line 25 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp0_ = _ ("This will remove the saved search \"%s\".  Continue?");
+	_tmp0_ = _ ("This will remove the saved search “%s”. Continue?");
 #line 25 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = search;
 #line 25 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -1824,7 +1834,7 @@ gboolean dialogs_confirm_delete_saved_search (SavedSearch* search) {
 	_g_free0 (msg);
 #line 28 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 1828 "Dialogs.c"
+#line 1838 "Dialogs.c"
 }
 
 
@@ -1878,14 +1888,7 @@ gboolean dialogs_confirm_warn_developer_changed (gint number) {
 	_g_object_unref0 (dialog);
 #line 46 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 1880 "Dialogs.c"
-}
-
-
-static void _suppress_warnings_glog_func (const gchar* log_domain, GLogLevelFlags log_levels, const gchar* message, gpointer self) {
-#line 71 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	suppress_warnings (log_domain, log_levels, message);
-#line 1887 "Dialogs.c"
+#line 1890 "Dialogs.c"
 }
 
 
@@ -1914,16 +1917,14 @@ GFile* export_ui_choose_file (const gchar* current_file_basename) {
 	GFile* file = NULL;
 	GtkFileChooserDialog* _tmp22_ = NULL;
 	gint _tmp23_ = 0;
-	GLogFunc _tmp30_ = NULL;
-	void* _tmp30__target = NULL;
-	GtkFileChooserDialog* _tmp31_ = NULL;
+	GtkFileChooserDialog* _tmp30_ = NULL;
 #line 54 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (current_file_basename != NULL, NULL);
 #line 55 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = export_ui_current_export_dir;
 #line 55 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp0_ == NULL) {
-#line 1925 "Dialogs.c"
+#line 1926 "Dialogs.c"
 		const gchar* _tmp1_ = NULL;
 		GFile* _tmp2_ = NULL;
 #line 56 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -1934,7 +1935,7 @@ GFile* export_ui_choose_file (const gchar* current_file_basename) {
 		_g_object_unref0 (export_ui_current_export_dir);
 #line 56 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		export_ui_current_export_dir = _tmp2_;
-#line 1936 "Dialogs.c"
+#line 1937 "Dialogs.c"
 	}
 #line 58 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp4_ = current_file_basename;
@@ -1942,20 +1943,20 @@ GFile* export_ui_choose_file (const gchar* current_file_basename) {
 	_tmp5_ = video_reader_is_supported_video_filename (_tmp4_);
 #line 58 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp5_) {
-#line 1944 "Dialogs.c"
+#line 1945 "Dialogs.c"
 		const gchar* _tmp6_ = NULL;
 #line 59 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp6_ = _ ("Export Video");
 #line 59 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp3_ = _tmp6_;
-#line 1950 "Dialogs.c"
+#line 1951 "Dialogs.c"
 	} else {
 		const gchar* _tmp7_ = NULL;
 #line 59 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp7_ = _ ("Export Photo");
 #line 59 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp3_ = _tmp7_;
-#line 1957 "Dialogs.c"
+#line 1958 "Dialogs.c"
 	}
 #line 58 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp8_ = g_strdup (_tmp3_);
@@ -2003,73 +2004,65 @@ GFile* export_ui_choose_file (const gchar* current_file_basename) {
 	_tmp21_ = chooser;
 #line 67 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_file_chooser_set_local_only (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser), FALSE);
-#line 71 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_log_set_handler ("Gtk", G_LOG_LEVEL_WARNING, _suppress_warnings_glog_func, NULL);
-#line 72 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 69 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	file = NULL;
-#line 73 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 70 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp22_ = chooser;
-#line 73 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 70 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp23_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, gtk_dialog_get_type (), GtkDialog));
-#line 73 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 70 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp23_ == ((gint) GTK_RESPONSE_ACCEPT)) {
-#line 2015 "Dialogs.c"
+#line 2014 "Dialogs.c"
 		GtkFileChooserDialog* _tmp24_ = NULL;
 		gchar* _tmp25_ = NULL;
 		gchar* _tmp26_ = NULL;
 		GFile* _tmp27_ = NULL;
 		GFile* _tmp28_ = NULL;
 		GFile* _tmp29_ = NULL;
-#line 74 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 71 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp24_ = chooser;
-#line 74 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 71 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp25_ = gtk_file_chooser_get_filename (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser));
-#line 74 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 71 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp26_ = _tmp25_;
-#line 74 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 71 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp27_ = g_file_new_for_path (_tmp26_);
-#line 74 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 71 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (file);
-#line 74 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 71 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		file = _tmp27_;
-#line 74 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 71 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (_tmp26_);
-#line 75 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 72 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp28_ = file;
-#line 75 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 72 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp29_ = g_file_get_parent (_tmp28_);
-#line 75 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 72 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (export_ui_current_export_dir);
-#line 75 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 72 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		export_ui_current_export_dir = _tmp29_;
-#line 2044 "Dialogs.c"
-	}
-#line 77 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp30_ = g_log_default_handler;
-#line 77 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp30__target = NULL;
-#line 77 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_log_set_handler ("Gtk", G_LOG_LEVEL_WARNING, _tmp30_, _tmp30__target);
-#line 78 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp31_ = chooser;
-#line 78 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, gtk_widget_get_type (), GtkWidget));
-#line 80 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2043 "Dialogs.c"
+	}
+#line 74 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp30_ = chooser;
+#line 74 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, gtk_widget_get_type (), GtkWidget));
+#line 76 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	result = file;
-#line 80 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 76 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (chooser);
-#line 80 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 76 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (file_chooser_title);
-#line 80 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 76 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 2064 "Dialogs.c"
+#line 2057 "Dialogs.c"
 }
 
 
 static gpointer _g_object_ref0 (gpointer self) {
-#line 99 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 95 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 2071 "Dialogs.c"
+#line 2064 "Dialogs.c"
 }
 
 
@@ -2092,143 +2085,143 @@ GFile* export_ui_choose_dir (const gchar* user_title) {
 	GtkFileChooserDialog* _tmp15_ = NULL;
 	gint _tmp16_ = 0;
 	GtkFileChooserDialog* _tmp23_ = NULL;
-#line 84 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 80 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = export_ui_current_export_dir;
-#line 84 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 80 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp0_ == NULL) {
-#line 2098 "Dialogs.c"
+#line 2091 "Dialogs.c"
 		const gchar* _tmp1_ = NULL;
 		GFile* _tmp2_ = NULL;
-#line 85 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 81 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp1_ = g_get_home_dir ();
-#line 85 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 81 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp2_ = g_file_new_for_path (_tmp1_);
-#line 85 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 81 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (export_ui_current_export_dir);
-#line 85 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 81 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		export_ui_current_export_dir = _tmp2_;
-#line 2109 "Dialogs.c"
+#line 2102 "Dialogs.c"
 	}
-#line 87 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 83 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = user_title;
-#line 87 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 83 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp3_ == NULL) {
-#line 2115 "Dialogs.c"
+#line 2108 "Dialogs.c"
 		const gchar* _tmp4_ = NULL;
-#line 88 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 84 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp4_ = _ ("Export Photos");
-#line 88 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 84 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		user_title = _tmp4_;
-#line 2121 "Dialogs.c"
+#line 2114 "Dialogs.c"
 	}
-#line 90 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 86 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp5_ = user_title;
-#line 90 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 86 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp6_ = app_window_get_instance ();
-#line 90 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 86 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp7_ = _tmp6_;
-#line 90 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 86 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp8_ = (GtkFileChooserDialog*) gtk_file_chooser_dialog_new (_tmp5_, G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_window_get_type (), GtkWindow), GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER, RESOURCES_CANCEL_LABEL, GTK_RESPONSE_CANCEL, RESOURCES_OK_LABEL, GTK_RESPONSE_ACCEPT, NULL, NULL);
-#line 90 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 86 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_object_ref_sink (_tmp8_);
-#line 90 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 86 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp9_ = _tmp8_;
-#line 90 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 86 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (_tmp7_);
-#line 90 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 86 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	chooser = _tmp9_;
-#line 93 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 89 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp10_ = chooser;
-#line 93 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 89 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp11_ = export_ui_current_export_dir;
-#line 93 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 89 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp12_ = g_file_get_path (_tmp11_);
-#line 93 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 89 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp13_ = _tmp12_;
-#line 93 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 89 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_file_chooser_set_current_folder (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser), _tmp13_);
-#line 93 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 89 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (_tmp13_);
-#line 94 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 90 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp14_ = chooser;
-#line 94 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 90 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_file_chooser_set_local_only (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser), FALSE);
-#line 96 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 92 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	dir = NULL;
-#line 97 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 93 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp15_ = chooser;
-#line 97 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 93 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp16_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, gtk_dialog_get_type (), GtkDialog));
-#line 97 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 93 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp16_ == ((gint) GTK_RESPONSE_ACCEPT)) {
-#line 2163 "Dialogs.c"
+#line 2156 "Dialogs.c"
 		GtkFileChooserDialog* _tmp17_ = NULL;
 		gchar* _tmp18_ = NULL;
 		gchar* _tmp19_ = NULL;
 		GFile* _tmp20_ = NULL;
 		GFile* _tmp21_ = NULL;
 		GFile* _tmp22_ = NULL;
-#line 98 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 94 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp17_ = chooser;
-#line 98 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 94 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp18_ = gtk_file_chooser_get_filename (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser));
-#line 98 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 94 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp19_ = _tmp18_;
-#line 98 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 94 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp20_ = g_file_new_for_path (_tmp19_);
-#line 98 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 94 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (dir);
-#line 98 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 94 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		dir = _tmp20_;
-#line 98 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 94 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (_tmp19_);
-#line 99 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 95 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp21_ = dir;
-#line 99 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 95 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp22_ = _g_object_ref0 (_tmp21_);
-#line 99 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 95 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (export_ui_current_export_dir);
-#line 99 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 95 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		export_ui_current_export_dir = _tmp22_;
-#line 2192 "Dialogs.c"
+#line 2185 "Dialogs.c"
 	}
-#line 102 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 98 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp23_ = chooser;
-#line 102 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 98 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, gtk_widget_get_type (), GtkWidget));
-#line 104 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 100 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	result = dir;
-#line 104 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 100 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (chooser);
-#line 104 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 100 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 2204 "Dialogs.c"
+#line 2197 "Dialogs.c"
 }
 
 
 void open_external_editor_error_dialog (GError* err, Photo* photo) {
 	gboolean _tmp0_ = FALSE;
 	GError* _tmp1_ = NULL;
-#line 111 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 107 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_PHOTO (photo));
-#line 113 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 109 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = err;
-#line 113 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 109 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (g_error_matches (_tmp1_, G_IO_ERROR, G_IO_ERROR_PERMISSION_DENIED)) {
-#line 113 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 109 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp0_ = TRUE;
-#line 2219 "Dialogs.c"
+#line 2212 "Dialogs.c"
 	} else {
 		GError* _tmp2_ = NULL;
-#line 113 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 109 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp2_ = err;
-#line 113 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 109 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp0_ = g_error_matches (_tmp2_, G_FILE_ERROR, G_FILE_ERROR_PERM);
-#line 2226 "Dialogs.c"
+#line 2219 "Dialogs.c"
 	}
-#line 113 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 109 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp0_) {
-#line 2230 "Dialogs.c"
+#line 2223 "Dialogs.c"
 		const gchar* _tmp3_ = NULL;
 		Photo* _tmp4_ = NULL;
 		GFile* _tmp5_ = NULL;
@@ -2239,53 +2232,53 @@ void open_external_editor_error_dialog (GError* err, Photo* photo) {
 		gchar* _tmp10_ = NULL;
 		gchar* _tmp11_ = NULL;
 		gchar* _tmp12_ = NULL;
-#line 115 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp3_ = _ ("Shotwell couldn't create a file for editing this photo because you do " \
+#line 111 "/home/jens/Source/shotwell/src/Dialogs.vala"
+		_tmp3_ = _ ("Shotwell couldn’t create a file for editing this photo because you do " \
 "not have permission to write to %s.");
-#line 115 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 111 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp4_ = photo;
-#line 115 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 111 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp5_ = media_source_get_master_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 115 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 111 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp6_ = _tmp5_;
-#line 115 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 111 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp7_ = g_file_get_parent (_tmp6_);
-#line 115 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 111 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp8_ = _tmp7_;
-#line 115 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 111 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp9_ = g_file_get_path (_tmp8_);
-#line 115 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 111 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp10_ = _tmp9_;
-#line 115 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 111 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp11_ = g_strdup_printf (_tmp3_, _tmp10_);
-#line 115 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 111 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp12_ = _tmp11_;
-#line 115 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 111 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		app_window_error_message (_tmp12_, NULL);
-#line 115 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 111 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (_tmp12_);
-#line 115 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 111 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (_tmp10_);
-#line 115 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 111 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (_tmp8_);
-#line 115 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 111 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (_tmp6_);
-#line 2271 "Dialogs.c"
+#line 2264 "Dialogs.c"
 	} else {
 		GError* _tmp13_ = NULL;
 		gchar* _tmp14_ = NULL;
 		gchar* _tmp15_ = NULL;
-#line 120 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 116 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp13_ = err;
-#line 120 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 116 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp14_ = resources_launch_editor_failed (_tmp13_);
-#line 120 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 116 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp15_ = _tmp14_;
-#line 120 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 116 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		app_window_error_message (_tmp15_, NULL);
-#line 120 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 116 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (_tmp15_);
-#line 2286 "Dialogs.c"
+#line 2279 "Dialogs.c"
 	}
 }
 
@@ -2301,106 +2294,106 @@ GtkResponseType export_error_dialog (GFile* dest, gboolean photos_remaining) {
 	gchar* _tmp5_ = NULL;
 	GtkResponseType response = 0;
 	gboolean _tmp6_ = FALSE;
-#line 124 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 120 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (G_IS_FILE (dest), 0);
-#line 125 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 121 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = _ ("Unable to export the following photo due to a file error.\n\n");
-#line 125 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 121 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = dest;
-#line 125 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 121 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = g_file_get_path (_tmp1_);
-#line 125 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 121 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = _tmp2_;
-#line 125 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 121 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp4_ = g_strconcat (_tmp0_, _tmp3_, NULL);
-#line 125 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 121 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp5_ = _tmp4_;
-#line 125 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 121 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (_tmp3_);
-#line 125 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 121 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	message = _tmp5_;
-#line 128 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 124 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	response = GTK_RESPONSE_NONE;
-#line 130 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 126 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp6_ = photos_remaining;
-#line 130 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 126 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp6_) {
-#line 2326 "Dialogs.c"
+#line 2319 "Dialogs.c"
 		const gchar* _tmp7_ = NULL;
 		const gchar* _tmp8_ = NULL;
 		gchar* _tmp9_ = NULL;
 		const gchar* _tmp10_ = NULL;
 		const gchar* _tmp11_ = NULL;
 		GtkResponseType _tmp12_ = 0;
-#line 131 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 127 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp7_ = message;
-#line 131 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 127 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp8_ = _ ("\n\nWould you like to continue exporting?");
-#line 131 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 127 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp9_ = g_strconcat (_tmp7_, _tmp8_, NULL);
-#line 131 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 127 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (message);
-#line 131 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 127 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		message = _tmp9_;
-#line 132 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 128 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp10_ = message;
-#line 132 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 128 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp11_ = _ ("Con_tinue");
-#line 132 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 128 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp12_ = app_window_affirm_cancel_question (_tmp10_, _tmp11_, NULL, NULL);
-#line 132 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 128 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		response = _tmp12_;
-#line 2351 "Dialogs.c"
+#line 2344 "Dialogs.c"
 	} else {
 		const gchar* _tmp13_ = NULL;
-#line 134 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 130 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp13_ = message;
-#line 134 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 130 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		app_window_error_message (_tmp13_, NULL);
-#line 2358 "Dialogs.c"
+#line 2351 "Dialogs.c"
 	}
-#line 137 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 133 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	result = response;
-#line 137 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 133 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (message);
-#line 137 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 133 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 2366 "Dialogs.c"
+#line 2359 "Dialogs.c"
 }
 
 
 static void _export_dialog_on_constraint_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
-#line 209 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 214 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	export_dialog_on_constraint_changed ((ExportDialog*) self);
-#line 2373 "Dialogs.c"
+#line 2366 "Dialogs.c"
 }
 
 
 static void _export_dialog_on_format_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
-#line 210 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 215 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	export_dialog_on_format_changed ((ExportDialog*) self);
-#line 2380 "Dialogs.c"
+#line 2373 "Dialogs.c"
 }
 
 
 static void _export_dialog_on_pixels_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self) {
-#line 211 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 216 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	export_dialog_on_pixels_changed ((ExportDialog*) self);
-#line 2387 "Dialogs.c"
+#line 2380 "Dialogs.c"
 }
 
 
 static void _export_dialog_on_pixels_insert_text_gtk_editable_insert_text (GtkEditable* _sender, const gchar* new_text, gint new_text_length, gint* position, gpointer self) {
-#line 212 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 217 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	export_dialog_on_pixels_insert_text ((ExportDialog*) self, new_text, new_text_length, position);
-#line 2394 "Dialogs.c"
+#line 2387 "Dialogs.c"
 }
 
 
 static void _export_dialog_on_activate_gtk_entry_activate (GtkEntry* _sender, gpointer self) {
-#line 213 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 218 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	export_dialog_on_activate ((ExportDialog*) self);
-#line 2401 "Dialogs.c"
+#line 2394 "Dialogs.c"
 }
 
 
@@ -2411,459 +2404,525 @@ ExportDialog* export_dialog_construct (GType object_type, const gchar* title) {
 	gint _tmp1_ = 0;
 	gboolean _tmp2_ = FALSE;
 	const gchar* _tmp3_ = NULL;
-	GtkComboBoxText* _tmp4_ = NULL;
+	ConfigFacade* config = NULL;
+	ConfigFacade* _tmp4_ = NULL;
+	ConfigFacade* _tmp5_ = NULL;
+	ExportFormatMode _tmp6_ = 0;
+	ConfigFacade* _tmp7_ = NULL;
+	PhotoFileFormat _tmp8_ = 0;
+	ConfigFacade* _tmp9_ = NULL;
+	JpegQuality _tmp10_ = 0;
+	ConfigFacade* _tmp11_ = NULL;
+	gboolean _tmp12_ = FALSE;
+	ConfigFacade* _tmp13_ = NULL;
+	ScaleConstraint _tmp14_ = 0;
+	ConfigFacade* _tmp15_ = NULL;
+	gint _tmp16_ = 0;
+	GtkComboBoxText* _tmp17_ = NULL;
 	gint ctr = 0;
-	GtkComboBoxText* _tmp15_ = NULL;
-	GtkComboBoxText* _tmp25_ = NULL;
-	gint _tmp26_ = 0;
-	PhotoFileFormat* _tmp27_ = NULL;
-	GtkEntry* _tmp33_ = NULL;
-	GtkEntry* _tmp34_ = NULL;
-	GtkEntry* _tmp35_ = NULL;
-	gint _tmp36_ = 0;
-	gchar* _tmp37_ = NULL;
-	gchar* _tmp38_ = NULL;
-	GtkComboBoxText* _tmp39_ = NULL;
-	GtkComboBoxText* _tmp40_ = NULL;
-	GtkEntry* _tmp41_ = NULL;
-	GtkEntry* _tmp42_ = NULL;
-	GtkEntry* _tmp43_ = NULL;
-	const gchar* _tmp44_ = NULL;
-	GtkComboBoxText* _tmp45_ = NULL;
-	GtkComboBoxText* _tmp46_ = NULL;
-	const gchar* _tmp47_ = NULL;
-	GtkComboBoxText* _tmp48_ = NULL;
-	GtkComboBoxText* _tmp49_ = NULL;
-	const gchar* _tmp50_ = NULL;
-	GtkComboBoxText* _tmp51_ = NULL;
+	GtkComboBoxText* _tmp28_ = NULL;
+	GtkComboBoxText* _tmp38_ = NULL;
+	gint _tmp39_ = 0;
+	PhotoFileFormat* _tmp40_ = NULL;
+	GtkEntry* _tmp46_ = NULL;
+	GtkEntry* _tmp47_ = NULL;
+	GtkEntry* _tmp48_ = NULL;
+	gint _tmp49_ = 0;
+	gchar* _tmp50_ = NULL;
+	gchar* _tmp51_ = NULL;
 	GtkComboBoxText* _tmp52_ = NULL;
-	const gchar* _tmp53_ = NULL;
+	GtkComboBoxText* _tmp53_ = NULL;
 	GtkEntry* _tmp54_ = NULL;
 	GtkEntry* _tmp55_ = NULL;
-	const gchar* _tmp56_ = NULL;
-	GtkCheckButton* _tmp57_ = NULL;
-	GtkCheckButton* _tmp58_ = NULL;
-	GtkCheckButton* _tmp59_ = NULL;
-	GtkGrid* _tmp60_ = NULL;
-	GtkGrid* _tmp61_ = NULL;
-	GtkGrid* _tmp62_ = NULL;
-	GtkBox* _tmp63_ = NULL;
-	GtkGrid* _tmp64_ = NULL;
-	GtkWidget* _tmp65_ = NULL;
-	GtkWidget* _tmp66_ = NULL;
-	GtkWidget* _tmp67_ = NULL;
-	GtkWidget* _tmp68_ = NULL;
-	GtkWidget* _tmp69_ = NULL;
-	ScaleConstraint _tmp70_ = 0;
-	GtkWidget* _tmp73_ = NULL;
-#line 171 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	GtkEntry* _tmp56_ = NULL;
+	const gchar* _tmp57_ = NULL;
+	GtkComboBoxText* _tmp58_ = NULL;
+	GtkComboBoxText* _tmp59_ = NULL;
+	const gchar* _tmp60_ = NULL;
+	GtkComboBoxText* _tmp61_ = NULL;
+	GtkComboBoxText* _tmp62_ = NULL;
+	const gchar* _tmp63_ = NULL;
+	GtkComboBoxText* _tmp64_ = NULL;
+	GtkComboBoxText* _tmp65_ = NULL;
+	const gchar* _tmp66_ = NULL;
+	GtkEntry* _tmp67_ = NULL;
+	GtkEntry* _tmp68_ = NULL;
+	GtkSwitch* _tmp69_ = NULL;
+	const gchar* _tmp70_ = NULL;
+	GtkSwitch* _tmp71_ = NULL;
+	GtkSwitch* _tmp72_ = NULL;
+	GtkSwitch* _tmp73_ = NULL;
+	GtkSwitch* _tmp74_ = NULL;
+	GtkGrid* _tmp75_ = NULL;
+	GtkGrid* _tmp76_ = NULL;
+	GtkGrid* _tmp77_ = NULL;
+	GtkBox* _tmp78_ = NULL;
+	GtkGrid* _tmp79_ = NULL;
+	GtkWidget* _tmp80_ = NULL;
+	GtkWidget* _tmp81_ = NULL;
+	GtkWidget* _tmp82_ = NULL;
+	GtkWidget* _tmp83_ = NULL;
+	GtkWidget* _tmp84_ = NULL;
+	ScaleConstraint _tmp85_ = 0;
+	GtkWidget* _tmp88_ = NULL;
+#line 167 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (title != NULL, NULL);
-#line 173 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 169 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = gtk_settings_get_default ();
-#line 173 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 169 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_object_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, G_TYPE_OBJECT, GObject), "gtk-dialogs-use-header", &use_header, NULL);
-#line 174 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 170 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = use_header;
-#line 174 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 170 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp2_) {
-#line 174 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 170 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp1_ = 1;
-#line 2469 "Dialogs.c"
+#line 2478 "Dialogs.c"
 	} else {
-#line 174 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 170 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp1_ = 0;
-#line 2473 "Dialogs.c"
+#line 2482 "Dialogs.c"
 	}
-#line 174 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 170 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self = (ExportDialog*) g_object_new (object_type, "use-header-bar", _tmp1_, NULL);
-#line 176 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 172 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = title;
-#line 176 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 172 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_window_set_title (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), _tmp3_);
-#line 177 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 173 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_window_set_resizable (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), FALSE);
+#line 176 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp4_ = config_facade_get_instance ();
+#line 176 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	config = _tmp4_;
+#line 177 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp5_ = config;
+#line 177 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp6_ = configuration_facade_get_export_export_format_mode (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
+#line 177 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	export_dialog_current_parameters.mode = _tmp6_;
+#line 178 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp7_ = config;
+#line 178 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp8_ = configuration_facade_get_export_photo_file_format (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
+#line 178 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	export_dialog_current_parameters.specified_format = _tmp8_;
 #line 179 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp4_ = (GtkComboBoxText*) gtk_combo_box_text_new ();
-#line 179 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_object_ref_sink (_tmp4_);
+	_tmp9_ = config;
 #line 179 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (self->priv->quality_combo);
+	_tmp10_ = configuration_facade_get_export_quality (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
 #line 179 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self->priv->quality_combo = _tmp4_;
+	export_dialog_current_parameters.quality = _tmp10_;
 #line 180 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp11_ = config;
+#line 180 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp12_ = configuration_facade_get_export_export_metadata (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
+#line 180 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	export_dialog_current_parameters.export_metadata = _tmp12_;
+#line 181 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp13_ = config;
+#line 181 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp14_ = configuration_facade_get_export_constraint (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
+#line 181 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	export_dialog_current_constraint = _tmp14_;
+#line 182 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp15_ = config;
+#line 182 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp16_ = configuration_facade_get_export_scale (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
+#line 182 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	export_dialog_current_scale = _tmp16_;
+#line 184 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp17_ = (GtkComboBoxText*) gtk_combo_box_text_new ();
+#line 184 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	g_object_ref_sink (_tmp17_);
+#line 184 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_g_object_unref0 (self->priv->quality_combo);
+#line 184 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	self->priv->quality_combo = _tmp17_;
+#line 185 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	ctr = 0;
-#line 2493 "Dialogs.c"
+#line 2542 "Dialogs.c"
 	{
 		JpegQuality* quality_collection = NULL;
 		gint quality_collection_length1 = 0;
 		gint _quality_collection_size_ = 0;
 		gint quality_it = 0;
-#line 181 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 186 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		quality_collection = EXPORT_DIALOG_QUALITY_ARRAY;
-#line 181 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 186 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		quality_collection_length1 = G_N_ELEMENTS (EXPORT_DIALOG_QUALITY_ARRAY);
-#line 181 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 186 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		for (quality_it = 0; quality_it < G_N_ELEMENTS (EXPORT_DIALOG_QUALITY_ARRAY); quality_it = quality_it + 1) {
-#line 2505 "Dialogs.c"
+#line 2554 "Dialogs.c"
 			JpegQuality quality = 0;
-#line 181 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 186 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			quality = quality_collection[quality_it];
-#line 2509 "Dialogs.c"
+#line 2558 "Dialogs.c"
 			{
-				GtkComboBoxText* _tmp5_ = NULL;
-				JpegQuality _tmp6_ = 0;
-				gchar* _tmp7_ = NULL;
-				gchar* _tmp8_ = NULL;
-				JpegQuality _tmp9_ = 0;
-				ExportFormatParameters _tmp10_ = {0};
-				JpegQuality _tmp11_ = 0;
-				gint _tmp14_ = 0;
-#line 182 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp5_ = self->priv->quality_combo;
-#line 182 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp6_ = quality;
-#line 182 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp7_ = jpeg_quality_to_string (_tmp6_);
-#line 182 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp8_ = _tmp7_;
-#line 182 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				gtk_combo_box_text_append_text (_tmp5_, _tmp8_);
-#line 182 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_g_free0 (_tmp8_);
-#line 183 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp9_ = quality;
-#line 183 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp10_ = export_dialog_current_parameters;
-#line 183 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp11_ = _tmp10_.quality;
-#line 183 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				if (_tmp9_ == _tmp11_) {
-#line 2539 "Dialogs.c"
-					GtkComboBoxText* _tmp12_ = NULL;
-					gint _tmp13_ = 0;
-#line 184 "/home/jens/Source/shotwell/src/Dialogs.vala"
-					_tmp12_ = self->priv->quality_combo;
-#line 184 "/home/jens/Source/shotwell/src/Dialogs.vala"
-					_tmp13_ = ctr;
-#line 184 "/home/jens/Source/shotwell/src/Dialogs.vala"
-					gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_combo_box_get_type (), GtkComboBox), _tmp13_);
-#line 2548 "Dialogs.c"
-				}
-#line 185 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp14_ = ctr;
-#line 185 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				ctr = _tmp14_ + 1;
-#line 2554 "Dialogs.c"
-			}
-		}
-	}
+				GtkComboBoxText* _tmp18_ = NULL;
+				JpegQuality _tmp19_ = 0;
+				gchar* _tmp20_ = NULL;
+				gchar* _tmp21_ = NULL;
+				JpegQuality _tmp22_ = 0;
+				ExportFormatParameters _tmp23_ = {0};
+				JpegQuality _tmp24_ = 0;
+				gint _tmp27_ = 0;
+#line 187 "/home/jens/Source/shotwell/src/Dialogs.vala"
+				_tmp18_ = self->priv->quality_combo;
+#line 187 "/home/jens/Source/shotwell/src/Dialogs.vala"
+				_tmp19_ = quality;
+#line 187 "/home/jens/Source/shotwell/src/Dialogs.vala"
+				_tmp20_ = jpeg_quality_to_string (_tmp19_);
+#line 187 "/home/jens/Source/shotwell/src/Dialogs.vala"
+				_tmp21_ = _tmp20_;
+#line 187 "/home/jens/Source/shotwell/src/Dialogs.vala"
+				gtk_combo_box_text_append_text (_tmp18_, _tmp21_);
+#line 187 "/home/jens/Source/shotwell/src/Dialogs.vala"
+				_g_free0 (_tmp21_);
 #line 188 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp15_ = (GtkComboBoxText*) gtk_combo_box_text_new ();
+				_tmp22_ = quality;
 #line 188 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_object_ref_sink (_tmp15_);
+				_tmp23_ = export_dialog_current_parameters;
 #line 188 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (self->priv->constraint_combo);
+				_tmp24_ = _tmp23_.quality;
 #line 188 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self->priv->constraint_combo = _tmp15_;
+				if (_tmp22_ == _tmp24_) {
+#line 2588 "Dialogs.c"
+					GtkComboBoxText* _tmp25_ = NULL;
+					gint _tmp26_ = 0;
+#line 189 "/home/jens/Source/shotwell/src/Dialogs.vala"
+					_tmp25_ = self->priv->quality_combo;
 #line 189 "/home/jens/Source/shotwell/src/Dialogs.vala"
+					_tmp26_ = ctr;
+#line 189 "/home/jens/Source/shotwell/src/Dialogs.vala"
+					gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, gtk_combo_box_get_type (), GtkComboBox), _tmp26_);
+#line 2597 "Dialogs.c"
+				}
+#line 190 "/home/jens/Source/shotwell/src/Dialogs.vala"
+				_tmp27_ = ctr;
+#line 190 "/home/jens/Source/shotwell/src/Dialogs.vala"
+				ctr = _tmp27_ + 1;
+#line 2603 "Dialogs.c"
+			}
+		}
+	}
+#line 193 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp28_ = (GtkComboBoxText*) gtk_combo_box_text_new ();
+#line 193 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	g_object_ref_sink (_tmp28_);
+#line 193 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_g_object_unref0 (self->priv->constraint_combo);
+#line 193 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	self->priv->constraint_combo = _tmp28_;
+#line 194 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	ctr = 0;
-#line 2568 "Dialogs.c"
+#line 2617 "Dialogs.c"
 	{
 		ScaleConstraint* constraint_collection = NULL;
 		gint constraint_collection_length1 = 0;
 		gint _constraint_collection_size_ = 0;
 		gint constraint_it = 0;
-#line 190 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 195 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		constraint_collection = EXPORT_DIALOG_CONSTRAINT_ARRAY;
-#line 190 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 195 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		constraint_collection_length1 = G_N_ELEMENTS (EXPORT_DIALOG_CONSTRAINT_ARRAY);
-#line 190 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 195 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		for (constraint_it = 0; constraint_it < G_N_ELEMENTS (EXPORT_DIALOG_CONSTRAINT_ARRAY); constraint_it = constraint_it + 1) {
-#line 2580 "Dialogs.c"
+#line 2629 "Dialogs.c"
 			ScaleConstraint constraint = 0;
-#line 190 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 195 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			constraint = constraint_collection[constraint_it];
-#line 2584 "Dialogs.c"
+#line 2633 "Dialogs.c"
 			{
-				GtkComboBoxText* _tmp16_ = NULL;
-				ScaleConstraint _tmp17_ = 0;
-				gchar* _tmp18_ = NULL;
-				gchar* _tmp19_ = NULL;
-				ScaleConstraint _tmp20_ = 0;
-				ScaleConstraint _tmp21_ = 0;
-				gint _tmp24_ = 0;
-#line 191 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp16_ = self->priv->constraint_combo;
-#line 191 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp17_ = constraint;
-#line 191 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp18_ = scale_constraint_to_string (_tmp17_);
-#line 191 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp19_ = _tmp18_;
-#line 191 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				gtk_combo_box_text_append_text (_tmp16_, _tmp19_);
-#line 191 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_g_free0 (_tmp19_);
-#line 192 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp20_ = constraint;
-#line 192 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp21_ = export_dialog_current_constraint;
-#line 192 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				if (_tmp20_ == _tmp21_) {
-#line 2611 "Dialogs.c"
-					GtkComboBoxText* _tmp22_ = NULL;
-					gint _tmp23_ = 0;
-#line 193 "/home/jens/Source/shotwell/src/Dialogs.vala"
-					_tmp22_ = self->priv->constraint_combo;
-#line 193 "/home/jens/Source/shotwell/src/Dialogs.vala"
-					_tmp23_ = ctr;
-#line 193 "/home/jens/Source/shotwell/src/Dialogs.vala"
-					gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, gtk_combo_box_get_type (), GtkComboBox), _tmp23_);
-#line 2620 "Dialogs.c"
+				GtkComboBoxText* _tmp29_ = NULL;
+				ScaleConstraint _tmp30_ = 0;
+				gchar* _tmp31_ = NULL;
+				gchar* _tmp32_ = NULL;
+				ScaleConstraint _tmp33_ = 0;
+				ScaleConstraint _tmp34_ = 0;
+				gint _tmp37_ = 0;
+#line 196 "/home/jens/Source/shotwell/src/Dialogs.vala"
+				_tmp29_ = self->priv->constraint_combo;
+#line 196 "/home/jens/Source/shotwell/src/Dialogs.vala"
+				_tmp30_ = constraint;
+#line 196 "/home/jens/Source/shotwell/src/Dialogs.vala"
+				_tmp31_ = scale_constraint_to_string (_tmp30_);
+#line 196 "/home/jens/Source/shotwell/src/Dialogs.vala"
+				_tmp32_ = _tmp31_;
+#line 196 "/home/jens/Source/shotwell/src/Dialogs.vala"
+				gtk_combo_box_text_append_text (_tmp29_, _tmp32_);
+#line 196 "/home/jens/Source/shotwell/src/Dialogs.vala"
+				_g_free0 (_tmp32_);
+#line 197 "/home/jens/Source/shotwell/src/Dialogs.vala"
+				_tmp33_ = constraint;
+#line 197 "/home/jens/Source/shotwell/src/Dialogs.vala"
+				_tmp34_ = export_dialog_current_constraint;
+#line 197 "/home/jens/Source/shotwell/src/Dialogs.vala"
+				if (_tmp33_ == _tmp34_) {
+#line 2660 "Dialogs.c"
+					GtkComboBoxText* _tmp35_ = NULL;
+					gint _tmp36_ = 0;
+#line 198 "/home/jens/Source/shotwell/src/Dialogs.vala"
+					_tmp35_ = self->priv->constraint_combo;
+#line 198 "/home/jens/Source/shotwell/src/Dialogs.vala"
+					_tmp36_ = ctr;
+#line 198 "/home/jens/Source/shotwell/src/Dialogs.vala"
+					gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, gtk_combo_box_get_type (), GtkComboBox), _tmp36_);
+#line 2669 "Dialogs.c"
 				}
-#line 194 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp24_ = ctr;
-#line 194 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				ctr = _tmp24_ + 1;
-#line 2626 "Dialogs.c"
+#line 199 "/home/jens/Source/shotwell/src/Dialogs.vala"
+				_tmp37_ = ctr;
+#line 199 "/home/jens/Source/shotwell/src/Dialogs.vala"
+				ctr = _tmp37_ + 1;
+#line 2675 "Dialogs.c"
 			}
 		}
 	}
-#line 197 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp25_ = (GtkComboBoxText*) gtk_combo_box_text_new ();
-#line 197 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_object_ref_sink (_tmp25_);
-#line 197 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 202 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp38_ = (GtkComboBoxText*) gtk_combo_box_text_new ();
+#line 202 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	g_object_ref_sink (_tmp38_);
+#line 202 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->format_combo);
-#line 197 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self->priv->format_combo = _tmp25_;
-#line 198 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 202 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	self->priv->format_combo = _tmp38_;
+#line 203 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	export_dialog_format_add_option (self, EXPORT_DIALOG_UNMODIFIED_FORMAT_LABEL);
-#line 199 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 204 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	export_dialog_format_add_option (self, EXPORT_DIALOG_CURRENT_FORMAT_LABEL);
-#line 200 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp27_ = photo_file_format_get_writeable (&_tmp26_);
-#line 2644 "Dialogs.c"
+#line 205 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp40_ = photo_file_format_get_writeable (&_tmp39_);
+#line 2693 "Dialogs.c"
 	{
 		PhotoFileFormat* format_collection = NULL;
 		gint format_collection_length1 = 0;
 		gint _format_collection_size_ = 0;
 		gint format_it = 0;
-#line 200 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		format_collection = _tmp27_;
-#line 200 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		format_collection_length1 = _tmp26_;
-#line 200 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		for (format_it = 0; format_it < _tmp26_; format_it = format_it + 1) {
-#line 2656 "Dialogs.c"
+#line 205 "/home/jens/Source/shotwell/src/Dialogs.vala"
+		format_collection = _tmp40_;
+#line 205 "/home/jens/Source/shotwell/src/Dialogs.vala"
+		format_collection_length1 = _tmp39_;
+#line 205 "/home/jens/Source/shotwell/src/Dialogs.vala"
+		for (format_it = 0; format_it < _tmp39_; format_it = format_it + 1) {
+#line 2705 "Dialogs.c"
 			PhotoFileFormat format = 0;
-#line 200 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 205 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			format = format_collection[format_it];
-#line 2660 "Dialogs.c"
+#line 2709 "Dialogs.c"
 			{
-				PhotoFileFormat _tmp28_ = 0;
-				PhotoFileFormatProperties* _tmp29_ = NULL;
-				PhotoFileFormatProperties* _tmp30_ = NULL;
-				gchar* _tmp31_ = NULL;
-				gchar* _tmp32_ = NULL;
-#line 201 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp28_ = format;
-#line 201 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp29_ = photo_file_format_get_properties (_tmp28_);
-#line 201 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp30_ = _tmp29_;
-#line 201 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp31_ = photo_file_format_properties_get_user_visible_name (_tmp30_);
-#line 201 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp32_ = _tmp31_;
-#line 201 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				export_dialog_format_add_option (self, _tmp32_);
-#line 201 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_g_free0 (_tmp32_);
-#line 201 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_photo_file_format_properties_unref0 (_tmp30_);
-#line 2683 "Dialogs.c"
-			}
-		}
-#line 200 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		format_collection = (g_free (format_collection), NULL);
-#line 2688 "Dialogs.c"
-	}
-#line 204 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp33_ = (GtkEntry*) gtk_entry_new ();
-#line 204 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_object_ref_sink (_tmp33_);
-#line 204 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (self->priv->pixels_entry);
-#line 204 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self->priv->pixels_entry = _tmp33_;
-#line 205 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp34_ = self->priv->pixels_entry;
-#line 205 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_entry_set_max_length (_tmp34_, 6);
+				PhotoFileFormat _tmp41_ = 0;
+				PhotoFileFormatProperties* _tmp42_ = NULL;
+				PhotoFileFormatProperties* _tmp43_ = NULL;
+				gchar* _tmp44_ = NULL;
+				gchar* _tmp45_ = NULL;
 #line 206 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp35_ = self->priv->pixels_entry;
+				_tmp41_ = format;
 #line 206 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp36_ = export_dialog_current_scale;
+				_tmp42_ = photo_file_format_get_properties (_tmp41_);
 #line 206 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp37_ = g_strdup_printf ("%d", _tmp36_);
+				_tmp43_ = _tmp42_;
 #line 206 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp38_ = _tmp37_;
+				_tmp44_ = photo_file_format_properties_get_user_visible_name (_tmp43_);
+#line 206 "/home/jens/Source/shotwell/src/Dialogs.vala"
+				_tmp45_ = _tmp44_;
 #line 206 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_entry_set_text (_tmp35_, _tmp38_);
+				export_dialog_format_add_option (self, _tmp45_);
 #line 206 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_free0 (_tmp38_);
+				_g_free0 (_tmp45_);
+#line 206 "/home/jens/Source/shotwell/src/Dialogs.vala"
+				_photo_file_format_properties_unref0 (_tmp43_);
+#line 2732 "Dialogs.c"
+			}
+		}
+#line 205 "/home/jens/Source/shotwell/src/Dialogs.vala"
+		format_collection = (g_free (format_collection), NULL);
+#line 2737 "Dialogs.c"
+	}
 #line 209 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp39_ = self->priv->constraint_combo;
+	_tmp46_ = (GtkEntry*) gtk_entry_new ();
 #line 209 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _export_dialog_on_constraint_changed_gtk_combo_box_changed, self, 0);
+	g_object_ref_sink (_tmp46_);
+#line 209 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_g_object_unref0 (self->priv->pixels_entry);
+#line 209 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	self->priv->pixels_entry = _tmp46_;
 #line 210 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp40_ = self->priv->format_combo;
+	_tmp47_ = self->priv->pixels_entry;
 #line 210 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _export_dialog_on_format_changed_gtk_combo_box_changed, self, 0);
+	gtk_entry_set_max_length (_tmp47_, 6);
 #line 211 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp41_ = self->priv->pixels_entry;
+	_tmp48_ = self->priv->pixels_entry;
 #line 211 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, GTK_TYPE_EDITABLE, GtkEditable), "changed", (GCallback) _export_dialog_on_pixels_changed_gtk_editable_changed, self, 0);
-#line 212 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp42_ = self->priv->pixels_entry;
-#line 212 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, GTK_TYPE_EDITABLE, GtkEditable), "insert-text", (GCallback) _export_dialog_on_pixels_insert_text_gtk_editable_insert_text, self, 0);
-#line 213 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp43_ = self->priv->pixels_entry;
-#line 213 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_signal_connect_object (_tmp43_, "activate", (GCallback) _export_dialog_on_activate_gtk_entry_activate, self, 0);
-#line 216 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp44_ = _ ("_Format:");
+	_tmp49_ = export_dialog_current_scale;
+#line 211 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp50_ = g_strdup_printf ("%d", _tmp49_);
+#line 211 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp51_ = _tmp50_;
+#line 211 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	gtk_entry_set_text (_tmp48_, _tmp51_);
+#line 211 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_g_free0 (_tmp51_);
+#line 214 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp52_ = self->priv->constraint_combo;
+#line 214 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp52_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _export_dialog_on_constraint_changed_gtk_combo_box_changed, self, 0);
+#line 215 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp53_ = self->priv->format_combo;
+#line 215 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp53_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _export_dialog_on_format_changed_gtk_combo_box_changed, self, 0);
 #line 216 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp45_ = self->priv->format_combo;
+	_tmp54_ = self->priv->pixels_entry;
 #line 216 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	export_dialog_add_label (self, _tmp44_, 0, 0, G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, gtk_widget_get_type (), GtkWidget));
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp54_, GTK_TYPE_EDITABLE, GtkEditable), "changed", (GCallback) _export_dialog_on_pixels_changed_gtk_editable_changed, self, 0);
 #line 217 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp46_ = self->priv->format_combo;
+	_tmp55_ = self->priv->pixels_entry;
 #line 217 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	export_dialog_add_control (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, gtk_widget_get_type (), GtkWidget), 1, 0);
-#line 219 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp47_ = _ ("_Quality:");
-#line 219 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp48_ = self->priv->quality_combo;
-#line 219 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	export_dialog_add_label (self, _tmp47_, 0, 1, G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, gtk_widget_get_type (), GtkWidget));
-#line 220 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp49_ = self->priv->quality_combo;
-#line 220 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	export_dialog_add_control (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, gtk_widget_get_type (), GtkWidget), 1, 1);
-#line 222 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp50_ = _ ("_Scaling constraint:");
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp55_, GTK_TYPE_EDITABLE, GtkEditable), "insert-text", (GCallback) _export_dialog_on_pixels_insert_text_gtk_editable_insert_text, self, 0);
+#line 218 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp56_ = self->priv->pixels_entry;
+#line 218 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	g_signal_connect_object (_tmp56_, "activate", (GCallback) _export_dialog_on_activate_gtk_entry_activate, self, 0);
+#line 221 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp57_ = _ ("_Format:");
+#line 221 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp58_ = self->priv->format_combo;
+#line 221 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	export_dialog_add_label (self, _tmp57_, 0, 0, G_TYPE_CHECK_INSTANCE_CAST (_tmp58_, gtk_widget_get_type (), GtkWidget));
 #line 222 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp51_ = self->priv->constraint_combo;
+	_tmp59_ = self->priv->format_combo;
 #line 222 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	export_dialog_add_label (self, _tmp50_, 0, 2, G_TYPE_CHECK_INSTANCE_CAST (_tmp51_, gtk_widget_get_type (), GtkWidget));
-#line 223 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp52_ = self->priv->constraint_combo;
-#line 223 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	export_dialog_add_control (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp52_, gtk_widget_get_type (), GtkWidget), 1, 2);
+	export_dialog_add_control (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp59_, gtk_widget_get_type (), GtkWidget), 1, 0);
+#line 224 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp60_ = _ ("_Quality:");
+#line 224 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp61_ = self->priv->quality_combo;
+#line 224 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	export_dialog_add_label (self, _tmp60_, 0, 1, G_TYPE_CHECK_INSTANCE_CAST (_tmp61_, gtk_widget_get_type (), GtkWidget));
 #line 225 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp53_ = _ ("_Pixels:");
+	_tmp62_ = self->priv->quality_combo;
 #line 225 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp54_ = self->priv->pixels_entry;
-#line 225 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	export_dialog_add_label (self, _tmp53_, 0, 3, G_TYPE_CHECK_INSTANCE_CAST (_tmp54_, gtk_widget_get_type (), GtkWidget));
-#line 226 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp55_ = self->priv->pixels_entry;
-#line 226 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	export_dialog_add_control (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp55_, gtk_widget_get_type (), GtkWidget), 1, 3);
-#line 228 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp56_ = _ ("Export metadata");
+	export_dialog_add_control (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp62_, gtk_widget_get_type (), GtkWidget), 1, 1);
+#line 227 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp63_ = _ ("_Scaling constraint:");
+#line 227 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp64_ = self->priv->constraint_combo;
+#line 227 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	export_dialog_add_label (self, _tmp63_, 0, 2, G_TYPE_CHECK_INSTANCE_CAST (_tmp64_, gtk_widget_get_type (), GtkWidget));
 #line 228 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp57_ = (GtkCheckButton*) gtk_check_button_new_with_label (_tmp56_);
+	_tmp65_ = self->priv->constraint_combo;
 #line 228 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_object_ref_sink (_tmp57_);
-#line 228 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (self->priv->export_metadata);
-#line 228 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self->priv->export_metadata = _tmp57_;
-#line 229 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp58_ = self->priv->export_metadata;
-#line 229 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	export_dialog_add_control (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp58_, gtk_widget_get_type (), GtkWidget), 1, 4);
+	export_dialog_add_control (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp65_, gtk_widget_get_type (), GtkWidget), 1, 2);
 #line 230 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp59_ = self->priv->export_metadata;
+	_tmp66_ = _ ("_Pixels:");
 #line 230 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp59_, gtk_toggle_button_get_type (), GtkToggleButton), TRUE);
-#line 232 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp60_ = self->priv->table;
-#line 232 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_grid_set_row_spacing (_tmp60_, (guint) 5);
+	_tmp67_ = self->priv->pixels_entry;
+#line 230 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	export_dialog_add_label (self, _tmp66_, 0, 3, G_TYPE_CHECK_INSTANCE_CAST (_tmp67_, gtk_widget_get_type (), GtkWidget));
+#line 231 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp68_ = self->priv->pixels_entry;
+#line 231 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	export_dialog_add_control (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp68_, gtk_widget_get_type (), GtkWidget), 1, 3);
+#line 233 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp69_ = (GtkSwitch*) gtk_switch_new ();
 #line 233 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp61_ = self->priv->table;
+	g_object_ref_sink (_tmp69_);
+#line 233 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_g_object_unref0 (self->priv->export_metadata);
 #line 233 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_grid_set_column_spacing (_tmp61_, (guint) 5);
+	self->priv->export_metadata = _tmp69_;
 #line 234 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp62_ = self->priv->table;
+	_tmp70_ = _ ("Export _metadata:");
 #line 234 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_container_set_border_width (G_TYPE_CHECK_INSTANCE_CAST (_tmp62_, gtk_container_get_type (), GtkContainer), (guint) 3);
-#line 236 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp63_ = (GtkBox*) gtk_dialog_get_content_area (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
+	_tmp71_ = self->priv->export_metadata;
+#line 234 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	export_dialog_add_label (self, _tmp70_, 0, 4, G_TYPE_CHECK_INSTANCE_CAST (_tmp71_, gtk_widget_get_type (), GtkWidget));
+#line 235 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp72_ = self->priv->export_metadata;
+#line 235 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	export_dialog_add_control (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp72_, gtk_widget_get_type (), GtkWidget), 1, 4);
 #line 236 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp64_ = self->priv->table;
+	_tmp73_ = self->priv->export_metadata;
 #line 236 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (_tmp63_, gtk_box_get_type (), GtkBox), gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp64_, gtk_widget_get_type (), GtkWidget));
+	gtk_switch_set_active (_tmp73_, TRUE);
+#line 237 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp74_ = self->priv->export_metadata;
+#line 237 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (_tmp74_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_START);
 #line 239 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_dialog_add_button (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), RESOURCES_CANCEL_LABEL, (gint) GTK_RESPONSE_CANCEL);
-#line 240 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp65_ = gtk_dialog_add_button (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), RESOURCES_OK_LABEL, (gint) GTK_RESPONSE_OK);
-#line 240 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp66_ = _g_object_ref0 (_tmp65_);
+	_tmp75_ = self->priv->table;
+#line 239 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	gtk_grid_set_row_spacing (_tmp75_, (guint) 6);
 #line 240 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (self->priv->ok_button);
+	_tmp76_ = self->priv->table;
 #line 240 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	self->priv->ok_button = _tmp66_;
+	gtk_grid_set_column_spacing (_tmp76_, (guint) 12);
 #line 241 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_dialog_set_default_response (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), (gint) GTK_RESPONSE_OK);
+	_tmp77_ = self->priv->table;
+#line 241 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	gtk_container_set_border_width (G_TYPE_CHECK_INSTANCE_CAST (_tmp77_, gtk_container_get_type (), GtkContainer), (guint) 18);
 #line 243 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp67_ = self->priv->ok_button;
+	_tmp78_ = (GtkBox*) gtk_dialog_get_content_area (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
 #line 243 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_widget_set_can_default (_tmp67_, TRUE);
-#line 244 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp68_ = self->priv->ok_button;
-#line 244 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_object_set (_tmp68_, "has-default", TRUE, NULL);
-#line 245 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp69_ = self->priv->ok_button;
-#line 245 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_window_set_default (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), _tmp69_);
+	_tmp79_ = self->priv->table;
+#line 243 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (_tmp78_, gtk_box_get_type (), GtkBox), gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp79_, gtk_widget_get_type (), GtkWidget));
+#line 246 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	gtk_dialog_add_button (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), RESOURCES_CANCEL_LABEL, (gint) GTK_RESPONSE_CANCEL);
 #line 247 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp70_ = export_dialog_current_constraint;
+	_tmp80_ = gtk_dialog_add_button (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), RESOURCES_OK_LABEL, (gint) GTK_RESPONSE_OK);
 #line 247 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	if (_tmp70_ == SCALE_CONSTRAINT_ORIGINAL) {
-#line 2838 "Dialogs.c"
-		GtkEntry* _tmp71_ = NULL;
-		GtkComboBoxText* _tmp72_ = NULL;
-#line 248 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp71_ = self->priv->pixels_entry;
+	_tmp81_ = _g_object_ref0 (_tmp80_);
+#line 247 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_g_object_unref0 (self->priv->ok_button);
+#line 247 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	self->priv->ok_button = _tmp81_;
 #line 248 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp71_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 249 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp72_ = self->priv->quality_combo;
-#line 249 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp72_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 2849 "Dialogs.c"
-	}
+	gtk_dialog_set_default_response (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), (gint) GTK_RESPONSE_OK);
+#line 250 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp82_ = self->priv->ok_button;
+#line 250 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	gtk_widget_set_can_default (_tmp82_, TRUE);
+#line 251 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp83_ = self->priv->ok_button;
+#line 251 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	g_object_set (_tmp83_, "has-default", TRUE, NULL);
 #line 252 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp73_ = self->priv->ok_button;
+	_tmp84_ = self->priv->ok_button;
 #line 252 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_widget_grab_focus (_tmp73_);
-#line 171 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	gtk_window_set_default (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), _tmp84_);
+#line 254 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp85_ = export_dialog_current_constraint;
+#line 254 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	if (_tmp85_ == SCALE_CONSTRAINT_ORIGINAL) {
+#line 2895 "Dialogs.c"
+		GtkEntry* _tmp86_ = NULL;
+		GtkComboBoxText* _tmp87_ = NULL;
+#line 255 "/home/jens/Source/shotwell/src/Dialogs.vala"
+		_tmp86_ = self->priv->pixels_entry;
+#line 255 "/home/jens/Source/shotwell/src/Dialogs.vala"
+		gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp86_, gtk_widget_get_type (), GtkWidget), FALSE);
+#line 256 "/home/jens/Source/shotwell/src/Dialogs.vala"
+		_tmp87_ = self->priv->quality_combo;
+#line 256 "/home/jens/Source/shotwell/src/Dialogs.vala"
+		gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp87_, gtk_widget_get_type (), GtkWidget), FALSE);
+#line 2906 "Dialogs.c"
+	}
+#line 259 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp88_ = self->priv->ok_button;
+#line 259 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	gtk_widget_grab_focus (_tmp88_);
+#line 167 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_g_object_unref0 (config);
+#line 167 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return self;
-#line 2857 "Dialogs.c"
+#line 2916 "Dialogs.c"
 }
 
 
 ExportDialog* export_dialog_new (const gchar* title) {
-#line 171 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 167 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return export_dialog_construct (TYPE_EXPORT_DIALOG, title);
-#line 2864 "Dialogs.c"
+#line 2923 "Dialogs.c"
 }
 
 
@@ -2872,36 +2931,36 @@ static void export_dialog_format_add_option (ExportDialog* self, const gchar* fo
 	const gchar* _tmp1_ = NULL;
 	GtkComboBoxText* _tmp2_ = NULL;
 	const gchar* _tmp3_ = NULL;
-#line 255 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 262 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_EXPORT_DIALOG (self));
-#line 255 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 262 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (format_name != NULL);
-#line 256 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 263 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = self->priv->format_options;
-#line 256 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 263 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = format_name;
-#line 256 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 263 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp1_);
-#line 257 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 264 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = self->priv->format_combo;
-#line 257 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 264 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = format_name;
-#line 257 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 264 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_combo_box_text_append_text (_tmp2_, _tmp3_);
-#line 2889 "Dialogs.c"
+#line 2948 "Dialogs.c"
 }
 
 
 static void export_dialog_format_set_active_text (ExportDialog* self, const gchar* text) {
 	gint selection_ticker = 0;
 	const gchar* _tmp16_ = NULL;
-#line 260 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 267 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_EXPORT_DIALOG (self));
-#line 260 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 267 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (text != NULL);
-#line 261 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 268 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	selection_ticker = 0;
-#line 2902 "Dialogs.c"
+#line 2961 "Dialogs.c"
 	{
 		GeeArrayList* _current_text_list = NULL;
 		GeeArrayList* _tmp0_ = NULL;
@@ -2911,25 +2970,25 @@ static void export_dialog_format_set_active_text (ExportDialog* self, const gcha
 		gint _tmp3_ = 0;
 		gint _tmp4_ = 0;
 		gint _current_text_index = 0;
-#line 263 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 270 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp0_ = self->priv->format_options;
-#line 263 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 270 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 263 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 270 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_current_text_list = _tmp1_;
-#line 263 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 270 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp2_ = _current_text_list;
-#line 263 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 270 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp3_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 263 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 270 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp4_ = _tmp3_;
-#line 263 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 270 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_current_text_size = _tmp4_;
-#line 263 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 270 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_current_text_index = -1;
-#line 263 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 270 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		while (TRUE) {
-#line 2930 "Dialogs.c"
+#line 2989 "Dialogs.c"
 			gint _tmp5_ = 0;
 			gint _tmp6_ = 0;
 			gint _tmp7_ = 0;
@@ -2940,68 +2999,68 @@ static void export_dialog_format_set_active_text (ExportDialog* self, const gcha
 			const gchar* _tmp11_ = NULL;
 			const gchar* _tmp12_ = NULL;
 			gint _tmp15_ = 0;
-#line 263 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 270 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp5_ = _current_text_index;
-#line 263 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 270 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_current_text_index = _tmp5_ + 1;
-#line 263 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 270 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp6_ = _current_text_index;
-#line 263 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 270 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp7_ = _current_text_size;
-#line 263 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 270 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			if (!(_tmp6_ < _tmp7_)) {
-#line 263 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 270 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				break;
-#line 2953 "Dialogs.c"
+#line 3012 "Dialogs.c"
 			}
-#line 263 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 270 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp8_ = _current_text_list;
-#line 263 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 270 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp9_ = _current_text_index;
-#line 263 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 270 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp10_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp9_);
-#line 263 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 270 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			current_text = (gchar*) _tmp10_;
-#line 264 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 271 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp11_ = current_text;
-#line 264 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 271 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp12_ = text;
-#line 264 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 271 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			if (g_strcmp0 (_tmp11_, _tmp12_) == 0) {
-#line 2969 "Dialogs.c"
+#line 3028 "Dialogs.c"
 				GtkComboBoxText* _tmp13_ = NULL;
 				gint _tmp14_ = 0;
-#line 265 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 272 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp13_ = self->priv->format_combo;
-#line 265 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 272 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp14_ = selection_ticker;
-#line 265 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 272 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, gtk_combo_box_get_type (), GtkComboBox), _tmp14_);
-#line 266 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 273 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_free0 (current_text);
-#line 266 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 273 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_object_unref0 (_current_text_list);
-#line 266 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 273 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				return;
-#line 2984 "Dialogs.c"
+#line 3043 "Dialogs.c"
 			}
-#line 268 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 275 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp15_ = selection_ticker;
-#line 268 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 275 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			selection_ticker = _tmp15_ + 1;
-#line 263 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 270 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_free0 (current_text);
-#line 2992 "Dialogs.c"
+#line 3051 "Dialogs.c"
 		}
-#line 263 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 270 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (_current_text_list);
-#line 2996 "Dialogs.c"
+#line 3055 "Dialogs.c"
 	}
-#line 271 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 278 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp16_ = text;
-#line 271 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_error ("Dialogs.vala:271: format_set_active_text: text '%s' isn't in combo box", _tmp16_);
-#line 3002 "Dialogs.c"
+#line 278 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	g_error ("Dialogs.vala:278: format_set_active_text: text '%s' isn't in combo box", _tmp16_);
+#line 3061 "Dialogs.c"
 }
 
 
@@ -3019,45 +3078,45 @@ static PhotoFileFormat export_dialog_get_specified_format (ExportDialog* self) {
 	gint _writeable_formats_size_ = 0;
 	gint _tmp6_ = 0;
 	PhotoFileFormat _tmp7_ = 0;
-#line 274 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 281 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (IS_EXPORT_DIALOG (self), 0);
-#line 275 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 282 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = self->priv->format_combo;
-#line 275 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 282 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_combo_box_get_type (), GtkComboBox));
-#line 275 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 282 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	index = _tmp1_;
-#line 276 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 283 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = index;
-#line 276 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 283 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp2_ < EXPORT_DIALOG_NUM_SPECIAL_FORMATS) {
-#line 277 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 284 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		index = EXPORT_DIALOG_NUM_SPECIAL_FORMATS;
-#line 3034 "Dialogs.c"
+#line 3093 "Dialogs.c"
 	}
-#line 279 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 286 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = index;
-#line 279 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 286 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	index = _tmp3_ - EXPORT_DIALOG_NUM_SPECIAL_FORMATS;
-#line 280 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 287 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp5_ = photo_file_format_get_writeable (&_tmp4_);
-#line 280 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 287 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	writeable_formats = _tmp5_;
-#line 280 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 287 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	writeable_formats_length1 = _tmp4_;
-#line 280 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 287 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_writeable_formats_size_ = writeable_formats_length1;
-#line 281 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 288 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp6_ = index;
-#line 281 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 288 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp7_ = writeable_formats[_tmp6_];
-#line 281 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 288 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	result = _tmp7_;
-#line 281 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 288 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	writeable_formats = (g_free (writeable_formats), NULL);
-#line 281 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 288 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 3058 "Dialogs.c"
+#line 3117 "Dialogs.c"
 }
 
 
@@ -3065,45 +3124,45 @@ static gchar* export_dialog_get_label_for_parameters (ExportDialog* self, Export
 	gchar* result = NULL;
 	ExportFormatParameters _tmp0_ = {0};
 	ExportFormatMode _tmp1_ = 0;
-#line 284 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 291 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (IS_EXPORT_DIALOG (self), NULL);
-#line 284 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 291 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (params != NULL, NULL);
-#line 285 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 292 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = *params;
-#line 285 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 292 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = _tmp0_.mode;
-#line 285 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 292 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	switch (_tmp1_) {
-#line 285 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 292 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		case EXPORT_FORMAT_MODE_UNMODIFIED:
-#line 3078 "Dialogs.c"
+#line 3137 "Dialogs.c"
 		{
 			gchar* _tmp2_ = NULL;
-#line 287 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 294 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp2_ = g_strdup (EXPORT_DIALOG_UNMODIFIED_FORMAT_LABEL);
-#line 287 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 294 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			result = _tmp2_;
-#line 287 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 294 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			return result;
-#line 3087 "Dialogs.c"
+#line 3146 "Dialogs.c"
 		}
-#line 285 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 292 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		case EXPORT_FORMAT_MODE_CURRENT:
-#line 3091 "Dialogs.c"
+#line 3150 "Dialogs.c"
 		{
 			gchar* _tmp3_ = NULL;
-#line 290 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 297 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp3_ = g_strdup (EXPORT_DIALOG_CURRENT_FORMAT_LABEL);
-#line 290 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 297 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			result = _tmp3_;
-#line 290 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 297 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			return result;
-#line 3100 "Dialogs.c"
+#line 3159 "Dialogs.c"
 		}
-#line 285 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 292 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		case EXPORT_FORMAT_MODE_SPECIFIED:
-#line 3104 "Dialogs.c"
+#line 3163 "Dialogs.c"
 		{
 			ExportFormatParameters _tmp4_ = {0};
 			PhotoFileFormat _tmp5_ = 0;
@@ -3111,32 +3170,32 @@ static gchar* export_dialog_get_label_for_parameters (ExportDialog* self, Export
 			PhotoFileFormatProperties* _tmp7_ = NULL;
 			gchar* _tmp8_ = NULL;
 			gchar* _tmp9_ = NULL;
-#line 293 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 300 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp4_ = *params;
-#line 293 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 300 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp5_ = _tmp4_.specified_format;
-#line 293 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 300 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp6_ = photo_file_format_get_properties (_tmp5_);
-#line 293 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 300 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp7_ = _tmp6_;
-#line 293 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 300 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp8_ = photo_file_format_properties_get_user_visible_name (_tmp7_);
-#line 293 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 300 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp9_ = _tmp8_;
-#line 293 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 300 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_photo_file_format_properties_unref0 (_tmp7_);
-#line 293 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 300 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			result = _tmp9_;
-#line 293 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 300 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			return result;
-#line 3130 "Dialogs.c"
+#line 3189 "Dialogs.c"
 		}
 		default:
 		{
-#line 296 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			g_error ("Dialogs.vala:296: get_label_for_parameters: unrecognized export format" \
+#line 303 "/home/jens/Source/shotwell/src/Dialogs.vala"
+			g_error ("Dialogs.vala:303: get_label_for_parameters: unrecognized export format" \
 " mode");
-#line 3136 "Dialogs.c"
+#line 3195 "Dialogs.c"
 		}
 	}
 }
@@ -3156,106 +3215,106 @@ gboolean export_dialog_execute (ExportDialog* self, gint* scale, ScaleConstraint
 	gboolean ok = FALSE;
 	gint _tmp17_ = 0;
 	gboolean _tmp18_ = FALSE;
-#line 303 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 310 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (IS_EXPORT_DIALOG (self), FALSE);
-#line 303 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 310 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (parameters != NULL, FALSE);
-#line 305 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 312 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 309 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 316 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = *parameters;
-#line 309 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 316 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = _tmp0_.mode;
-#line 309 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 316 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp1_ != EXPORT_FORMAT_MODE_LAST) {
-#line 3168 "Dialogs.c"
+#line 3227 "Dialogs.c"
 		ScaleConstraint _tmp2_ = 0;
 		GtkComboBoxText* _tmp3_ = NULL;
-#line 310 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 317 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_vala_constraint = SCALE_CONSTRAINT_ORIGINAL;
-#line 310 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 317 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp2_ = _vala_constraint;
-#line 310 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 317 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		export_dialog_current_constraint = _tmp2_;
-#line 311 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 318 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp3_ = self->priv->constraint_combo;
-#line 311 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 318 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_combo_box_get_type (), GtkComboBox), 0);
-#line 3181 "Dialogs.c"
+#line 3240 "Dialogs.c"
 	}
-#line 314 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 321 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp4_ = *parameters;
-#line 314 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 321 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp5_ = _tmp4_.mode;
-#line 314 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 321 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp5_ == EXPORT_FORMAT_MODE_LAST) {
-#line 3189 "Dialogs.c"
+#line 3248 "Dialogs.c"
 		ExportFormatParameters _tmp6_ = {0};
-#line 315 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 322 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp6_ = export_dialog_current_parameters;
-#line 315 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 322 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		*parameters = _tmp6_;
-#line 3195 "Dialogs.c"
+#line 3254 "Dialogs.c"
 	} else {
 		gboolean _tmp7_ = FALSE;
 		ExportFormatParameters _tmp8_ = {0};
 		ExportFormatMode _tmp9_ = 0;
-#line 316 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 323 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp8_ = *parameters;
-#line 316 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 323 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp9_ = _tmp8_.mode;
-#line 316 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 323 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (_tmp9_ == EXPORT_FORMAT_MODE_SPECIFIED) {
-#line 3206 "Dialogs.c"
+#line 3265 "Dialogs.c"
 			ExportFormatParameters _tmp10_ = {0};
 			PhotoFileFormat _tmp11_ = 0;
 			gboolean _tmp12_ = FALSE;
-#line 316 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 323 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp10_ = *parameters;
-#line 316 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 323 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp11_ = _tmp10_.specified_format;
-#line 316 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 323 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp12_ = photo_file_format_can_write (_tmp11_);
-#line 316 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 323 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp7_ = !_tmp12_;
-#line 3218 "Dialogs.c"
+#line 3277 "Dialogs.c"
 		} else {
-#line 316 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 323 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp7_ = FALSE;
-#line 3222 "Dialogs.c"
+#line 3281 "Dialogs.c"
 		}
-#line 316 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 323 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (_tmp7_) {
-#line 3226 "Dialogs.c"
+#line 3285 "Dialogs.c"
 			PhotoFileFormat _tmp13_ = 0;
-#line 317 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 324 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp13_ = photo_file_format_get_system_default_format ();
-#line 317 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 324 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			(*parameters).specified_format = _tmp13_;
-#line 3232 "Dialogs.c"
+#line 3291 "Dialogs.c"
 		}
 	}
-#line 319 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 326 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp14_ = *parameters;
-#line 319 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 326 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp15_ = export_dialog_get_label_for_parameters (self, &_tmp14_);
-#line 319 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 326 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp16_ = _tmp15_;
-#line 319 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 326 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	export_dialog_format_set_active_text (self, _tmp16_);
-#line 319 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 326 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (_tmp16_);
-#line 320 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 327 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	export_dialog_on_format_changed (self);
-#line 322 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 329 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp17_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
-#line 322 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 329 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	ok = _tmp17_ == ((gint) GTK_RESPONSE_OK);
-#line 323 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 330 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp18_ = ok;
-#line 323 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 330 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp18_) {
-#line 3255 "Dialogs.c"
+#line 3314 "Dialogs.c"
 		gint index = 0;
 		GtkComboBoxText* _tmp19_ = NULL;
 		gint _tmp20_ = 0;
@@ -3269,317 +3328,386 @@ gboolean export_dialog_execute (ExportDialog* self, gint* scale, ScaleConstraint
 		ScaleConstraint _tmp28_ = 0;
 		gint _tmp30_ = 0;
 		gboolean _tmp31_ = FALSE;
-		GtkCheckButton* _tmp32_ = NULL;
+		GtkSwitch* _tmp32_ = NULL;
 		gboolean _tmp33_ = FALSE;
 		gboolean _tmp34_ = FALSE;
 		GtkComboBoxText* _tmp38_ = NULL;
 		gchar* _tmp39_ = NULL;
 		gchar* _tmp40_ = NULL;
 		gboolean _tmp41_ = FALSE;
-#line 324 "/home/jens/Source/shotwell/src/Dialogs.vala"
+		ConfigFacade* config = NULL;
+		ConfigFacade* _tmp57_ = NULL;
+		ConfigFacade* _tmp58_ = NULL;
+		ExportFormatParameters _tmp59_ = {0};
+		ExportFormatMode _tmp60_ = 0;
+		ConfigFacade* _tmp61_ = NULL;
+		ExportFormatParameters _tmp62_ = {0};
+		PhotoFileFormat _tmp63_ = 0;
+		ConfigFacade* _tmp64_ = NULL;
+		ExportFormatParameters _tmp65_ = {0};
+		JpegQuality _tmp66_ = 0;
+		ConfigFacade* _tmp67_ = NULL;
+		ExportFormatParameters _tmp68_ = {0};
+		gboolean _tmp69_ = FALSE;
+		ConfigFacade* _tmp70_ = NULL;
+		ScaleConstraint _tmp71_ = 0;
+		ConfigFacade* _tmp72_ = NULL;
+		gint _tmp73_ = 0;
+#line 331 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp19_ = self->priv->constraint_combo;
-#line 324 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 331 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp20_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, gtk_combo_box_get_type (), GtkComboBox));
-#line 324 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 331 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		index = _tmp20_;
-#line 325 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 332 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp21_ = index;
-#line 325 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 332 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_vala_assert (_tmp21_ >= 0, "index >= 0");
-#line 326 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 333 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp22_ = index;
-#line 326 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 333 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp23_ = EXPORT_DIALOG_CONSTRAINT_ARRAY[_tmp22_];
-#line 326 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 333 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_vala_constraint = _tmp23_;
-#line 327 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 334 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp24_ = _vala_constraint;
-#line 327 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 334 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		export_dialog_current_constraint = _tmp24_;
-#line 329 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 336 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp25_ = self->priv->pixels_entry;
-#line 329 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 336 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp26_ = gtk_entry_get_text (_tmp25_);
-#line 329 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 336 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp27_ = atoi (_tmp26_);
-#line 329 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 336 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_vala_scale = _tmp27_;
-#line 330 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 337 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp28_ = _vala_constraint;
-#line 330 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 337 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (_tmp28_ != SCALE_CONSTRAINT_ORIGINAL) {
-#line 3308 "Dialogs.c"
+#line 3385 "Dialogs.c"
 			gint _tmp29_ = 0;
-#line 331 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 338 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp29_ = _vala_scale;
-#line 331 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 338 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_vala_assert (_tmp29_ > 0, "scale > 0");
-#line 3314 "Dialogs.c"
+#line 3391 "Dialogs.c"
 		}
-#line 332 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 339 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp30_ = _vala_scale;
-#line 332 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 339 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		export_dialog_current_scale = _tmp30_;
-#line 334 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 341 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp32_ = self->priv->export_metadata;
-#line 334 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 341 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp33_ = gtk_widget_get_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, gtk_widget_get_type (), GtkWidget));
-#line 334 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 341 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp34_ = _tmp33_;
-#line 334 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 341 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (_tmp34_) {
-#line 3328 "Dialogs.c"
-			GtkCheckButton* _tmp35_ = NULL;
+#line 3405 "Dialogs.c"
+			GtkSwitch* _tmp35_ = NULL;
 			gboolean _tmp36_ = FALSE;
 			gboolean _tmp37_ = FALSE;
-#line 334 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 341 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp35_ = self->priv->export_metadata;
-#line 334 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp36_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, gtk_toggle_button_get_type (), GtkToggleButton));
-#line 334 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 341 "/home/jens/Source/shotwell/src/Dialogs.vala"
+			_tmp36_ = gtk_switch_get_active (_tmp35_);
+#line 341 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp37_ = _tmp36_;
-#line 334 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 341 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp31_ = _tmp37_;
-#line 3340 "Dialogs.c"
+#line 3417 "Dialogs.c"
 		} else {
-#line 334 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 341 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp31_ = FALSE;
-#line 3344 "Dialogs.c"
+#line 3421 "Dialogs.c"
 		}
-#line 334 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 341 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		(*parameters).export_metadata = _tmp31_;
-#line 336 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 343 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp38_ = self->priv->format_combo;
-#line 336 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 343 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp39_ = gtk_combo_box_text_get_active_text (_tmp38_);
-#line 336 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 343 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp40_ = _tmp39_;
-#line 336 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 343 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp41_ = g_strcmp0 (_tmp40_, EXPORT_DIALOG_UNMODIFIED_FORMAT_LABEL) == 0;
-#line 336 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 343 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (_tmp40_);
-#line 336 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 343 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (_tmp41_) {
-#line 3360 "Dialogs.c"
+#line 3437 "Dialogs.c"
 			ExportFormatMode _tmp42_ = 0;
-#line 337 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 344 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			export_dialog_current_parameters.mode = EXPORT_FORMAT_MODE_UNMODIFIED;
-#line 337 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 344 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp42_ = export_dialog_current_parameters.mode;
-#line 337 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 344 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			(*parameters).mode = _tmp42_;
-#line 3368 "Dialogs.c"
+#line 3445 "Dialogs.c"
 		} else {
 			GtkComboBoxText* _tmp43_ = NULL;
 			gchar* _tmp44_ = NULL;
 			gchar* _tmp45_ = NULL;
 			gboolean _tmp46_ = FALSE;
-#line 338 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 345 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp43_ = self->priv->format_combo;
-#line 338 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 345 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp44_ = gtk_combo_box_text_get_active_text (_tmp43_);
-#line 338 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 345 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp45_ = _tmp44_;
-#line 338 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 345 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp46_ = g_strcmp0 (_tmp45_, EXPORT_DIALOG_CURRENT_FORMAT_LABEL) == 0;
-#line 338 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 345 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_free0 (_tmp45_);
-#line 338 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 345 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			if (_tmp46_) {
-#line 3386 "Dialogs.c"
+#line 3463 "Dialogs.c"
 				ExportFormatMode _tmp47_ = 0;
-#line 339 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 346 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				export_dialog_current_parameters.mode = EXPORT_FORMAT_MODE_CURRENT;
-#line 339 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 346 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp47_ = export_dialog_current_parameters.mode;
-#line 339 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 346 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				(*parameters).mode = _tmp47_;
-#line 3394 "Dialogs.c"
+#line 3471 "Dialogs.c"
 			} else {
 				ExportFormatMode _tmp48_ = 0;
 				PhotoFileFormat _tmp49_ = 0;
 				PhotoFileFormat _tmp50_ = 0;
 				ExportFormatParameters _tmp51_ = {0};
 				PhotoFileFormat _tmp52_ = 0;
-#line 341 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 348 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				export_dialog_current_parameters.mode = EXPORT_FORMAT_MODE_SPECIFIED;
-#line 341 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 348 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp48_ = export_dialog_current_parameters.mode;
-#line 341 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 348 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				(*parameters).mode = _tmp48_;
-#line 342 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 349 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp49_ = export_dialog_get_specified_format (self);
-#line 342 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 349 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				export_dialog_current_parameters.specified_format = _tmp49_;
-#line 342 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 349 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp50_ = export_dialog_current_parameters.specified_format;
-#line 342 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 349 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				(*parameters).specified_format = _tmp50_;
-#line 343 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 350 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp51_ = export_dialog_current_parameters;
-#line 343 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 350 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp52_ = _tmp51_.specified_format;
-#line 343 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 350 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				if (_tmp52_ == PHOTO_FILE_FORMAT_JFIF) {
-#line 3421 "Dialogs.c"
+#line 3498 "Dialogs.c"
 					GtkComboBoxText* _tmp53_ = NULL;
 					gint _tmp54_ = 0;
 					JpegQuality _tmp55_ = 0;
 					JpegQuality _tmp56_ = 0;
-#line 344 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 351 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp53_ = self->priv->quality_combo;
-#line 344 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 351 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp54_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp53_, gtk_combo_box_get_type (), GtkComboBox));
-#line 344 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 351 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp55_ = EXPORT_DIALOG_QUALITY_ARRAY[_tmp54_];
-#line 344 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 351 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					export_dialog_current_parameters.quality = _tmp55_;
-#line 344 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 351 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp56_ = export_dialog_current_parameters.quality;
-#line 344 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 351 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					(*parameters).quality = _tmp56_;
-#line 3438 "Dialogs.c"
+#line 3515 "Dialogs.c"
 				}
 			}
 		}
+#line 355 "/home/jens/Source/shotwell/src/Dialogs.vala"
+		_tmp57_ = config_facade_get_instance ();
+#line 355 "/home/jens/Source/shotwell/src/Dialogs.vala"
+		config = _tmp57_;
+#line 356 "/home/jens/Source/shotwell/src/Dialogs.vala"
+		_tmp58_ = config;
+#line 356 "/home/jens/Source/shotwell/src/Dialogs.vala"
+		_tmp59_ = export_dialog_current_parameters;
+#line 356 "/home/jens/Source/shotwell/src/Dialogs.vala"
+		_tmp60_ = _tmp59_.mode;
+#line 356 "/home/jens/Source/shotwell/src/Dialogs.vala"
+		configuration_facade_set_export_export_format_mode (G_TYPE_CHECK_INSTANCE_CAST (_tmp58_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp60_);
+#line 357 "/home/jens/Source/shotwell/src/Dialogs.vala"
+		_tmp61_ = config;
+#line 357 "/home/jens/Source/shotwell/src/Dialogs.vala"
+		_tmp62_ = export_dialog_current_parameters;
+#line 357 "/home/jens/Source/shotwell/src/Dialogs.vala"
+		_tmp63_ = _tmp62_.specified_format;
+#line 357 "/home/jens/Source/shotwell/src/Dialogs.vala"
+		configuration_facade_set_export_photo_file_format (G_TYPE_CHECK_INSTANCE_CAST (_tmp61_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp63_);
+#line 358 "/home/jens/Source/shotwell/src/Dialogs.vala"
+		_tmp64_ = config;
+#line 358 "/home/jens/Source/shotwell/src/Dialogs.vala"
+		_tmp65_ = export_dialog_current_parameters;
+#line 358 "/home/jens/Source/shotwell/src/Dialogs.vala"
+		_tmp66_ = _tmp65_.quality;
+#line 358 "/home/jens/Source/shotwell/src/Dialogs.vala"
+		configuration_facade_set_export_quality (G_TYPE_CHECK_INSTANCE_CAST (_tmp64_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp66_);
+#line 359 "/home/jens/Source/shotwell/src/Dialogs.vala"
+		_tmp67_ = config;
+#line 359 "/home/jens/Source/shotwell/src/Dialogs.vala"
+		_tmp68_ = export_dialog_current_parameters;
+#line 359 "/home/jens/Source/shotwell/src/Dialogs.vala"
+		_tmp69_ = _tmp68_.export_metadata;
+#line 359 "/home/jens/Source/shotwell/src/Dialogs.vala"
+		configuration_facade_set_export_export_metadata (G_TYPE_CHECK_INSTANCE_CAST (_tmp67_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp69_);
+#line 360 "/home/jens/Source/shotwell/src/Dialogs.vala"
+		_tmp70_ = config;
+#line 360 "/home/jens/Source/shotwell/src/Dialogs.vala"
+		_tmp71_ = export_dialog_current_constraint;
+#line 360 "/home/jens/Source/shotwell/src/Dialogs.vala"
+		configuration_facade_set_export_constraint (G_TYPE_CHECK_INSTANCE_CAST (_tmp70_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp71_);
+#line 361 "/home/jens/Source/shotwell/src/Dialogs.vala"
+		_tmp72_ = config;
+#line 361 "/home/jens/Source/shotwell/src/Dialogs.vala"
+		_tmp73_ = export_dialog_current_scale;
+#line 361 "/home/jens/Source/shotwell/src/Dialogs.vala"
+		configuration_facade_set_export_scale (G_TYPE_CHECK_INSTANCE_CAST (_tmp72_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp73_);
+#line 330 "/home/jens/Source/shotwell/src/Dialogs.vala"
+		_g_object_unref0 (config);
+#line 3569 "Dialogs.c"
 	} else {
-#line 347 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 363 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_vala_scale = 0;
-#line 348 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 364 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_vala_constraint = SCALE_CONSTRAINT_ORIGINAL;
-#line 3447 "Dialogs.c"
+#line 3575 "Dialogs.c"
 	}
-#line 351 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 367 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 353 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 369 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	result = ok;
-#line 353 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 369 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (scale) {
-#line 353 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 369 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		*scale = _vala_scale;
-#line 3457 "Dialogs.c"
+#line 3585 "Dialogs.c"
 	}
-#line 353 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 369 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (constraint) {
-#line 353 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 369 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		*constraint = _vala_constraint;
-#line 3463 "Dialogs.c"
+#line 3591 "Dialogs.c"
 	}
-#line 353 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 369 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 3467 "Dialogs.c"
+#line 3595 "Dialogs.c"
 }
 
 
 static void export_dialog_add_label (ExportDialog* self, const gchar* text, gint x, gint y, GtkWidget* widget) {
-	GtkAlignment* left_aligned = NULL;
-	GtkAlignment* _tmp0_ = NULL;
 	GtkLabel* new_label = NULL;
-	const gchar* _tmp1_ = NULL;
+	const gchar* _tmp0_ = NULL;
+	GtkLabel* _tmp1_ = NULL;
 	GtkLabel* _tmp2_ = NULL;
 	GtkLabel* _tmp3_ = NULL;
-	GtkWidget* _tmp4_ = NULL;
-	GtkAlignment* _tmp7_ = NULL;
-	GtkLabel* _tmp8_ = NULL;
-	GtkGrid* _tmp9_ = NULL;
-	GtkAlignment* _tmp10_ = NULL;
+	GtkLabel* _tmp4_ = NULL;
+	GtkWidget* _tmp5_ = NULL;
+	GtkGrid* _tmp8_ = NULL;
+	GtkLabel* _tmp9_ = NULL;
+	gint _tmp10_ = 0;
 	gint _tmp11_ = 0;
-	gint _tmp12_ = 0;
-#line 356 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 372 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_EXPORT_DIALOG (self));
-#line 356 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 372 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (text != NULL);
-#line 356 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 372 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail ((widget == NULL) || GTK_IS_WIDGET (widget));
-#line 357 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp0_ = (GtkAlignment*) gtk_alignment_new ((gfloat) 1, 0.5f, (gfloat) 0, (gfloat) 0);
-#line 357 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_object_ref_sink (_tmp0_);
-#line 357 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	left_aligned = _tmp0_;
-#line 359 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp1_ = text;
-#line 359 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp2_ = (GtkLabel*) gtk_label_new_with_mnemonic (_tmp1_);
-#line 359 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_object_ref_sink (_tmp2_);
-#line 359 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	new_label = _tmp2_;
-#line 360 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 373 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp0_ = text;
+#line 373 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp1_ = (GtkLabel*) gtk_label_new_with_mnemonic (_tmp0_);
+#line 373 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	g_object_ref_sink (_tmp1_);
+#line 373 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	new_label = _tmp1_;
+#line 374 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp2_ = new_label;
+#line 374 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_END);
+#line 375 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = new_label;
-#line 360 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_label_set_use_underline (_tmp3_, TRUE);
-#line 362 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp4_ = widget;
-#line 362 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	if (_tmp4_ != NULL) {
-#line 3513 "Dialogs.c"
-		GtkLabel* _tmp5_ = NULL;
-		GtkWidget* _tmp6_ = NULL;
-#line 363 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp5_ = new_label;
-#line 363 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp6_ = widget;
-#line 363 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		gtk_label_set_mnemonic_widget (_tmp5_, _tmp6_);
-#line 3522 "Dialogs.c"
-	}
-#line 365 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp7_ = left_aligned;
-#line 365 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp8_ = new_label;
-#line 365 "/home/jens/Source/shotwell/src/Dialogs.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 367 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp9_ = self->priv->table;
-#line 367 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp10_ = left_aligned;
-#line 367 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp11_ = x;
-#line 367 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp12_ = y;
-#line 367 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_grid_attach (_tmp9_, G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_widget_get_type (), GtkWidget), _tmp11_, _tmp12_, 1, 1);
-#line 356 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 375 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	gtk_widget_set_valign (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_CENTER);
+#line 376 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp4_ = new_label;
+#line 376 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	gtk_label_set_use_underline (_tmp4_, TRUE);
+#line 378 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp5_ = widget;
+#line 378 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	if (_tmp5_ != NULL) {
+#line 3641 "Dialogs.c"
+		GtkLabel* _tmp6_ = NULL;
+		GtkWidget* _tmp7_ = NULL;
+#line 379 "/home/jens/Source/shotwell/src/Dialogs.vala"
+		_tmp6_ = new_label;
+#line 379 "/home/jens/Source/shotwell/src/Dialogs.vala"
+		_tmp7_ = widget;
+#line 379 "/home/jens/Source/shotwell/src/Dialogs.vala"
+		gtk_label_set_mnemonic_widget (_tmp6_, _tmp7_);
+#line 3650 "Dialogs.c"
+	}
+#line 381 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp8_ = self->priv->table;
+#line 381 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp9_ = new_label;
+#line 381 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp10_ = x;
+#line 381 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp11_ = y;
+#line 381 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	gtk_grid_attach (_tmp8_, G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_widget_get_type (), GtkWidget), _tmp10_, _tmp11_, 1, 1);
+#line 372 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (new_label);
-#line 356 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (left_aligned);
-#line 3544 "Dialogs.c"
+#line 3664 "Dialogs.c"
 }
 
 
 static void export_dialog_add_control (ExportDialog* self, GtkWidget* widget, gint x, gint y) {
-	GtkAlignment* left_aligned = NULL;
-	GtkAlignment* _tmp0_ = NULL;
+	GtkWidget* _tmp0_ = NULL;
 	GtkWidget* _tmp1_ = NULL;
-	GtkGrid* _tmp2_ = NULL;
-	gint _tmp3_ = 0;
-	gint _tmp4_ = 0;
-#line 370 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	GtkWidget* _tmp2_ = NULL;
+	GtkWidget* _tmp3_ = NULL;
+	GtkGrid* _tmp4_ = NULL;
+	GtkWidget* _tmp5_ = NULL;
+	gint _tmp6_ = 0;
+	gint _tmp7_ = 0;
+#line 384 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_EXPORT_DIALOG (self));
-#line 370 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 384 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (GTK_IS_WIDGET (widget));
-#line 371 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp0_ = (GtkAlignment*) gtk_alignment_new ((gfloat) 0, 0.5f, (gfloat) 1, (gfloat) 0);
-#line 371 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_object_ref_sink (_tmp0_);
-#line 371 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	left_aligned = _tmp0_;
-#line 372 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 385 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp0_ = widget;
+#line 385 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	gtk_widget_set_halign (_tmp0_, GTK_ALIGN_FILL);
+#line 386 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = widget;
-#line 372 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (left_aligned, gtk_container_get_type (), GtkContainer), _tmp1_);
-#line 374 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp2_ = self->priv->table;
-#line 374 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp3_ = x;
-#line 374 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp4_ = y;
-#line 374 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	gtk_grid_attach (_tmp2_, G_TYPE_CHECK_INSTANCE_CAST (left_aligned, gtk_widget_get_type (), GtkWidget), _tmp3_, _tmp4_, 1, 1);
-#line 370 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_g_object_unref0 (left_aligned);
-#line 3579 "Dialogs.c"
+#line 386 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	gtk_widget_set_valign (_tmp1_, GTK_ALIGN_CENTER);
+#line 387 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp2_ = widget;
+#line 387 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	gtk_widget_set_hexpand (_tmp2_, TRUE);
+#line 388 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp3_ = widget;
+#line 388 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	gtk_widget_set_vexpand (_tmp3_, TRUE);
+#line 390 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp4_ = self->priv->table;
+#line 390 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp5_ = widget;
+#line 390 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp6_ = x;
+#line 390 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp7_ = y;
+#line 390 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	gtk_grid_attach (_tmp4_, _tmp5_, _tmp6_, _tmp7_, 1, 1);
+#line 3707 "Dialogs.c"
 }
 
 
@@ -3603,81 +3731,81 @@ static void export_dialog_on_constraint_changed (ExportDialog* self) {
 	gboolean _tmp14_ = FALSE;
 	GtkComboBoxText* _tmp16_ = NULL;
 	gboolean _tmp17_ = FALSE;
-#line 377 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 393 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_EXPORT_DIALOG (self));
-#line 378 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 394 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = self->priv->constraint_combo;
-#line 378 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 394 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_combo_box_get_type (), GtkComboBox));
-#line 378 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 394 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = EXPORT_DIALOG_CONSTRAINT_ARRAY[_tmp1_];
-#line 378 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 394 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	original = _tmp2_ == SCALE_CONSTRAINT_ORIGINAL;
-#line 379 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 395 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = self->priv->format_combo;
-#line 379 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 395 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp4_ = gtk_combo_box_text_get_active_text (_tmp3_);
-#line 379 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 395 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp5_ = _tmp4_;
-#line 379 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 395 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp6_ = photo_file_format_get_properties (PHOTO_FILE_FORMAT_JFIF);
-#line 379 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 395 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp7_ = _tmp6_;
-#line 379 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 395 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp8_ = photo_file_format_properties_get_user_visible_name (_tmp7_);
-#line 379 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 395 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp9_ = _tmp8_;
-#line 379 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 395 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp10_ = g_strcmp0 (_tmp5_, _tmp9_) == 0;
-#line 379 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 395 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (_tmp9_);
-#line 379 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 395 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_photo_file_format_properties_unref0 (_tmp7_);
-#line 379 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 395 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (_tmp5_);
-#line 379 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 395 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	jpeg = _tmp10_;
-#line 381 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 397 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp11_ = self->priv->pixels_entry;
-#line 381 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 397 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp12_ = original;
-#line 381 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 397 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_widget_get_type (), GtkWidget), !_tmp12_);
-#line 382 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 398 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp14_ = original;
-#line 382 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 398 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (!_tmp14_) {
-#line 3647 "Dialogs.c"
+#line 3775 "Dialogs.c"
 		gboolean _tmp15_ = FALSE;
-#line 382 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 398 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp15_ = jpeg;
-#line 382 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 398 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp13_ = _tmp15_;
-#line 3653 "Dialogs.c"
+#line 3781 "Dialogs.c"
 	} else {
-#line 382 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 398 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp13_ = FALSE;
-#line 3657 "Dialogs.c"
+#line 3785 "Dialogs.c"
 	}
-#line 382 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 398 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp16_ = self->priv->quality_combo;
-#line 382 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 398 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, gtk_widget_get_type (), GtkWidget), _tmp13_);
-#line 383 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 399 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp17_ = original;
-#line 383 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 399 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp17_) {
-#line 3667 "Dialogs.c"
+#line 3795 "Dialogs.c"
 		GtkWidget* _tmp18_ = NULL;
-#line 384 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 400 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp18_ = self->priv->ok_button;
-#line 384 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 400 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_widget_set_sensitive (_tmp18_, TRUE);
-#line 3673 "Dialogs.c"
+#line 3801 "Dialogs.c"
 	} else {
-#line 386 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 402 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		export_dialog_on_pixels_changed (self);
-#line 3677 "Dialogs.c"
+#line 3805 "Dialogs.c"
 	}
 }
 
@@ -3691,102 +3819,102 @@ static void export_dialog_on_format_changed (ExportDialog* self) {
 	gchar* _tmp4_ = NULL;
 	gchar* _tmp5_ = NULL;
 	gboolean _tmp6_ = FALSE;
-#line 389 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 405 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_EXPORT_DIALOG (self));
-#line 390 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 406 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = self->priv->constraint_combo;
-#line 390 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 406 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_combo_box_get_type (), GtkComboBox));
-#line 390 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 406 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = EXPORT_DIALOG_CONSTRAINT_ARRAY[_tmp1_];
-#line 390 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 406 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	original = _tmp2_ == SCALE_CONSTRAINT_ORIGINAL;
-#line 392 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 408 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = self->priv->format_combo;
-#line 392 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 408 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp4_ = gtk_combo_box_text_get_active_text (_tmp3_);
-#line 392 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 408 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp5_ = _tmp4_;
-#line 392 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 408 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp6_ = g_strcmp0 (_tmp5_, EXPORT_DIALOG_UNMODIFIED_FORMAT_LABEL) == 0;
-#line 392 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 408 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (_tmp5_);
-#line 392 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 408 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp6_) {
-#line 3713 "Dialogs.c"
+#line 3841 "Dialogs.c"
 		GtkComboBoxText* _tmp7_ = NULL;
 		GtkComboBoxText* _tmp8_ = NULL;
 		GtkComboBoxText* _tmp9_ = NULL;
 		GtkEntry* _tmp10_ = NULL;
-		GtkCheckButton* _tmp11_ = NULL;
-		GtkCheckButton* _tmp12_ = NULL;
-#line 397 "/home/jens/Source/shotwell/src/Dialogs.vala"
+		GtkSwitch* _tmp11_ = NULL;
+		GtkSwitch* _tmp12_ = NULL;
+#line 413 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp7_ = self->priv->constraint_combo;
-#line 397 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 413 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_combo_box_get_type (), GtkComboBox), 0);
-#line 398 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 414 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp8_ = self->priv->constraint_combo;
-#line 398 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 414 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 399 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 415 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp9_ = self->priv->quality_combo;
-#line 399 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 415 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 400 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 416 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp10_ = self->priv->pixels_entry;
-#line 400 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 416 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 401 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 417 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp11_ = self->priv->export_metadata;
-#line 401 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_toggle_button_get_type (), GtkToggleButton), FALSE);
-#line 402 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 417 "/home/jens/Source/shotwell/src/Dialogs.vala"
+		gtk_switch_set_active (_tmp11_, FALSE);
+#line 418 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp12_ = self->priv->export_metadata;
-#line 402 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 418 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 3744 "Dialogs.c"
+#line 3872 "Dialogs.c"
 	} else {
 		GtkComboBoxText* _tmp13_ = NULL;
 		gchar* _tmp14_ = NULL;
 		gchar* _tmp15_ = NULL;
 		gboolean _tmp16_ = FALSE;
-#line 403 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 419 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp13_ = self->priv->format_combo;
-#line 403 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 419 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp14_ = gtk_combo_box_text_get_active_text (_tmp13_);
-#line 403 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 419 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp15_ = _tmp14_;
-#line 403 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 419 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp16_ = g_strcmp0 (_tmp15_, EXPORT_DIALOG_CURRENT_FORMAT_LABEL) == 0;
-#line 403 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 419 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (_tmp15_);
-#line 403 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 419 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (_tmp16_) {
-#line 3762 "Dialogs.c"
+#line 3890 "Dialogs.c"
 			GtkComboBoxText* _tmp17_ = NULL;
 			GtkComboBoxText* _tmp18_ = NULL;
 			GtkEntry* _tmp19_ = NULL;
 			gboolean _tmp20_ = FALSE;
-			GtkCheckButton* _tmp21_ = NULL;
-#line 410 "/home/jens/Source/shotwell/src/Dialogs.vala"
+			GtkSwitch* _tmp21_ = NULL;
+#line 426 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp17_ = self->priv->constraint_combo;
-#line 410 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 426 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_widget_get_type (), GtkWidget), TRUE);
-#line 411 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 427 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp18_ = self->priv->quality_combo;
-#line 411 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 427 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 412 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 428 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp19_ = self->priv->pixels_entry;
-#line 412 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 428 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp20_ = original;
-#line 412 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 428 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, gtk_widget_get_type (), GtkWidget), !_tmp20_);
-#line 413 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 429 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp21_ = self->priv->export_metadata;
-#line 413 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 429 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, gtk_widget_get_type (), GtkWidget), TRUE);
-#line 3786 "Dialogs.c"
+#line 3914 "Dialogs.c"
 		} else {
 			GtkComboBoxText* _tmp22_ = NULL;
 			gboolean jpeg = FALSE;
@@ -3794,51 +3922,51 @@ static void export_dialog_on_format_changed (ExportDialog* self) {
 			gboolean _tmp24_ = FALSE;
 			gboolean _tmp25_ = FALSE;
 			GtkComboBoxText* _tmp27_ = NULL;
-			GtkCheckButton* _tmp28_ = NULL;
-#line 418 "/home/jens/Source/shotwell/src/Dialogs.vala"
+			GtkSwitch* _tmp28_ = NULL;
+#line 434 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp22_ = self->priv->constraint_combo;
-#line 418 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 434 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, gtk_widget_get_type (), GtkWidget), TRUE);
-#line 419 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 435 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp23_ = export_dialog_get_specified_format (self);
-#line 419 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 435 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			jpeg = _tmp23_ == PHOTO_FILE_FORMAT_JFIF;
-#line 420 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 436 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp25_ = original;
-#line 420 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 436 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			if (!_tmp25_) {
-#line 3807 "Dialogs.c"
+#line 3935 "Dialogs.c"
 				gboolean _tmp26_ = FALSE;
-#line 420 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 436 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp26_ = jpeg;
-#line 420 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 436 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp24_ = _tmp26_;
-#line 3813 "Dialogs.c"
+#line 3941 "Dialogs.c"
 			} else {
-#line 420 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 436 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp24_ = FALSE;
-#line 3817 "Dialogs.c"
+#line 3945 "Dialogs.c"
 			}
-#line 420 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 436 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp27_ = self->priv->quality_combo;
-#line 420 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 436 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, gtk_widget_get_type (), GtkWidget), _tmp24_);
-#line 421 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 437 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp28_ = self->priv->export_metadata;
-#line 421 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 437 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, gtk_widget_get_type (), GtkWidget), TRUE);
-#line 3827 "Dialogs.c"
+#line 3955 "Dialogs.c"
 		}
 	}
 }
 
 
 static void export_dialog_on_activate (ExportDialog* self) {
-#line 425 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 441 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_EXPORT_DIALOG (self));
-#line 426 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 442 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_dialog_response (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), (gint) GTK_RESPONSE_OK);
-#line 3838 "Dialogs.c"
+#line 3966 "Dialogs.c"
 }
 
 
@@ -3847,37 +3975,37 @@ static void export_dialog_on_pixels_changed (ExportDialog* self) {
 	GtkEntry* _tmp1_ = NULL;
 	guint16 _tmp2_ = 0U;
 	GtkWidget* _tmp6_ = NULL;
-#line 429 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 445 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_EXPORT_DIALOG (self));
-#line 430 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 446 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = self->priv->pixels_entry;
-#line 430 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 446 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = gtk_entry_get_text_length (_tmp1_);
-#line 430 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 446 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (((gint) _tmp2_) > 0) {
-#line 3855 "Dialogs.c"
+#line 3983 "Dialogs.c"
 		GtkEntry* _tmp3_ = NULL;
 		const gchar* _tmp4_ = NULL;
 		gint _tmp5_ = 0;
-#line 430 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 446 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp3_ = self->priv->pixels_entry;
-#line 430 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 446 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp4_ = gtk_entry_get_text (_tmp3_);
-#line 430 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 446 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp5_ = atoi (_tmp4_);
-#line 430 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 446 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp0_ = _tmp5_ > 0;
-#line 3867 "Dialogs.c"
+#line 3995 "Dialogs.c"
 	} else {
-#line 430 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 446 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp0_ = FALSE;
-#line 3871 "Dialogs.c"
+#line 3999 "Dialogs.c"
 	}
-#line 430 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 446 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp6_ = self->priv->ok_button;
-#line 430 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 446 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_set_sensitive (_tmp6_, _tmp0_);
-#line 3877 "Dialogs.c"
+#line 4005 "Dialogs.c"
 }
 
 
@@ -3895,7 +4023,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 3895 "Dialogs.c"
+#line 4023 "Dialogs.c"
 }
 
 
@@ -3908,94 +4036,94 @@ static void export_dialog_on_pixels_insert_text (ExportDialog* self, const gchar
 	gint _tmp22_ = 0;
 	gint _tmp23_ = 0;
 	GtkEntry* _tmp29_ = NULL;
-#line 433 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 449 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_EXPORT_DIALOG (self));
-#line 433 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 449 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (text != NULL);
-#line 435 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 451 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = self->priv->in_insert;
-#line 435 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 451 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp0_) {
-#line 436 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 452 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		return;
-#line 3918 "Dialogs.c"
+#line 4046 "Dialogs.c"
 	}
-#line 438 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 454 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->in_insert = TRUE;
-#line 440 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 456 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = length;
-#line 440 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 456 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp1_ == -1) {
-#line 3926 "Dialogs.c"
+#line 4054 "Dialogs.c"
 		const gchar* _tmp2_ = NULL;
 		gint _tmp3_ = 0;
 		gint _tmp4_ = 0;
-#line 441 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 457 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp2_ = text;
-#line 441 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 457 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp3_ = strlen (_tmp2_);
-#line 441 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 457 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp4_ = _tmp3_;
-#line 441 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 457 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		length = (gint) _tmp4_;
-#line 3938 "Dialogs.c"
+#line 4066 "Dialogs.c"
 	}
-#line 444 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 460 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp5_ = g_strdup ("");
-#line 444 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 460 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	new_text = _tmp5_;
-#line 3944 "Dialogs.c"
+#line 4072 "Dialogs.c"
 	{
 		gint ctr = 0;
-#line 445 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 461 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		ctr = 0;
-#line 3949 "Dialogs.c"
+#line 4077 "Dialogs.c"
 		{
 			gboolean _tmp6_ = FALSE;
-#line 445 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 461 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp6_ = TRUE;
-#line 445 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 461 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			while (TRUE) {
-#line 3956 "Dialogs.c"
+#line 4084 "Dialogs.c"
 				gint _tmp8_ = 0;
 				gint _tmp9_ = 0;
 				const gchar* _tmp10_ = NULL;
 				gint _tmp11_ = 0;
 				gchar _tmp12_ = '\0';
 				gboolean _tmp13_ = FALSE;
-#line 445 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 461 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				if (!_tmp6_) {
-#line 3965 "Dialogs.c"
+#line 4093 "Dialogs.c"
 					gint _tmp7_ = 0;
-#line 445 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 461 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp7_ = ctr;
-#line 445 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 461 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					ctr = _tmp7_ + 1;
-#line 3971 "Dialogs.c"
+#line 4099 "Dialogs.c"
 				}
-#line 445 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 461 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp6_ = FALSE;
-#line 445 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 461 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp8_ = ctr;
-#line 445 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 461 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp9_ = length;
-#line 445 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 461 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				if (!(_tmp8_ < _tmp9_)) {
-#line 445 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 461 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					break;
-#line 3983 "Dialogs.c"
+#line 4111 "Dialogs.c"
 				}
-#line 446 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 462 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp10_ = text;
-#line 446 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 462 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp11_ = ctr;
-#line 446 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 462 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp12_ = string_get (_tmp10_, (glong) _tmp11_);
-#line 446 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 462 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp13_ = g_ascii_isdigit (_tmp12_);
-#line 446 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 462 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				if (_tmp13_) {
-#line 3995 "Dialogs.c"
+#line 4123 "Dialogs.c"
 					const gchar* _tmp14_ = NULL;
 					const gchar* _tmp15_ = NULL;
 					gint _tmp16_ = 0;
@@ -4003,133 +4131,133 @@ static void export_dialog_on_pixels_insert_text (ExportDialog* self, const gchar
 					gchar* _tmp18_ = NULL;
 					gchar* _tmp19_ = NULL;
 					gchar* _tmp20_ = NULL;
-#line 447 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 463 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp14_ = new_text;
-#line 447 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 463 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp15_ = text;
-#line 447 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 463 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp16_ = ctr;
-#line 447 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 463 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp17_ = string_get (_tmp15_, (glong) _tmp16_);
-#line 447 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 463 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp18_ = g_strdup_printf ("%c", (gchar) _tmp17_);
-#line 447 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 463 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp19_ = _tmp18_;
-#line 447 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 463 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp20_ = g_strconcat (_tmp14_, _tmp19_, NULL);
-#line 447 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 463 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_g_free0 (new_text);
-#line 447 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 463 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					new_text = _tmp20_;
-#line 447 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 463 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_g_free0 (_tmp19_);
-#line 4023 "Dialogs.c"
+#line 4151 "Dialogs.c"
 				}
 			}
 		}
 	}
-#line 451 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 467 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp21_ = new_text;
-#line 451 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 467 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp22_ = strlen (_tmp21_);
-#line 451 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 467 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp23_ = _tmp22_;
-#line 451 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 467 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp23_ > 0) {
-#line 4036 "Dialogs.c"
+#line 4164 "Dialogs.c"
 		GtkEntry* _tmp24_ = NULL;
 		const gchar* _tmp25_ = NULL;
 		const gchar* _tmp26_ = NULL;
 		gint _tmp27_ = 0;
 		gint _tmp28_ = 0;
-#line 452 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 468 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp24_ = self->priv->pixels_entry;
-#line 452 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 468 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp25_ = new_text;
-#line 452 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 468 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp26_ = new_text;
-#line 452 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 468 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp27_ = strlen (_tmp26_);
-#line 452 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 468 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp28_ = _tmp27_;
-#line 452 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 468 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_editable_insert_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GTK_TYPE_EDITABLE, GtkEditable), _tmp25_, (gint) _tmp28_, position);
-#line 4054 "Dialogs.c"
+#line 4182 "Dialogs.c"
 	}
-#line 454 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 470 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp29_ = self->priv->pixels_entry;
-#line 454 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 470 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_signal_stop_emission_by_name (_tmp29_, "insert-text");
-#line 456 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 472 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->in_insert = FALSE;
-#line 433 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 449 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (new_text);
-#line 4064 "Dialogs.c"
+#line 4192 "Dialogs.c"
 }
 
 
 static void export_dialog_class_init (ExportDialogClass * klass) {
 	ExportFormatParameters _tmp0_ = {0};
-#line 141 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 137 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	export_dialog_parent_class = g_type_class_peek_parent (klass);
-#line 141 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 137 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_type_class_add_private (klass, sizeof (ExportDialogPrivate));
-#line 141 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 137 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	G_OBJECT_CLASS (klass)->finalize = export_dialog_finalize;
-#line 158 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 154 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	export_format_parameters_current (&_tmp0_);
-#line 158 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 154 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	export_dialog_current_parameters = _tmp0_;
-#line 159 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 155 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	export_dialog_current_scale = EXPORT_DIALOG_DEFAULT_SCALE;
-#line 4082 "Dialogs.c"
+#line 4210 "Dialogs.c"
 }
 
 
 static void export_dialog_instance_init (ExportDialog * self) {
 	GtkGrid* _tmp0_ = NULL;
 	GeeArrayList* _tmp1_ = NULL;
-#line 141 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 137 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv = EXPORT_DIALOG_GET_PRIVATE (self);
-#line 161 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 157 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = (GtkGrid*) gtk_grid_new ();
-#line 161 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 157 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_object_ref_sink (_tmp0_);
-#line 161 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 157 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->table = _tmp0_;
-#line 166 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 162 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = gee_array_list_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, NULL, NULL, NULL);
-#line 166 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 162 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->format_options = _tmp1_;
-#line 169 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 165 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->in_insert = FALSE;
-#line 4103 "Dialogs.c"
+#line 4231 "Dialogs.c"
 }
 
 
 static void export_dialog_finalize (GObject* obj) {
 	ExportDialog * self;
-#line 141 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 137 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_EXPORT_DIALOG, ExportDialog);
-#line 161 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 157 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->table);
-#line 162 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 158 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->quality_combo);
-#line 163 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 159 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->constraint_combo);
-#line 164 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 160 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->format_combo);
-#line 165 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 161 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->export_metadata);
-#line 166 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 162 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->format_options);
-#line 167 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 163 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->pixels_entry);
-#line 168 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 164 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->ok_button);
-#line 141 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 137 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	G_OBJECT_CLASS (export_dialog_parent_class)->finalize (obj);
-#line 4129 "Dialogs.c"
+#line 4257 "Dialogs.c"
 }
 
 
@@ -4157,39 +4285,39 @@ gchar* import_ui_generate_import_failure_list (GeeList* failed, gboolean show_de
 	gint _tmp29_ = 0;
 	gint _tmp30_ = 0;
 	gint _tmp31_ = 0;
-#line 466 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 482 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (GEE_IS_LIST (failed), NULL);
-#line 467 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 483 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = failed;
-#line 467 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 483 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 467 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 483 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = _tmp1_;
-#line 467 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 483 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp2_ == 0) {
-#line 468 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 484 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		result = NULL;
-#line 468 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 484 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		return result;
-#line 4171 "Dialogs.c"
+#line 4299 "Dialogs.c"
 	}
-#line 470 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 486 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = g_strdup ("");
-#line 470 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 486 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	list = _tmp3_;
-#line 4177 "Dialogs.c"
+#line 4305 "Dialogs.c"
 	{
 		gint ctr = 0;
-#line 471 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 487 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		ctr = 0;
-#line 4182 "Dialogs.c"
+#line 4310 "Dialogs.c"
 		{
 			gboolean _tmp4_ = FALSE;
-#line 471 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 487 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp4_ = TRUE;
-#line 471 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 487 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			while (TRUE) {
-#line 4189 "Dialogs.c"
+#line 4317 "Dialogs.c"
 				gboolean _tmp6_ = FALSE;
 				gint _tmp7_ = 0;
 				const gchar* _tmp12_ = NULL;
@@ -4198,158 +4326,158 @@ gchar* import_ui_generate_import_failure_list (GeeList* failed, gboolean show_de
 				gchar* _tmp25_ = NULL;
 				gchar* _tmp26_ = NULL;
 				gchar* _tmp27_ = NULL;
-#line 471 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 487 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				if (!_tmp4_) {
-#line 4200 "Dialogs.c"
+#line 4328 "Dialogs.c"
 					gint _tmp5_ = 0;
-#line 471 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 487 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp5_ = ctr;
-#line 471 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 487 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					ctr = _tmp5_ + 1;
-#line 4206 "Dialogs.c"
+#line 4334 "Dialogs.c"
 				}
-#line 471 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 487 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp4_ = FALSE;
-#line 471 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 487 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp7_ = ctr;
-#line 471 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 487 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				if (_tmp7_ < IMPORT_UI_REPORT_FAILURE_COUNT) {
-#line 4214 "Dialogs.c"
+#line 4342 "Dialogs.c"
 					gint _tmp8_ = 0;
 					GeeList* _tmp9_ = NULL;
 					gint _tmp10_ = 0;
 					gint _tmp11_ = 0;
-#line 471 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 487 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp8_ = ctr;
-#line 471 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 487 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp9_ = failed;
-#line 471 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 487 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp10_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 471 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 487 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp11_ = _tmp10_;
-#line 471 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 487 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp6_ = _tmp8_ < _tmp11_;
-#line 4229 "Dialogs.c"
+#line 4357 "Dialogs.c"
 				} else {
-#line 471 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 487 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp6_ = FALSE;
-#line 4233 "Dialogs.c"
+#line 4361 "Dialogs.c"
 				}
-#line 471 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 487 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				if (!_tmp6_) {
-#line 471 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 487 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					break;
-#line 4239 "Dialogs.c"
+#line 4367 "Dialogs.c"
 				}
-#line 472 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 488 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp13_ = show_dest_id;
-#line 472 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 488 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				if (_tmp13_) {
-#line 4245 "Dialogs.c"
+#line 4373 "Dialogs.c"
 					GeeList* _tmp14_ = NULL;
 					gint _tmp15_ = 0;
 					gpointer _tmp16_ = NULL;
 					BatchImportResult* _tmp17_ = NULL;
 					const gchar* _tmp18_ = NULL;
-#line 472 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 488 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp14_ = failed;
-#line 472 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 488 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp15_ = ctr;
-#line 472 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 488 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp16_ = gee_list_get (_tmp14_, _tmp15_);
-#line 472 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 488 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp17_ = (BatchImportResult*) _tmp16_;
-#line 472 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 488 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp18_ = _tmp17_->dest_identifier;
-#line 472 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 488 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp12_ = _tmp18_;
-#line 472 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 488 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_batch_import_result_unref0 (_tmp17_);
-#line 4265 "Dialogs.c"
+#line 4393 "Dialogs.c"
 				} else {
 					GeeList* _tmp19_ = NULL;
 					gint _tmp20_ = 0;
 					gpointer _tmp21_ = NULL;
 					BatchImportResult* _tmp22_ = NULL;
 					const gchar* _tmp23_ = NULL;
-#line 473 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 489 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp19_ = failed;
-#line 473 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 489 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp20_ = ctr;
-#line 473 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 489 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp21_ = gee_list_get (_tmp19_, _tmp20_);
-#line 473 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 489 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp22_ = (BatchImportResult*) _tmp21_;
-#line 473 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 489 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp23_ = _tmp22_->src_identifier;
-#line 473 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 489 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp12_ = _tmp23_;
-#line 473 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 489 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_batch_import_result_unref0 (_tmp22_);
-#line 4286 "Dialogs.c"
+#line 4414 "Dialogs.c"
 				}
-#line 472 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 488 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp24_ = list;
-#line 472 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 488 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp25_ = g_strdup_printf ("%s\n", _tmp12_);
-#line 472 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 488 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp26_ = _tmp25_;
-#line 472 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 488 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp27_ = g_strconcat (_tmp24_, _tmp26_, NULL);
-#line 472 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 488 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_free0 (list);
-#line 472 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 488 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				list = _tmp27_;
-#line 472 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 488 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_free0 (_tmp26_);
-#line 4302 "Dialogs.c"
+#line 4430 "Dialogs.c"
 			}
 		}
 	}
-#line 476 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 492 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp28_ = failed;
-#line 476 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 492 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp29_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 476 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 492 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp30_ = _tmp29_;
-#line 476 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 492 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	remaining = _tmp30_ - IMPORT_UI_REPORT_FAILURE_COUNT;
-#line 477 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 493 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp31_ = remaining;
-#line 477 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 493 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp31_ > 0) {
-#line 4318 "Dialogs.c"
+#line 4446 "Dialogs.c"
 		const gchar* _tmp32_ = NULL;
 		const gchar* _tmp33_ = NULL;
 		gint _tmp34_ = 0;
 		gchar* _tmp35_ = NULL;
 		gchar* _tmp36_ = NULL;
 		gchar* _tmp37_ = NULL;
-#line 478 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 494 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp32_ = list;
-#line 478 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 494 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp33_ = _ ("(and %d more)\n");
-#line 478 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 494 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp34_ = remaining;
-#line 478 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 494 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp35_ = g_strdup_printf (_tmp33_, _tmp34_);
-#line 478 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 494 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp36_ = _tmp35_;
-#line 478 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 494 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp37_ = g_strconcat (_tmp32_, _tmp36_, NULL);
-#line 478 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 494 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (list);
-#line 478 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 494 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		list = _tmp37_;
-#line 478 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 494 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (_tmp36_);
-#line 4343 "Dialogs.c"
+#line 4471 "Dialogs.c"
 	}
-#line 480 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 496 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	result = list;
-#line 480 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 496 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 4349 "Dialogs.c"
+#line 4477 "Dialogs.c"
 }
 
 
@@ -4361,260 +4489,260 @@ ImportUIQuestionParams* import_ui_question_params_construct (GType object_type,
 	gchar* _tmp3_ = NULL;
 	const gchar* _tmp4_ = NULL;
 	gchar* _tmp5_ = NULL;
-#line 488 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 504 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (question != NULL, NULL);
-#line 488 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 504 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (yes_button != NULL, NULL);
-#line 488 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 504 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (no_button != NULL, NULL);
-#line 488 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 504 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self = (ImportUIQuestionParams*) g_type_create_instance (object_type);
-#line 489 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 505 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = question;
-#line 489 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 505 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 489 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 505 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (self->question);
-#line 489 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 505 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->question = _tmp1_;
-#line 490 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 506 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = yes_button;
-#line 490 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 506 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = g_strdup (_tmp2_);
-#line 490 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 506 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (self->yes_button);
-#line 490 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 506 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->yes_button = _tmp3_;
-#line 491 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 507 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp4_ = no_button;
-#line 491 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 507 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp5_ = g_strdup (_tmp4_);
-#line 491 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 507 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (self->no_button);
-#line 491 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 507 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->no_button = _tmp5_;
-#line 488 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 504 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return self;
-#line 4395 "Dialogs.c"
+#line 4523 "Dialogs.c"
 }
 
 
 ImportUIQuestionParams* import_ui_question_params_new (const gchar* question, const gchar* yes_button, const gchar* no_button) {
-#line 488 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 504 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return import_ui_question_params_construct (IMPORT_UI_TYPE_QUESTION_PARAMS, question, yes_button, no_button);
-#line 4402 "Dialogs.c"
+#line 4530 "Dialogs.c"
 }
 
 
 static void import_ui_value_question_params_init (GValue* value) {
-#line 483 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	value->data[0].v_pointer = NULL;
-#line 4409 "Dialogs.c"
+#line 4537 "Dialogs.c"
 }
 
 
 static void import_ui_value_question_params_free_value (GValue* value) {
-#line 483 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (value->data[0].v_pointer) {
-#line 483 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		import_ui_question_params_unref (value->data[0].v_pointer);
-#line 4418 "Dialogs.c"
+#line 4546 "Dialogs.c"
 	}
 }
 
 
 static void import_ui_value_question_params_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 483 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (src_value->data[0].v_pointer) {
-#line 483 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		dest_value->data[0].v_pointer = import_ui_question_params_ref (src_value->data[0].v_pointer);
-#line 4428 "Dialogs.c"
+#line 4556 "Dialogs.c"
 	} else {
-#line 483 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 4432 "Dialogs.c"
+#line 4560 "Dialogs.c"
 	}
 }
 
 
 static gpointer import_ui_value_question_params_peek_pointer (const GValue* value) {
-#line 483 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return value->data[0].v_pointer;
-#line 4440 "Dialogs.c"
+#line 4568 "Dialogs.c"
 }
 
 
 static gchar* import_ui_value_question_params_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 483 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (collect_values[0].v_pointer) {
-#line 4447 "Dialogs.c"
+#line 4575 "Dialogs.c"
 		ImportUIQuestionParams* object;
 		object = collect_values[0].v_pointer;
-#line 483 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (object->parent_instance.g_class == NULL) {
-#line 483 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 4454 "Dialogs.c"
+#line 4582 "Dialogs.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 483 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 4458 "Dialogs.c"
+#line 4586 "Dialogs.c"
 		}
-#line 483 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		value->data[0].v_pointer = import_ui_question_params_ref (object);
-#line 4462 "Dialogs.c"
+#line 4590 "Dialogs.c"
 	} else {
-#line 483 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		value->data[0].v_pointer = NULL;
-#line 4466 "Dialogs.c"
+#line 4594 "Dialogs.c"
 	}
-#line 483 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return NULL;
-#line 4470 "Dialogs.c"
+#line 4598 "Dialogs.c"
 }
 
 
 static gchar* import_ui_value_question_params_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 	ImportUIQuestionParams** object_p;
 	object_p = collect_values[0].v_pointer;
-#line 483 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (!object_p) {
-#line 483 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 4481 "Dialogs.c"
+#line 4609 "Dialogs.c"
 	}
-#line 483 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (!value->data[0].v_pointer) {
-#line 483 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		*object_p = NULL;
-#line 4487 "Dialogs.c"
+#line 4615 "Dialogs.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 483 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		*object_p = value->data[0].v_pointer;
-#line 4491 "Dialogs.c"
+#line 4619 "Dialogs.c"
 	} else {
-#line 483 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		*object_p = import_ui_question_params_ref (value->data[0].v_pointer);
-#line 4495 "Dialogs.c"
+#line 4623 "Dialogs.c"
 	}
-#line 483 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return NULL;
-#line 4499 "Dialogs.c"
+#line 4627 "Dialogs.c"
 }
 
 
 GParamSpec* import_ui_param_spec_question_params (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
 	ImportUIParamSpecQuestionParams* spec;
-#line 483 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, IMPORT_UI_TYPE_QUESTION_PARAMS), NULL);
-#line 483 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 483 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 483 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return G_PARAM_SPEC (spec);
-#line 4513 "Dialogs.c"
+#line 4641 "Dialogs.c"
 }
 
 
 gpointer import_ui_value_get_question_params (const GValue* value) {
-#line 483 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, IMPORT_UI_TYPE_QUESTION_PARAMS), NULL);
-#line 483 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return value->data[0].v_pointer;
-#line 4522 "Dialogs.c"
+#line 4650 "Dialogs.c"
 }
 
 
 void import_ui_value_set_question_params (GValue* value, gpointer v_object) {
 	ImportUIQuestionParams* old;
-#line 483 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, IMPORT_UI_TYPE_QUESTION_PARAMS));
-#line 483 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	old = value->data[0].v_pointer;
-#line 483 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (v_object) {
-#line 483 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, IMPORT_UI_TYPE_QUESTION_PARAMS));
-#line 483 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 483 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		value->data[0].v_pointer = v_object;
-#line 483 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		import_ui_question_params_ref (value->data[0].v_pointer);
-#line 4542 "Dialogs.c"
+#line 4670 "Dialogs.c"
 	} else {
-#line 483 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		value->data[0].v_pointer = NULL;
-#line 4546 "Dialogs.c"
+#line 4674 "Dialogs.c"
 	}
-#line 483 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (old) {
-#line 483 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		import_ui_question_params_unref (old);
-#line 4552 "Dialogs.c"
+#line 4680 "Dialogs.c"
 	}
 }
 
 
 void import_ui_value_take_question_params (GValue* value, gpointer v_object) {
 	ImportUIQuestionParams* old;
-#line 483 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, IMPORT_UI_TYPE_QUESTION_PARAMS));
-#line 483 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	old = value->data[0].v_pointer;
-#line 483 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (v_object) {
-#line 483 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, IMPORT_UI_TYPE_QUESTION_PARAMS));
-#line 483 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 483 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		value->data[0].v_pointer = v_object;
-#line 4571 "Dialogs.c"
+#line 4699 "Dialogs.c"
 	} else {
-#line 483 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		value->data[0].v_pointer = NULL;
-#line 4575 "Dialogs.c"
+#line 4703 "Dialogs.c"
 	}
-#line 483 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (old) {
-#line 483 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		import_ui_question_params_unref (old);
-#line 4581 "Dialogs.c"
+#line 4709 "Dialogs.c"
 	}
 }
 
 
 static void import_ui_question_params_class_init (ImportUIQuestionParamsClass * klass) {
-#line 483 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	import_ui_question_params_parent_class = g_type_class_peek_parent (klass);
-#line 483 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	((ImportUIQuestionParamsClass *) klass)->finalize = import_ui_question_params_finalize;
-#line 4591 "Dialogs.c"
+#line 4719 "Dialogs.c"
 }
 
 
 static void import_ui_question_params_instance_init (ImportUIQuestionParams * self) {
-#line 483 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->ref_count = 1;
-#line 4598 "Dialogs.c"
+#line 4726 "Dialogs.c"
 }
 
 
 static void import_ui_question_params_finalize (ImportUIQuestionParams* obj) {
 	ImportUIQuestionParams * self;
-#line 483 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, IMPORT_UI_TYPE_QUESTION_PARAMS, ImportUIQuestionParams);
-#line 483 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_signal_handlers_destroy (self);
-#line 484 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 500 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (self->question);
-#line 485 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 501 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (self->yes_button);
-#line 486 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 502 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (self->no_button);
-#line 4614 "Dialogs.c"
+#line 4742 "Dialogs.c"
 }
 
 
@@ -4635,46 +4763,46 @@ GType import_ui_question_params_get_type (void) {
 gpointer import_ui_question_params_ref (gpointer instance) {
 	ImportUIQuestionParams* self;
 	self = instance;
-#line 483 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_atomic_int_inc (&self->ref_count);
-#line 483 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return instance;
-#line 4639 "Dialogs.c"
+#line 4767 "Dialogs.c"
 }
 
 
 void import_ui_question_params_unref (gpointer instance) {
 	ImportUIQuestionParams* self;
 	self = instance;
-#line 483 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 483 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		IMPORT_UI_QUESTION_PARAMS_GET_CLASS (self)->finalize (self);
-#line 483 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 4652 "Dialogs.c"
+#line 4780 "Dialogs.c"
 	}
 }
 
 
 gboolean import_ui_import_has_photos (GeeCollection* import_collection) {
 	gboolean result = FALSE;
-#line 495 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 511 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (GEE_IS_COLLECTION (import_collection), FALSE);
-#line 4661 "Dialogs.c"
+#line 4789 "Dialogs.c"
 	{
 		GeeIterator* _current_result_it = NULL;
 		GeeCollection* _tmp0_ = NULL;
 		GeeIterator* _tmp1_ = NULL;
-#line 496 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 512 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp0_ = import_collection;
-#line 496 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 512 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp1_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 496 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 512 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_current_result_it = _tmp1_;
-#line 496 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 512 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		while (TRUE) {
-#line 4674 "Dialogs.c"
+#line 4802 "Dialogs.c"
 			GeeIterator* _tmp2_ = NULL;
 			gboolean _tmp3_ = FALSE;
 			BatchImportResult* current_result = NULL;
@@ -4683,92 +4811,92 @@ gboolean import_ui_import_has_photos (GeeCollection* import_collection) {
 			gboolean _tmp6_ = FALSE;
 			BatchImportResult* _tmp7_ = NULL;
 			GFile* _tmp8_ = NULL;
-#line 496 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 512 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp2_ = _current_result_it;
-#line 496 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 512 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp3_ = gee_iterator_next (_tmp2_);
-#line 496 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 512 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			if (!_tmp3_) {
-#line 496 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 512 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				break;
-#line 4691 "Dialogs.c"
+#line 4819 "Dialogs.c"
 			}
-#line 496 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 512 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp4_ = _current_result_it;
-#line 496 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 512 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp5_ = gee_iterator_get (_tmp4_);
-#line 496 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 512 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			current_result = (BatchImportResult*) _tmp5_;
-#line 497 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 513 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp7_ = current_result;
-#line 497 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 513 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp8_ = _tmp7_->file;
-#line 497 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 513 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			if (_tmp8_ != NULL) {
-#line 4705 "Dialogs.c"
+#line 4833 "Dialogs.c"
 				BatchImportResult* _tmp9_ = NULL;
 				GFile* _tmp10_ = NULL;
 				PhotoFileFormat _tmp11_ = 0;
-#line 498 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 514 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp9_ = current_result;
-#line 498 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 514 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp10_ = _tmp9_->file;
-#line 498 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 514 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp11_ = photo_file_format_get_by_file_extension (_tmp10_);
-#line 498 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 514 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp6_ = _tmp11_ != PHOTO_FILE_FORMAT_UNKNOWN;
-#line 4717 "Dialogs.c"
+#line 4845 "Dialogs.c"
 			} else {
-#line 497 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 513 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp6_ = FALSE;
-#line 4721 "Dialogs.c"
+#line 4849 "Dialogs.c"
 			}
-#line 497 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 513 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			if (_tmp6_) {
-#line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 515 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				result = TRUE;
-#line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 515 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_batch_import_result_unref0 (current_result);
-#line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 515 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_object_unref0 (_current_result_it);
-#line 499 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 515 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				return result;
-#line 4733 "Dialogs.c"
+#line 4861 "Dialogs.c"
 			}
-#line 496 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 512 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_batch_import_result_unref0 (current_result);
-#line 4737 "Dialogs.c"
+#line 4865 "Dialogs.c"
 		}
-#line 496 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 512 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (_current_result_it);
-#line 4741 "Dialogs.c"
+#line 4869 "Dialogs.c"
 	}
-#line 502 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 518 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	result = FALSE;
-#line 502 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 518 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 4747 "Dialogs.c"
+#line 4875 "Dialogs.c"
 }
 
 
 gboolean import_ui_import_has_videos (GeeCollection* import_collection) {
 	gboolean result = FALSE;
-#line 505 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 521 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (GEE_IS_COLLECTION (import_collection), FALSE);
-#line 4755 "Dialogs.c"
+#line 4883 "Dialogs.c"
 	{
 		GeeIterator* _current_result_it = NULL;
 		GeeCollection* _tmp0_ = NULL;
 		GeeIterator* _tmp1_ = NULL;
-#line 506 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 522 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp0_ = import_collection;
-#line 506 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 522 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp1_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 506 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 522 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_current_result_it = _tmp1_;
-#line 506 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 522 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		while (TRUE) {
-#line 4768 "Dialogs.c"
+#line 4896 "Dialogs.c"
 			GeeIterator* _tmp2_ = NULL;
 			gboolean _tmp3_ = FALSE;
 			BatchImportResult* current_result = NULL;
@@ -4777,71 +4905,71 @@ gboolean import_ui_import_has_videos (GeeCollection* import_collection) {
 			gboolean _tmp6_ = FALSE;
 			BatchImportResult* _tmp7_ = NULL;
 			GFile* _tmp8_ = NULL;
-#line 506 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 522 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp2_ = _current_result_it;
-#line 506 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 522 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp3_ = gee_iterator_next (_tmp2_);
-#line 506 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 522 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			if (!_tmp3_) {
-#line 506 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 522 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				break;
-#line 4785 "Dialogs.c"
+#line 4913 "Dialogs.c"
 			}
-#line 506 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 522 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp4_ = _current_result_it;
-#line 506 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 522 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp5_ = gee_iterator_get (_tmp4_);
-#line 506 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 522 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			current_result = (BatchImportResult*) _tmp5_;
-#line 507 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 523 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp7_ = current_result;
-#line 507 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 523 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp8_ = _tmp7_->file;
-#line 507 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 523 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			if (_tmp8_ != NULL) {
-#line 4799 "Dialogs.c"
+#line 4927 "Dialogs.c"
 				BatchImportResult* _tmp9_ = NULL;
 				GFile* _tmp10_ = NULL;
 				gboolean _tmp11_ = FALSE;
-#line 507 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 523 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp9_ = current_result;
-#line 507 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 523 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp10_ = _tmp9_->file;
-#line 507 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 523 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp11_ = video_reader_is_supported_video_file (_tmp10_);
-#line 507 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 523 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp6_ = _tmp11_;
-#line 4811 "Dialogs.c"
+#line 4939 "Dialogs.c"
 			} else {
-#line 507 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 523 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp6_ = FALSE;
-#line 4815 "Dialogs.c"
+#line 4943 "Dialogs.c"
 			}
-#line 507 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 523 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			if (_tmp6_) {
-#line 508 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 524 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				result = TRUE;
-#line 508 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 524 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_batch_import_result_unref0 (current_result);
-#line 508 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 524 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_object_unref0 (_current_result_it);
-#line 508 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 524 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				return result;
-#line 4827 "Dialogs.c"
+#line 4955 "Dialogs.c"
 			}
-#line 506 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 522 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_batch_import_result_unref0 (current_result);
-#line 4831 "Dialogs.c"
+#line 4959 "Dialogs.c"
 		}
-#line 506 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 522 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (_current_result_it);
-#line 4835 "Dialogs.c"
+#line 4963 "Dialogs.c"
 	}
-#line 510 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 526 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	result = FALSE;
-#line 510 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 526 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 4841 "Dialogs.c"
+#line 4969 "Dialogs.c"
 }
 
 
@@ -4855,106 +4983,106 @@ gchar* import_ui_get_media_specific_string (GeeCollection* import_collection, co
 	gboolean _tmp3_ = FALSE;
 	gboolean _tmp4_ = FALSE;
 	gboolean _tmp5_ = FALSE;
-#line 513 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 529 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (GEE_IS_COLLECTION (import_collection), NULL);
-#line 513 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 529 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (photos_msg != NULL, NULL);
-#line 513 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 529 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (videos_msg != NULL, NULL);
-#line 513 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 529 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (both_msg != NULL, NULL);
-#line 513 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 529 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (neither_msg != NULL, NULL);
-#line 515 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 531 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = import_collection;
-#line 515 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 531 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = import_ui_import_has_photos (_tmp0_);
-#line 515 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 531 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	has_photos = _tmp1_;
-#line 516 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 532 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = import_collection;
-#line 516 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 532 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = import_ui_import_has_videos (_tmp2_);
-#line 516 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 532 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	has_videos = _tmp3_;
-#line 518 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 534 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp5_ = has_photos;
-#line 518 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 534 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp5_) {
-#line 4881 "Dialogs.c"
+#line 5009 "Dialogs.c"
 		gboolean _tmp6_ = FALSE;
-#line 518 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 534 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp6_ = has_videos;
-#line 518 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 534 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp4_ = _tmp6_;
-#line 4887 "Dialogs.c"
+#line 5015 "Dialogs.c"
 	} else {
-#line 518 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 534 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp4_ = FALSE;
-#line 4891 "Dialogs.c"
+#line 5019 "Dialogs.c"
 	}
-#line 518 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 534 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp4_) {
-#line 4895 "Dialogs.c"
+#line 5023 "Dialogs.c"
 		const gchar* _tmp7_ = NULL;
 		gchar* _tmp8_ = NULL;
-#line 519 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 535 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp7_ = both_msg;
-#line 519 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 535 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp8_ = g_strdup (_tmp7_);
-#line 519 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 535 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		result = _tmp8_;
-#line 519 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 535 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		return result;
-#line 4906 "Dialogs.c"
+#line 5034 "Dialogs.c"
 	} else {
 		gboolean _tmp9_ = FALSE;
-#line 520 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 536 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp9_ = has_photos;
-#line 520 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 536 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (_tmp9_) {
-#line 4913 "Dialogs.c"
+#line 5041 "Dialogs.c"
 			const gchar* _tmp10_ = NULL;
 			gchar* _tmp11_ = NULL;
-#line 521 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 537 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp10_ = photos_msg;
-#line 521 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 537 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp11_ = g_strdup (_tmp10_);
-#line 521 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 537 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			result = _tmp11_;
-#line 521 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 537 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			return result;
-#line 4924 "Dialogs.c"
+#line 5052 "Dialogs.c"
 		} else {
 			gboolean _tmp12_ = FALSE;
-#line 522 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 538 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp12_ = has_videos;
-#line 522 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 538 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			if (_tmp12_) {
-#line 4931 "Dialogs.c"
+#line 5059 "Dialogs.c"
 				const gchar* _tmp13_ = NULL;
 				gchar* _tmp14_ = NULL;
-#line 523 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 539 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp13_ = videos_msg;
-#line 523 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 539 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp14_ = g_strdup (_tmp13_);
-#line 523 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 539 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				result = _tmp14_;
-#line 523 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 539 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				return result;
-#line 4942 "Dialogs.c"
+#line 5070 "Dialogs.c"
 			} else {
 				const gchar* _tmp15_ = NULL;
 				gchar* _tmp16_ = NULL;
-#line 525 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 541 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp15_ = neither_msg;
-#line 525 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 541 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp16_ = g_strdup (_tmp15_);
-#line 525 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 541 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				result = _tmp16_;
-#line 525 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 541 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				return result;
-#line 4954 "Dialogs.c"
+#line 5082 "Dialogs.c"
 			}
 		}
 	}
@@ -5045,166 +5173,166 @@ gchar* import_ui_create_result_report_from_manifest (ImportManifest* manifest) {
 	GString* _tmp308_ = NULL;
 	const gchar* _tmp309_ = NULL;
 	gchar* _tmp310_ = NULL;
-#line 528 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 544 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (IS_IMPORT_MANIFEST (manifest), NULL);
-#line 529 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 545 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = g_string_new ("");
-#line 529 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 545 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	builder = _tmp0_;
-#line 531 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 547 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = _ ("Import Results Report");
-#line 531 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 547 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = g_strconcat (_tmp1_, " (Shotwell ", NULL);
-#line 531 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 547 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = _tmp2_;
-#line 531 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 547 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp4_ = g_strconcat (_tmp3_, RESOURCES_APP_VERSION, NULL);
-#line 531 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 547 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp5_ = _tmp4_;
-#line 531 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 547 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp6_ = g_strconcat (_tmp5_, " @ ", NULL);
-#line 531 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 547 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp7_ = _tmp6_;
-#line 531 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 547 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_get_current_time (&_tmp8_);
-#line 531 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 547 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp9_ = g_time_val_to_iso8601 (&_tmp8_);
-#line 531 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 547 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp10_ = _tmp9_;
-#line 531 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 547 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp11_ = g_strconcat (_tmp7_, _tmp10_, NULL);
-#line 531 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 547 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp12_ = _tmp11_;
-#line 531 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 547 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp13_ = g_strconcat (_tmp12_, ")\n\n", NULL);
-#line 531 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 547 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp14_ = _tmp13_;
-#line 531 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 547 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (_tmp12_);
-#line 531 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 547 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (_tmp10_);
-#line 531 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 547 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (_tmp7_);
-#line 531 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 547 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (_tmp5_);
-#line 531 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 547 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (_tmp3_);
-#line 531 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 547 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	header = _tmp14_;
-#line 533 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 549 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp15_ = builder;
-#line 533 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 549 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp16_ = header;
-#line 533 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 549 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_string_append (_tmp15_, _tmp16_);
-#line 535 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 551 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp17_ = manifest;
-#line 535 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 551 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp18_ = _tmp17_->all;
-#line 535 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 551 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp19_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 535 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 551 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp20_ = _tmp19_;
-#line 535 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 551 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp21_ = ngettext ("Attempted to import %d file.", "Attempted to import %d files.", (gulong) _tmp20_);
-#line 535 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 551 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp22_ = manifest;
-#line 535 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 551 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp23_ = _tmp22_->all;
-#line 535 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 551 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp24_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 535 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 551 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp25_ = _tmp24_;
-#line 535 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 551 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp26_ = g_strdup_printf (_tmp21_, _tmp25_);
-#line 535 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 551 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	subhead = _tmp26_;
-#line 537 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 553 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp27_ = subhead;
-#line 537 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 553 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp28_ = g_strconcat (_tmp27_, " ", NULL);
-#line 537 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 553 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (subhead);
-#line 537 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 553 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	subhead = _tmp28_;
-#line 538 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 554 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp29_ = subhead;
-#line 538 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 554 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp30_ = manifest;
-#line 538 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 554 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp31_ = _tmp30_->success;
-#line 538 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 554 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp32_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 538 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 554 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp33_ = _tmp32_;
-#line 538 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 554 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp34_ = ngettext ("Of these, %d file was successfully imported.", "Of these, %d files were successfully imported.", (gulong) _tmp33_);
-#line 538 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 554 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp35_ = manifest;
-#line 538 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 554 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp36_ = _tmp35_->success;
-#line 538 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 554 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp37_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 538 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 554 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp38_ = _tmp37_;
-#line 538 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 554 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp39_ = g_strdup_printf (_tmp34_, _tmp38_);
-#line 538 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 554 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp40_ = _tmp39_;
-#line 538 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 554 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp41_ = g_strconcat (_tmp29_, _tmp40_, NULL);
-#line 538 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 554 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (subhead);
-#line 538 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 554 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	subhead = _tmp41_;
-#line 538 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 554 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (_tmp40_);
-#line 541 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 557 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp42_ = subhead;
-#line 541 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 557 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp43_ = g_strconcat (_tmp42_, "\n\n", NULL);
-#line 541 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 557 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (subhead);
-#line 541 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 557 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	subhead = _tmp43_;
-#line 542 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 558 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp44_ = builder;
-#line 542 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 558 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp45_ = subhead;
-#line 542 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 558 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_string_append (_tmp44_, _tmp45_);
-#line 544 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 560 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp46_ = g_strdup ("");
-#line 544 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 560 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	current_file_summary = _tmp46_;
-#line 549 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 565 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp47_ = manifest;
-#line 549 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 565 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp48_ = _tmp47_->already_imported;
-#line 549 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 565 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp49_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 549 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 565 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp50_ = _tmp49_;
-#line 549 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 565 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp50_ > 0) {
-#line 5187 "Dialogs.c"
+#line 5315 "Dialogs.c"
 		GString* _tmp51_ = NULL;
 		const gchar* _tmp52_ = NULL;
 		gchar* _tmp53_ = NULL;
 		gchar* _tmp54_ = NULL;
-#line 550 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 566 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp51_ = builder;
-#line 550 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 566 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp52_ = _ ("Duplicate Photos/Videos Not Imported:");
-#line 550 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 566 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp53_ = g_strconcat (_tmp52_, "\n\n", NULL);
-#line 550 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 566 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp54_ = _tmp53_;
-#line 550 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 566 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		g_string_append (_tmp51_, _tmp54_);
-#line 550 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 566 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (_tmp54_);
-#line 5204 "Dialogs.c"
+#line 5332 "Dialogs.c"
 		{
 			GeeList* _result_list = NULL;
 			ImportManifest* _tmp55_ = NULL;
@@ -5215,27 +5343,27 @@ gchar* import_ui_create_result_report_from_manifest (ImportManifest* manifest) {
 			gint _tmp59_ = 0;
 			gint _tmp60_ = 0;
 			gint _result_index = 0;
-#line 552 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 568 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp55_ = manifest;
-#line 552 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 568 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp56_ = _tmp55_->already_imported;
-#line 552 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 568 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp57_ = _g_object_ref0 (_tmp56_);
-#line 552 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 568 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_result_list = _tmp57_;
-#line 552 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 568 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp58_ = _result_list;
-#line 552 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 568 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp59_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp58_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 552 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 568 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp60_ = _tmp59_;
-#line 552 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 568 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_result_size = _tmp60_;
-#line 552 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 568 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_result_index = -1;
-#line 552 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 568 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			while (TRUE) {
-#line 5235 "Dialogs.c"
+#line 5363 "Dialogs.c"
 				gint _tmp61_ = 0;
 				gint _tmp62_ = 0;
 				gint _tmp63_ = 0;
@@ -5263,123 +5391,123 @@ gchar* import_ui_create_result_report_from_manifest (ImportManifest* manifest) {
 				gchar* _tmp84_ = NULL;
 				GString* _tmp85_ = NULL;
 				const gchar* _tmp86_ = NULL;
-#line 552 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 568 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp61_ = _result_index;
-#line 552 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 568 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_result_index = _tmp61_ + 1;
-#line 552 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 568 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp62_ = _result_index;
-#line 552 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 568 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp63_ = _result_size;
-#line 552 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 568 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				if (!(_tmp62_ < _tmp63_)) {
-#line 552 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 568 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					break;
-#line 5275 "Dialogs.c"
+#line 5403 "Dialogs.c"
 				}
-#line 552 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 568 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp64_ = _result_list;
-#line 552 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 568 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp65_ = _result_index;
-#line 552 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 568 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp66_ = gee_list_get (_tmp64_, _tmp65_);
-#line 552 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 568 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_result_ = (BatchImportResult*) _tmp66_;
-#line 553 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 569 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp67_ = _result_;
-#line 553 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 569 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp68_ = _tmp67_->src_identifier;
-#line 553 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 569 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp69_ = g_strconcat (_tmp68_, " ", NULL);
-#line 553 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 569 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp70_ = _tmp69_;
-#line 553 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 569 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp71_ = _ ("duplicates existing media item");
-#line 553 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 569 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp72_ = g_strconcat (_tmp70_, _tmp71_, NULL);
-#line 553 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 569 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp73_ = _tmp72_;
-#line 553 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 569 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp74_ = g_strconcat (_tmp73_, "\n\t", NULL);
-#line 553 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 569 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp75_ = _tmp74_;
-#line 553 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 569 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp76_ = _result_;
-#line 553 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 569 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp77_ = _tmp76_->duplicate_of;
-#line 553 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 569 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp78_ = duplicated_file_get_file (_tmp77_);
-#line 553 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 569 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp79_ = _tmp78_;
-#line 553 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 569 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp80_ = g_file_get_path (_tmp79_);
-#line 553 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 569 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp81_ = _tmp80_;
-#line 553 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 569 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp82_ = g_strconcat (_tmp75_, _tmp81_, NULL);
-#line 553 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 569 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp83_ = _tmp82_;
-#line 553 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 569 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp84_ = g_strconcat (_tmp83_, "\n\n", NULL);
-#line 553 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 569 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_free0 (current_file_summary);
-#line 553 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 569 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				current_file_summary = _tmp84_;
-#line 553 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 569 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_free0 (_tmp83_);
-#line 553 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 569 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_free0 (_tmp81_);
-#line 553 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 569 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_object_unref0 (_tmp79_);
-#line 553 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 569 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_free0 (_tmp75_);
-#line 553 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 569 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_free0 (_tmp73_);
-#line 553 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 569 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_free0 (_tmp70_);
-#line 557 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 573 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp85_ = builder;
-#line 557 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 573 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp86_ = current_file_summary;
-#line 557 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 573 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				g_string_append (_tmp85_, _tmp86_);
-#line 552 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 568 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_batch_import_result_unref0 (_result_);
-#line 5345 "Dialogs.c"
+#line 5473 "Dialogs.c"
 			}
-#line 552 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 568 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_object_unref0 (_result_list);
-#line 5349 "Dialogs.c"
+#line 5477 "Dialogs.c"
 		}
 	}
-#line 564 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 580 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp87_ = manifest;
-#line 564 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 580 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp88_ = _tmp87_->camera_failed;
-#line 564 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 580 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp89_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp88_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 564 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 580 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp90_ = _tmp89_;
-#line 564 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 580 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp90_ > 0) {
-#line 5362 "Dialogs.c"
+#line 5490 "Dialogs.c"
 		GString* _tmp91_ = NULL;
 		const gchar* _tmp92_ = NULL;
 		gchar* _tmp93_ = NULL;
 		gchar* _tmp94_ = NULL;
-#line 565 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 581 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp91_ = builder;
-#line 565 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 581 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp92_ = _ ("Photos/Videos Not Imported Due to Camera Errors:");
-#line 565 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 581 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp93_ = g_strconcat (_tmp92_, "\n\n", NULL);
-#line 565 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 581 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp94_ = _tmp93_;
-#line 565 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 581 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		g_string_append (_tmp91_, _tmp94_);
-#line 565 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 581 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (_tmp94_);
-#line 5379 "Dialogs.c"
+#line 5507 "Dialogs.c"
 		{
 			GeeList* _result_list = NULL;
 			ImportManifest* _tmp95_ = NULL;
@@ -5390,27 +5518,27 @@ gchar* import_ui_create_result_report_from_manifest (ImportManifest* manifest) {
 			gint _tmp99_ = 0;
 			gint _tmp100_ = 0;
 			gint _result_index = 0;
-#line 567 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 583 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp95_ = manifest;
-#line 567 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 583 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp96_ = _tmp95_->camera_failed;
-#line 567 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 583 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp97_ = _g_object_ref0 (_tmp96_);
-#line 567 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 583 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_result_list = _tmp97_;
-#line 567 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 583 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp98_ = _result_list;
-#line 567 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 583 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp99_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp98_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 567 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 583 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp100_ = _tmp99_;
-#line 567 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 583 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_result_size = _tmp100_;
-#line 567 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 583 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_result_index = -1;
-#line 567 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 583 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			while (TRUE) {
-#line 5410 "Dialogs.c"
+#line 5538 "Dialogs.c"
 				gint _tmp101_ = 0;
 				gint _tmp102_ = 0;
 				gint _tmp103_ = 0;
@@ -5434,112 +5562,112 @@ gchar* import_ui_create_result_report_from_manifest (ImportManifest* manifest) {
 				gchar* _tmp120_ = NULL;
 				GString* _tmp121_ = NULL;
 				const gchar* _tmp122_ = NULL;
-#line 567 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 583 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp101_ = _result_index;
-#line 567 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 583 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_result_index = _tmp101_ + 1;
-#line 567 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 583 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp102_ = _result_index;
-#line 567 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 583 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp103_ = _result_size;
-#line 567 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 583 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				if (!(_tmp102_ < _tmp103_)) {
-#line 567 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 583 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					break;
-#line 5446 "Dialogs.c"
+#line 5574 "Dialogs.c"
 				}
-#line 567 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 583 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp104_ = _result_list;
-#line 567 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 583 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp105_ = _result_index;
-#line 567 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 583 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp106_ = gee_list_get (_tmp104_, _tmp105_);
-#line 567 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 583 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_result_ = (BatchImportResult*) _tmp106_;
-#line 568 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 584 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp107_ = _result_;
-#line 568 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 584 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp108_ = _tmp107_->src_identifier;
-#line 568 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 584 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp109_ = g_strconcat (_tmp108_, "\n\t", NULL);
-#line 568 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 584 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp110_ = _tmp109_;
-#line 568 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 584 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp111_ = _ ("error message:");
-#line 568 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 584 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp112_ = g_strconcat (_tmp110_, _tmp111_, NULL);
-#line 568 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 584 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp113_ = _tmp112_;
-#line 568 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 584 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp114_ = g_strconcat (_tmp113_, " ", NULL);
-#line 568 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 584 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp115_ = _tmp114_;
-#line 568 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 584 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp116_ = _result_;
-#line 568 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 584 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp117_ = _tmp116_->errmsg;
-#line 568 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 584 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp118_ = g_strconcat (_tmp115_, _tmp117_, NULL);
-#line 568 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 584 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp119_ = _tmp118_;
-#line 568 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 584 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp120_ = g_strconcat (_tmp119_, "\n\n", NULL);
-#line 568 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 584 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_free0 (current_file_summary);
-#line 568 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 584 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				current_file_summary = _tmp120_;
-#line 568 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 584 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_free0 (_tmp119_);
-#line 568 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 584 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_free0 (_tmp115_);
-#line 568 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 584 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_free0 (_tmp113_);
-#line 568 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 584 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_free0 (_tmp110_);
-#line 571 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 587 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp121_ = builder;
-#line 571 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 587 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp122_ = current_file_summary;
-#line 571 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 587 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				g_string_append (_tmp121_, _tmp122_);
-#line 567 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 583 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_batch_import_result_unref0 (_result_);
-#line 5504 "Dialogs.c"
+#line 5632 "Dialogs.c"
 			}
-#line 567 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 583 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_object_unref0 (_result_list);
-#line 5508 "Dialogs.c"
+#line 5636 "Dialogs.c"
 		}
 	}
-#line 578 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 594 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp123_ = manifest;
-#line 578 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 594 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp124_ = _tmp123_->skipped_files;
-#line 578 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 594 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp125_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp124_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 578 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 594 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp126_ = _tmp125_;
-#line 578 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 594 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp126_ > 0) {
-#line 5521 "Dialogs.c"
+#line 5649 "Dialogs.c"
 		GString* _tmp127_ = NULL;
 		const gchar* _tmp128_ = NULL;
 		gchar* _tmp129_ = NULL;
 		gchar* _tmp130_ = NULL;
-#line 579 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 595 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp127_ = builder;
-#line 579 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp128_ = _ ("Files Not Imported Because They Weren't Recognized as Photos or Videos" \
+#line 595 "/home/jens/Source/shotwell/src/Dialogs.vala"
+		_tmp128_ = _ ("Files Not Imported Because They Weren’t Recognized as Photos or Videos" \
 ":");
-#line 579 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 595 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp129_ = g_strconcat (_tmp128_, "\n\n", NULL);
-#line 579 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 595 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp130_ = _tmp129_;
-#line 579 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 595 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		g_string_append (_tmp127_, _tmp130_);
-#line 579 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 595 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (_tmp130_);
-#line 5538 "Dialogs.c"
+#line 5666 "Dialogs.c"
 		{
 			GeeList* _result_list = NULL;
 			ImportManifest* _tmp131_ = NULL;
@@ -5550,27 +5678,27 @@ gchar* import_ui_create_result_report_from_manifest (ImportManifest* manifest) {
 			gint _tmp135_ = 0;
 			gint _tmp136_ = 0;
 			gint _result_index = 0;
-#line 582 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 598 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp131_ = manifest;
-#line 582 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 598 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp132_ = _tmp131_->skipped_files;
-#line 582 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 598 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp133_ = _g_object_ref0 (_tmp132_);
-#line 582 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 598 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_result_list = _tmp133_;
-#line 582 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 598 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp134_ = _result_list;
-#line 582 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 598 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp135_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp134_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 582 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 598 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp136_ = _tmp135_;
-#line 582 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 598 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_result_size = _tmp136_;
-#line 582 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 598 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_result_index = -1;
-#line 582 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 598 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			while (TRUE) {
-#line 5569 "Dialogs.c"
+#line 5697 "Dialogs.c"
 				gint _tmp137_ = 0;
 				gint _tmp138_ = 0;
 				gint _tmp139_ = 0;
@@ -5594,112 +5722,112 @@ gchar* import_ui_create_result_report_from_manifest (ImportManifest* manifest) {
 				gchar* _tmp156_ = NULL;
 				GString* _tmp157_ = NULL;
 				const gchar* _tmp158_ = NULL;
-#line 582 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 598 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp137_ = _result_index;
-#line 582 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 598 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_result_index = _tmp137_ + 1;
-#line 582 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 598 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp138_ = _result_index;
-#line 582 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 598 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp139_ = _result_size;
-#line 582 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 598 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				if (!(_tmp138_ < _tmp139_)) {
-#line 582 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 598 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					break;
-#line 5605 "Dialogs.c"
+#line 5733 "Dialogs.c"
 				}
-#line 582 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 598 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp140_ = _result_list;
-#line 582 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 598 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp141_ = _result_index;
-#line 582 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 598 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp142_ = gee_list_get (_tmp140_, _tmp141_);
-#line 582 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 598 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_result_ = (BatchImportResult*) _tmp142_;
-#line 583 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 599 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp143_ = _result_;
-#line 583 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 599 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp144_ = _tmp143_->src_identifier;
-#line 583 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 599 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp145_ = g_strconcat (_tmp144_, "\n\t", NULL);
-#line 583 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 599 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp146_ = _tmp145_;
-#line 583 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 599 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp147_ = _ ("error message:");
-#line 583 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 599 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp148_ = g_strconcat (_tmp146_, _tmp147_, NULL);
-#line 583 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 599 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp149_ = _tmp148_;
-#line 583 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 599 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp150_ = g_strconcat (_tmp149_, " ", NULL);
-#line 583 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 599 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp151_ = _tmp150_;
-#line 583 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 599 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp152_ = _result_;
-#line 583 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 599 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp153_ = _tmp152_->errmsg;
-#line 583 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 599 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp154_ = g_strconcat (_tmp151_, _tmp153_, NULL);
-#line 583 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 599 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp155_ = _tmp154_;
-#line 583 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 599 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp156_ = g_strconcat (_tmp155_, "\n\n", NULL);
-#line 583 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 599 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_free0 (current_file_summary);
-#line 583 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 599 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				current_file_summary = _tmp156_;
-#line 583 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 599 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_free0 (_tmp155_);
-#line 583 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 599 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_free0 (_tmp151_);
-#line 583 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 599 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_free0 (_tmp149_);
-#line 583 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 599 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_free0 (_tmp146_);
-#line 586 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 602 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp157_ = builder;
-#line 586 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 602 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp158_ = current_file_summary;
-#line 586 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 602 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				g_string_append (_tmp157_, _tmp158_);
-#line 582 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 598 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_batch_import_result_unref0 (_result_);
-#line 5663 "Dialogs.c"
+#line 5791 "Dialogs.c"
 			}
-#line 582 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 598 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_object_unref0 (_result_list);
-#line 5667 "Dialogs.c"
+#line 5795 "Dialogs.c"
 		}
 	}
-#line 593 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 609 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp159_ = manifest;
-#line 593 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 609 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp160_ = _tmp159_->skipped_photos;
-#line 593 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 609 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp161_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp160_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 593 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 609 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp162_ = _tmp161_;
-#line 593 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 609 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp162_ > 0) {
-#line 5680 "Dialogs.c"
+#line 5808 "Dialogs.c"
 		GString* _tmp163_ = NULL;
 		const gchar* _tmp164_ = NULL;
 		gchar* _tmp165_ = NULL;
 		gchar* _tmp166_ = NULL;
-#line 594 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 610 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp163_ = builder;
-#line 594 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp164_ = _ ("Photos/Videos Not Imported Because They Weren't in a Format Shotwell U" \
+#line 610 "/home/jens/Source/shotwell/src/Dialogs.vala"
+		_tmp164_ = _ ("Photos/Videos Not Imported Because They Weren’t in a Format Shotwell U" \
 "nderstands:");
-#line 594 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 610 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp165_ = g_strconcat (_tmp164_, "\n\n", NULL);
-#line 594 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 610 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp166_ = _tmp165_;
-#line 594 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 610 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		g_string_append (_tmp163_, _tmp166_);
-#line 594 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 610 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (_tmp166_);
-#line 5697 "Dialogs.c"
+#line 5825 "Dialogs.c"
 		{
 			GeeList* _result_list = NULL;
 			ImportManifest* _tmp167_ = NULL;
@@ -5710,27 +5838,27 @@ gchar* import_ui_create_result_report_from_manifest (ImportManifest* manifest) {
 			gint _tmp171_ = 0;
 			gint _tmp172_ = 0;
 			gint _result_index = 0;
-#line 597 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 613 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp167_ = manifest;
-#line 597 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 613 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp168_ = _tmp167_->skipped_photos;
-#line 597 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 613 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp169_ = _g_object_ref0 (_tmp168_);
-#line 597 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 613 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_result_list = _tmp169_;
-#line 597 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 613 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp170_ = _result_list;
-#line 597 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 613 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp171_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp170_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 597 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 613 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp172_ = _tmp171_;
-#line 597 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 613 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_result_size = _tmp172_;
-#line 597 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 613 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_result_index = -1;
-#line 597 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 613 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			while (TRUE) {
-#line 5728 "Dialogs.c"
+#line 5856 "Dialogs.c"
 				gint _tmp173_ = 0;
 				gint _tmp174_ = 0;
 				gint _tmp175_ = 0;
@@ -5754,112 +5882,112 @@ gchar* import_ui_create_result_report_from_manifest (ImportManifest* manifest) {
 				gchar* _tmp192_ = NULL;
 				GString* _tmp193_ = NULL;
 				const gchar* _tmp194_ = NULL;
-#line 597 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 613 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp173_ = _result_index;
-#line 597 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 613 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_result_index = _tmp173_ + 1;
-#line 597 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 613 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp174_ = _result_index;
-#line 597 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 613 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp175_ = _result_size;
-#line 597 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 613 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				if (!(_tmp174_ < _tmp175_)) {
-#line 597 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 613 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					break;
-#line 5764 "Dialogs.c"
+#line 5892 "Dialogs.c"
 				}
-#line 597 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 613 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp176_ = _result_list;
-#line 597 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 613 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp177_ = _result_index;
-#line 597 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 613 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp178_ = gee_list_get (_tmp176_, _tmp177_);
-#line 597 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 613 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_result_ = (BatchImportResult*) _tmp178_;
-#line 598 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 614 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp179_ = _result_;
-#line 598 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 614 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp180_ = _tmp179_->src_identifier;
-#line 598 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 614 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp181_ = g_strconcat (_tmp180_, "\n\t", NULL);
-#line 598 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 614 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp182_ = _tmp181_;
-#line 598 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 614 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp183_ = _ ("error message:");
-#line 598 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 614 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp184_ = g_strconcat (_tmp182_, _tmp183_, NULL);
-#line 598 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 614 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp185_ = _tmp184_;
-#line 598 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 614 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp186_ = g_strconcat (_tmp185_, " ", NULL);
-#line 598 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 614 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp187_ = _tmp186_;
-#line 598 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 614 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp188_ = _result_;
-#line 598 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 614 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp189_ = _tmp188_->errmsg;
-#line 598 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 614 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp190_ = g_strconcat (_tmp187_, _tmp189_, NULL);
-#line 598 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 614 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp191_ = _tmp190_;
-#line 598 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 614 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp192_ = g_strconcat (_tmp191_, "\n\n", NULL);
-#line 598 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 614 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_free0 (current_file_summary);
-#line 598 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 614 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				current_file_summary = _tmp192_;
-#line 598 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 614 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_free0 (_tmp191_);
-#line 598 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 614 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_free0 (_tmp187_);
-#line 598 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 614 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_free0 (_tmp185_);
-#line 598 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 614 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_free0 (_tmp182_);
-#line 601 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 617 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp193_ = builder;
-#line 601 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 617 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp194_ = current_file_summary;
-#line 601 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 617 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				g_string_append (_tmp193_, _tmp194_);
-#line 597 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 613 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_batch_import_result_unref0 (_result_);
-#line 5822 "Dialogs.c"
+#line 5950 "Dialogs.c"
 			}
-#line 597 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 613 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_object_unref0 (_result_list);
-#line 5826 "Dialogs.c"
+#line 5954 "Dialogs.c"
 		}
 	}
-#line 608 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 624 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp195_ = manifest;
-#line 608 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 624 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp196_ = _tmp195_->write_failed;
-#line 608 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 624 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp197_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp196_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 608 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 624 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp198_ = _tmp197_;
-#line 608 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 624 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp198_ > 0) {
-#line 5839 "Dialogs.c"
+#line 5967 "Dialogs.c"
 		GString* _tmp199_ = NULL;
 		const gchar* _tmp200_ = NULL;
 		gchar* _tmp201_ = NULL;
 		gchar* _tmp202_ = NULL;
-#line 609 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 625 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp199_ = builder;
-#line 609 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp200_ = _ ("Photos/Videos Not Imported Because Shotwell Couldn't Copy Them into it" \
+#line 625 "/home/jens/Source/shotwell/src/Dialogs.vala"
+		_tmp200_ = _ ("Photos/Videos Not Imported Because Shotwell Couldn’t Copy Them into it" \
 "s Library:");
-#line 609 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 625 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp201_ = g_strconcat (_tmp200_, "\n\n", NULL);
-#line 609 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 625 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp202_ = _tmp201_;
-#line 609 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 625 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		g_string_append (_tmp199_, _tmp202_);
-#line 609 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 625 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (_tmp202_);
-#line 5856 "Dialogs.c"
+#line 5984 "Dialogs.c"
 		{
 			GeeList* _result_list = NULL;
 			ImportManifest* _tmp203_ = NULL;
@@ -5870,27 +5998,27 @@ gchar* import_ui_create_result_report_from_manifest (ImportManifest* manifest) {
 			gint _tmp207_ = 0;
 			gint _tmp208_ = 0;
 			gint _result_index = 0;
-#line 612 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 628 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp203_ = manifest;
-#line 612 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 628 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp204_ = _tmp203_->write_failed;
-#line 612 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 628 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp205_ = _g_object_ref0 (_tmp204_);
-#line 612 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 628 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_result_list = _tmp205_;
-#line 612 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 628 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp206_ = _result_list;
-#line 612 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 628 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp207_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp206_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 612 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 628 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp208_ = _tmp207_;
-#line 612 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 628 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_result_size = _tmp208_;
-#line 612 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 628 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_result_index = -1;
-#line 612 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 628 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			while (TRUE) {
-#line 5887 "Dialogs.c"
+#line 6015 "Dialogs.c"
 				gint _tmp209_ = 0;
 				gint _tmp210_ = 0;
 				gint _tmp211_ = 0;
@@ -5919,123 +6047,123 @@ gchar* import_ui_create_result_report_from_manifest (ImportManifest* manifest) {
 				gchar* _tmp233_ = NULL;
 				GString* _tmp234_ = NULL;
 				const gchar* _tmp235_ = NULL;
-#line 612 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 628 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp209_ = _result_index;
-#line 612 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 628 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_result_index = _tmp209_ + 1;
-#line 612 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 628 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp210_ = _result_index;
-#line 612 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 628 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp211_ = _result_size;
-#line 612 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 628 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				if (!(_tmp210_ < _tmp211_)) {
-#line 612 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 628 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					break;
-#line 5928 "Dialogs.c"
+#line 6056 "Dialogs.c"
 				}
-#line 612 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 628 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp212_ = _result_list;
-#line 612 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 628 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp213_ = _result_index;
-#line 612 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 628 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp214_ = gee_list_get (_tmp212_, _tmp213_);
-#line 612 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 628 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_result_ = (BatchImportResult*) _tmp214_;
-#line 613 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				_tmp215_ = _ ("couldn't copy %s\n\tto %s");
-#line 613 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 629 "/home/jens/Source/shotwell/src/Dialogs.vala"
+				_tmp215_ = _ ("couldn’t copy %s\n\tto %s");
+#line 629 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp216_ = _result_;
-#line 613 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 629 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp217_ = _tmp216_->src_identifier;
-#line 613 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 629 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp218_ = _result_;
-#line 613 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 629 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp219_ = _tmp218_->dest_identifier;
-#line 613 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 629 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp220_ = g_strdup_printf (_tmp215_, _tmp217_, _tmp219_);
-#line 613 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 629 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp221_ = _tmp220_;
-#line 613 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 629 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp222_ = g_strconcat (_tmp221_, "\n\t", NULL);
-#line 613 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 629 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp223_ = _tmp222_;
-#line 613 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 629 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp224_ = _ ("error message:");
-#line 613 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 629 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp225_ = g_strconcat (_tmp223_, _tmp224_, NULL);
-#line 613 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 629 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp226_ = _tmp225_;
-#line 613 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 629 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp227_ = g_strconcat (_tmp226_, " ", NULL);
-#line 613 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 629 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp228_ = _tmp227_;
-#line 613 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 629 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp229_ = _result_;
-#line 613 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 629 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp230_ = _tmp229_->errmsg;
-#line 613 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 629 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp231_ = g_strconcat (_tmp228_, _tmp230_, NULL);
-#line 613 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 629 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp232_ = _tmp231_;
-#line 613 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 629 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp233_ = g_strconcat (_tmp232_, "\n\n", NULL);
-#line 613 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 629 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_free0 (current_file_summary);
-#line 613 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 629 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				current_file_summary = _tmp233_;
-#line 613 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 629 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_free0 (_tmp232_);
-#line 613 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 629 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_free0 (_tmp228_);
-#line 613 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 629 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_free0 (_tmp226_);
-#line 613 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 629 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_free0 (_tmp223_);
-#line 613 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 629 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_free0 (_tmp221_);
-#line 617 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 633 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp234_ = builder;
-#line 617 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 633 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp235_ = current_file_summary;
-#line 617 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 633 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				g_string_append (_tmp234_, _tmp235_);
-#line 612 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 628 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_batch_import_result_unref0 (_result_);
-#line 5998 "Dialogs.c"
+#line 6126 "Dialogs.c"
 			}
-#line 612 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 628 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_object_unref0 (_result_list);
-#line 6002 "Dialogs.c"
+#line 6130 "Dialogs.c"
 		}
 	}
-#line 624 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 640 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp236_ = manifest;
-#line 624 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 640 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp237_ = _tmp236_->corrupt_files;
-#line 624 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 640 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp238_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp237_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 624 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 640 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp239_ = _tmp238_;
-#line 624 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 640 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp239_ > 0) {
-#line 6015 "Dialogs.c"
+#line 6143 "Dialogs.c"
 		GString* _tmp240_ = NULL;
 		const gchar* _tmp241_ = NULL;
 		gchar* _tmp242_ = NULL;
 		gchar* _tmp243_ = NULL;
-#line 625 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 641 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp240_ = builder;
-#line 625 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 641 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp241_ = _ ("Photos/Videos Not Imported Because Files Are Corrupt:");
-#line 625 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 641 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp242_ = g_strconcat (_tmp241_, "\n\n", NULL);
-#line 625 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 641 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp243_ = _tmp242_;
-#line 625 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 641 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		g_string_append (_tmp240_, _tmp243_);
-#line 625 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 641 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (_tmp243_);
-#line 6032 "Dialogs.c"
+#line 6160 "Dialogs.c"
 		{
 			GeeList* _result_list = NULL;
 			ImportManifest* _tmp244_ = NULL;
@@ -6046,27 +6174,27 @@ gchar* import_ui_create_result_report_from_manifest (ImportManifest* manifest) {
 			gint _tmp248_ = 0;
 			gint _tmp249_ = 0;
 			gint _result_index = 0;
-#line 628 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 644 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp244_ = manifest;
-#line 628 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 644 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp245_ = _tmp244_->corrupt_files;
-#line 628 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 644 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp246_ = _g_object_ref0 (_tmp245_);
-#line 628 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 644 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_result_list = _tmp246_;
-#line 628 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 644 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp247_ = _result_list;
-#line 628 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 644 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp248_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp247_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 628 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 644 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp249_ = _tmp248_;
-#line 628 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 644 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_result_size = _tmp249_;
-#line 628 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 644 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_result_index = -1;
-#line 628 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 644 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			while (TRUE) {
-#line 6063 "Dialogs.c"
+#line 6191 "Dialogs.c"
 				gint _tmp250_ = 0;
 				gint _tmp251_ = 0;
 				gint _tmp252_ = 0;
@@ -6090,111 +6218,111 @@ gchar* import_ui_create_result_report_from_manifest (ImportManifest* manifest) {
 				gchar* _tmp269_ = NULL;
 				GString* _tmp270_ = NULL;
 				const gchar* _tmp271_ = NULL;
-#line 628 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 644 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp250_ = _result_index;
-#line 628 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 644 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_result_index = _tmp250_ + 1;
-#line 628 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 644 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp251_ = _result_index;
-#line 628 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 644 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp252_ = _result_size;
-#line 628 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 644 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				if (!(_tmp251_ < _tmp252_)) {
-#line 628 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 644 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					break;
-#line 6099 "Dialogs.c"
+#line 6227 "Dialogs.c"
 				}
-#line 628 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 644 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp253_ = _result_list;
-#line 628 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 644 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp254_ = _result_index;
-#line 628 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 644 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp255_ = gee_list_get (_tmp253_, _tmp254_);
-#line 628 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 644 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_result_ = (BatchImportResult*) _tmp255_;
-#line 629 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 645 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp256_ = _result_;
-#line 629 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 645 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp257_ = _tmp256_->src_identifier;
-#line 629 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 645 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp258_ = g_strconcat (_tmp257_, "\n\t", NULL);
-#line 629 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 645 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp259_ = _tmp258_;
-#line 629 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 645 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp260_ = _ ("error message:");
-#line 629 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 645 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp261_ = g_strconcat (_tmp259_, _tmp260_, NULL);
-#line 629 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 645 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp262_ = _tmp261_;
-#line 629 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 645 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp263_ = g_strconcat (_tmp262_, " |", NULL);
-#line 629 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 645 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp264_ = _tmp263_;
-#line 629 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 645 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp265_ = _result_;
-#line 629 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 645 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp266_ = _tmp265_->errmsg;
-#line 629 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 645 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp267_ = g_strconcat (_tmp264_, _tmp266_, NULL);
-#line 629 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 645 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp268_ = _tmp267_;
-#line 629 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 645 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp269_ = g_strconcat (_tmp268_, "|\n\n", NULL);
-#line 629 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 645 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_free0 (current_file_summary);
-#line 629 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 645 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				current_file_summary = _tmp269_;
-#line 629 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 645 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_free0 (_tmp268_);
-#line 629 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 645 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_free0 (_tmp264_);
-#line 629 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 645 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_free0 (_tmp262_);
-#line 629 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 645 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_free0 (_tmp259_);
-#line 632 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 648 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp270_ = builder;
-#line 632 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 648 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp271_ = current_file_summary;
-#line 632 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 648 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				g_string_append (_tmp270_, _tmp271_);
-#line 628 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 644 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_batch_import_result_unref0 (_result_);
-#line 6157 "Dialogs.c"
+#line 6285 "Dialogs.c"
 			}
-#line 628 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 644 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_object_unref0 (_result_list);
-#line 6161 "Dialogs.c"
+#line 6289 "Dialogs.c"
 		}
 	}
-#line 639 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 655 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp272_ = manifest;
-#line 639 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 655 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp273_ = _tmp272_->failed;
-#line 639 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 655 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp274_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp273_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 639 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 655 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp275_ = _tmp274_;
-#line 639 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 655 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp275_ > 0) {
-#line 6174 "Dialogs.c"
+#line 6302 "Dialogs.c"
 		GString* _tmp276_ = NULL;
 		const gchar* _tmp277_ = NULL;
 		gchar* _tmp278_ = NULL;
 		gchar* _tmp279_ = NULL;
-#line 640 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 656 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp276_ = builder;
-#line 640 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 656 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp277_ = _ ("Photos/Videos Not Imported for Other Reasons:");
-#line 640 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 656 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp278_ = g_strconcat (_tmp277_, "\n\n", NULL);
-#line 640 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 656 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp279_ = _tmp278_;
-#line 640 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 656 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		g_string_append (_tmp276_, _tmp279_);
-#line 640 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 656 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (_tmp279_);
-#line 6191 "Dialogs.c"
+#line 6319 "Dialogs.c"
 		{
 			GeeList* _result_list = NULL;
 			ImportManifest* _tmp280_ = NULL;
@@ -6205,27 +6333,27 @@ gchar* import_ui_create_result_report_from_manifest (ImportManifest* manifest) {
 			gint _tmp284_ = 0;
 			gint _tmp285_ = 0;
 			gint _result_index = 0;
-#line 642 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 658 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp280_ = manifest;
-#line 642 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 658 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp281_ = _tmp280_->failed;
-#line 642 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 658 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp282_ = _g_object_ref0 (_tmp281_);
-#line 642 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 658 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_result_list = _tmp282_;
-#line 642 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 658 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp283_ = _result_list;
-#line 642 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 658 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp284_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp283_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 642 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 658 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp285_ = _tmp284_;
-#line 642 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 658 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_result_size = _tmp285_;
-#line 642 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 658 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_result_index = -1;
-#line 642 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 658 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			while (TRUE) {
-#line 6222 "Dialogs.c"
+#line 6350 "Dialogs.c"
 				gint _tmp286_ = 0;
 				gint _tmp287_ = 0;
 				gint _tmp288_ = 0;
@@ -6249,102 +6377,102 @@ gchar* import_ui_create_result_report_from_manifest (ImportManifest* manifest) {
 				gchar* _tmp305_ = NULL;
 				GString* _tmp306_ = NULL;
 				const gchar* _tmp307_ = NULL;
-#line 642 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 658 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp286_ = _result_index;
-#line 642 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 658 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_result_index = _tmp286_ + 1;
-#line 642 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 658 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp287_ = _result_index;
-#line 642 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 658 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp288_ = _result_size;
-#line 642 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 658 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				if (!(_tmp287_ < _tmp288_)) {
-#line 642 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 658 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					break;
-#line 6258 "Dialogs.c"
+#line 6386 "Dialogs.c"
 				}
-#line 642 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 658 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp289_ = _result_list;
-#line 642 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 658 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp290_ = _result_index;
-#line 642 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 658 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp291_ = gee_list_get (_tmp289_, _tmp290_);
-#line 642 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 658 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_result_ = (BatchImportResult*) _tmp291_;
-#line 643 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 659 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp292_ = _result_;
-#line 643 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 659 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp293_ = _tmp292_->src_identifier;
-#line 643 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 659 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp294_ = g_strconcat (_tmp293_, "\n\t", NULL);
-#line 643 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 659 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp295_ = _tmp294_;
-#line 643 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 659 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp296_ = _ ("error message:");
-#line 643 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 659 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp297_ = g_strconcat (_tmp295_, _tmp296_, NULL);
-#line 643 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 659 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp298_ = _tmp297_;
-#line 643 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 659 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp299_ = g_strconcat (_tmp298_, " ", NULL);
-#line 643 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 659 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp300_ = _tmp299_;
-#line 643 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 659 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp301_ = _result_;
-#line 643 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 659 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp302_ = _tmp301_->errmsg;
-#line 643 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 659 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp303_ = g_strconcat (_tmp300_, _tmp302_, NULL);
-#line 643 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 659 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp304_ = _tmp303_;
-#line 643 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 659 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp305_ = g_strconcat (_tmp304_, "\n\n", NULL);
-#line 643 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 659 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_free0 (current_file_summary);
-#line 643 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 659 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				current_file_summary = _tmp305_;
-#line 643 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 659 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_free0 (_tmp304_);
-#line 643 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 659 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_free0 (_tmp300_);
-#line 643 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 659 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_free0 (_tmp298_);
-#line 643 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 659 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_free0 (_tmp295_);
-#line 646 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 662 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp306_ = builder;
-#line 646 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 662 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp307_ = current_file_summary;
-#line 646 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 662 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				g_string_append (_tmp306_, _tmp307_);
-#line 642 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 658 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_batch_import_result_unref0 (_result_);
-#line 6316 "Dialogs.c"
+#line 6444 "Dialogs.c"
 			}
-#line 642 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 658 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_object_unref0 (_result_list);
-#line 6320 "Dialogs.c"
+#line 6448 "Dialogs.c"
 		}
 	}
-#line 650 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 666 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp308_ = builder;
-#line 650 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 666 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp309_ = _tmp308_->str;
-#line 650 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 666 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp310_ = g_strdup (_tmp309_);
-#line 650 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 666 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	result = _tmp310_;
-#line 650 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 666 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (current_file_summary);
-#line 650 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 666 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (subhead);
-#line 650 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 666 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (header);
-#line 650 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 666 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_string_free0 (builder);
-#line 650 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 666 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 6341 "Dialogs.c"
+#line 6469 "Dialogs.c"
 }
 
 
@@ -6435,25 +6563,25 @@ gboolean import_ui_report_manifest (ImportManifest* manifest, gboolean show_dest
 	gint dialog_response = 0;
 	ImportUIQuestionParams* _tmp526_ = NULL;
 	gint _tmp606_ = 0;
-#line 655 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 671 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (IS_IMPORT_MANIFEST (manifest), FALSE);
-#line 655 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 671 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail ((question == NULL) || IMPORT_UI_IS_QUESTION_PARAMS (question), FALSE);
-#line 657 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 673 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = g_strdup ("");
-#line 657 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 673 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	message = _tmp0_;
-#line 659 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 675 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = manifest;
-#line 659 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 675 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = _tmp1_->already_imported;
-#line 659 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 675 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 659 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 675 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp4_ = _tmp3_;
-#line 659 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 675 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp4_ > 0) {
-#line 6450 "Dialogs.c"
+#line 6578 "Dialogs.c"
 		gchar* photos_message = NULL;
 		ImportManifest* _tmp5_ = NULL;
 		GeeList* _tmp6_ = NULL;
@@ -6504,137 +6632,137 @@ gboolean import_ui_report_manifest (ImportManifest* manifest, gboolean show_dest
 		gchar* _tmp49_ = NULL;
 		gchar* _tmp50_ = NULL;
 		gchar* _tmp51_ = NULL;
-#line 660 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 676 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp5_ = manifest;
-#line 660 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 676 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp6_ = _tmp5_->already_imported;
-#line 660 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 676 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp7_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 660 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 676 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp8_ = _tmp7_;
-#line 660 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 676 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp9_ = ngettext ("1 duplicate photo was not imported:\n", "%d duplicate photos were not imported:\n", (gulong) _tmp8_);
-#line 660 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 676 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp10_ = manifest;
-#line 660 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 676 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp11_ = _tmp10_->already_imported;
-#line 660 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 676 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp12_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 660 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 676 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp13_ = _tmp12_;
-#line 660 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 676 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp14_ = g_strdup_printf (_tmp9_, _tmp13_);
-#line 660 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 676 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		photos_message = _tmp14_;
-#line 663 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 679 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp15_ = manifest;
-#line 663 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 679 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp16_ = _tmp15_->already_imported;
-#line 663 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 679 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp17_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 663 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 679 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp18_ = _tmp17_;
-#line 663 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 679 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp19_ = ngettext ("1 duplicate video was not imported:\n", "%d duplicate videos were not imported:\n", (gulong) _tmp18_);
-#line 663 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 679 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp20_ = manifest;
-#line 663 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 679 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp21_ = _tmp20_->already_imported;
-#line 663 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 679 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp22_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 663 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 679 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp23_ = _tmp22_;
-#line 663 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 679 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp24_ = g_strdup_printf (_tmp19_, _tmp23_);
-#line 663 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 679 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		videos_message = _tmp24_;
-#line 666 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 682 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp25_ = manifest;
-#line 666 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 682 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp26_ = _tmp25_->already_imported;
-#line 666 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 682 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp27_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 666 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 682 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp28_ = _tmp27_;
-#line 666 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 682 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp29_ = ngettext ("1 duplicate photo/video was not imported:\n", "%d duplicate photos/videos were not imported:\n", (gulong) _tmp28_);
-#line 666 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 682 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp30_ = manifest;
-#line 666 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 682 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp31_ = _tmp30_->already_imported;
-#line 666 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 682 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp32_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 666 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 682 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp33_ = _tmp32_;
-#line 666 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 682 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp34_ = g_strdup_printf (_tmp29_, _tmp33_);
-#line 666 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 682 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		both_message = _tmp34_;
-#line 670 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 686 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp35_ = message;
-#line 670 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 686 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp36_ = manifest;
-#line 670 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 686 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp37_ = _tmp36_->already_imported;
-#line 670 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 686 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp38_ = photos_message;
-#line 670 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 686 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp39_ = videos_message;
-#line 670 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 686 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp40_ = both_message;
-#line 670 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 686 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp41_ = both_message;
-#line 670 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 686 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp42_ = import_ui_get_media_specific_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, GEE_TYPE_COLLECTION, GeeCollection), _tmp38_, _tmp39_, _tmp40_, _tmp41_);
-#line 670 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 686 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp43_ = _tmp42_;
-#line 670 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 686 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp44_ = g_strconcat (_tmp35_, _tmp43_, NULL);
-#line 670 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 686 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (message);
-#line 670 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 686 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		message = _tmp44_;
-#line 670 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 686 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (_tmp43_);
-#line 673 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 689 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp45_ = message;
-#line 673 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 689 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp46_ = manifest;
-#line 673 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 689 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp47_ = _tmp46_->already_imported;
-#line 673 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 689 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp48_ = show_dest_id;
-#line 673 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 689 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp49_ = import_ui_generate_import_failure_list (_tmp47_, _tmp48_);
-#line 673 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 689 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp50_ = _tmp49_;
-#line 673 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 689 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp51_ = g_strconcat (_tmp45_, _tmp50_, NULL);
-#line 673 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 689 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (message);
-#line 673 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 689 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		message = _tmp51_;
-#line 673 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 689 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (_tmp50_);
-#line 659 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 675 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (both_message);
-#line 659 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 675 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (videos_message);
-#line 659 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 675 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (photos_message);
-#line 6619 "Dialogs.c"
+#line 6747 "Dialogs.c"
 	}
-#line 676 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 692 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp52_ = manifest;
-#line 676 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 692 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp53_ = _tmp52_->failed;
-#line 676 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 692 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp54_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp53_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 676 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 692 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp55_ = _tmp54_;
-#line 676 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 692 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp55_ > 0) {
-#line 6631 "Dialogs.c"
+#line 6759 "Dialogs.c"
 		const gchar* _tmp56_ = NULL;
 		gint _tmp57_ = 0;
 		gint _tmp58_ = 0;
@@ -6699,182 +6827,182 @@ gboolean import_ui_report_manifest (ImportManifest* manifest, gboolean show_dest
 		gchar* _tmp115_ = NULL;
 		gchar* _tmp116_ = NULL;
 		gchar* _tmp117_ = NULL;
-#line 677 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 693 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp56_ = message;
-#line 677 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 693 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp57_ = strlen (_tmp56_);
-#line 677 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 693 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp58_ = _tmp57_;
-#line 677 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 693 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (_tmp58_ > 0) {
-#line 6704 "Dialogs.c"
+#line 6832 "Dialogs.c"
 			const gchar* _tmp59_ = NULL;
 			gchar* _tmp60_ = NULL;
-#line 678 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 694 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp59_ = message;
-#line 678 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 694 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp60_ = g_strconcat (_tmp59_, "\n", NULL);
-#line 678 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 694 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_free0 (message);
-#line 678 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 694 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			message = _tmp60_;
-#line 6715 "Dialogs.c"
+#line 6843 "Dialogs.c"
 		}
-#line 680 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 696 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp61_ = manifest;
-#line 680 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 696 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp62_ = _tmp61_->failed;
-#line 680 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 696 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp63_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp62_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 680 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 696 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp64_ = _tmp63_;
-#line 680 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 696 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp65_ = ngettext ("1 photo failed to import due to a file or hardware error:\n", "%d photos failed to import due to a file or hardware error:\n", (gulong) _tmp64_);
-#line 680 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 696 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp66_ = manifest;
-#line 680 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 696 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp67_ = _tmp66_->failed;
-#line 680 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 696 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp68_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp67_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 680 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 696 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp69_ = _tmp68_;
-#line 680 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 696 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp70_ = g_strdup_printf (_tmp65_, _tmp69_);
-#line 680 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 696 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		photos_message = _tmp70_;
-#line 683 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 699 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp71_ = manifest;
-#line 683 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 699 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp72_ = _tmp71_->failed;
-#line 683 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 699 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp73_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp72_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 683 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 699 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp74_ = _tmp73_;
-#line 683 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 699 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp75_ = ngettext ("1 video failed to import due to a file or hardware error:\n", "%d videos failed to import due to a file or hardware error:\n", (gulong) _tmp74_);
-#line 683 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 699 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp76_ = manifest;
-#line 683 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 699 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp77_ = _tmp76_->failed;
-#line 683 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 699 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp78_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp77_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 683 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 699 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp79_ = _tmp78_;
-#line 683 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 699 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp80_ = g_strdup_printf (_tmp75_, _tmp79_);
-#line 683 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 699 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		videos_message = _tmp80_;
-#line 686 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 702 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp81_ = manifest;
-#line 686 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 702 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp82_ = _tmp81_->failed;
-#line 686 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 702 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp83_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp82_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 686 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 702 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp84_ = _tmp83_;
-#line 686 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 702 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp85_ = ngettext ("1 photo/video failed to import due to a file or hardware error:\n", "%d photos/videos failed to import due to a file or hardware error:\n", (gulong) _tmp84_);
-#line 686 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 702 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp86_ = manifest;
-#line 686 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 702 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp87_ = _tmp86_->failed;
-#line 686 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 702 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp88_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp87_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 686 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 702 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp89_ = _tmp88_;
-#line 686 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 702 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp90_ = g_strdup_printf (_tmp85_, _tmp89_);
-#line 686 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 702 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		both_message = _tmp90_;
-#line 689 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 705 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp91_ = manifest;
-#line 689 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 705 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp92_ = _tmp91_->failed;
-#line 689 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 705 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp93_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp92_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 689 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 705 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp94_ = _tmp93_;
-#line 689 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 705 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp95_ = ngettext ("1 file failed to import due to a file or hardware error:\n", "%d files failed to import due to a file or hardware error:\n", (gulong) _tmp94_);
-#line 689 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 705 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp96_ = manifest;
-#line 689 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 705 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp97_ = _tmp96_->failed;
-#line 689 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 705 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp98_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp97_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 689 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 705 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp99_ = _tmp98_;
-#line 689 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 705 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp100_ = g_strdup_printf (_tmp95_, _tmp99_);
-#line 689 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 705 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		neither_message = _tmp100_;
-#line 693 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 709 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp101_ = message;
-#line 693 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 709 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp102_ = manifest;
-#line 693 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 709 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp103_ = _tmp102_->failed;
-#line 693 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 709 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp104_ = photos_message;
-#line 693 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 709 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp105_ = videos_message;
-#line 693 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 709 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp106_ = both_message;
-#line 693 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 709 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp107_ = neither_message;
-#line 693 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 709 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp108_ = import_ui_get_media_specific_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp103_, GEE_TYPE_COLLECTION, GeeCollection), _tmp104_, _tmp105_, _tmp106_, _tmp107_);
-#line 693 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 709 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp109_ = _tmp108_;
-#line 693 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 709 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp110_ = g_strconcat (_tmp101_, _tmp109_, NULL);
-#line 693 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 709 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (message);
-#line 693 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 709 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		message = _tmp110_;
-#line 693 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 709 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (_tmp109_);
-#line 696 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 712 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp111_ = message;
-#line 696 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 712 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp112_ = manifest;
-#line 696 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 712 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp113_ = _tmp112_->failed;
-#line 696 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 712 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp114_ = show_dest_id;
-#line 696 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 712 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp115_ = import_ui_generate_import_failure_list (_tmp113_, _tmp114_);
-#line 696 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 712 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp116_ = _tmp115_;
-#line 696 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 712 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp117_ = g_strconcat (_tmp111_, _tmp116_, NULL);
-#line 696 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 712 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (message);
-#line 696 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 712 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		message = _tmp117_;
-#line 696 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 712 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (_tmp116_);
-#line 676 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 692 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (neither_message);
-#line 676 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 692 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (both_message);
-#line 676 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 692 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (videos_message);
-#line 676 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 692 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (photos_message);
-#line 6859 "Dialogs.c"
+#line 6987 "Dialogs.c"
 	}
-#line 699 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 715 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp118_ = manifest;
-#line 699 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 715 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp119_ = _tmp118_->write_failed;
-#line 699 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 715 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp120_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp119_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 699 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 715 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp121_ = _tmp120_;
-#line 699 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 715 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp121_ > 0) {
-#line 6871 "Dialogs.c"
+#line 6999 "Dialogs.c"
 		const gchar* _tmp122_ = NULL;
 		gint _tmp123_ = 0;
 		gint _tmp124_ = 0;
@@ -6939,190 +7067,190 @@ gboolean import_ui_report_manifest (ImportManifest* manifest, gboolean show_dest
 		gchar* _tmp181_ = NULL;
 		gchar* _tmp182_ = NULL;
 		gchar* _tmp183_ = NULL;
-#line 700 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 716 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp122_ = message;
-#line 700 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 716 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp123_ = strlen (_tmp122_);
-#line 700 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 716 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp124_ = _tmp123_;
-#line 700 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 716 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (_tmp124_ > 0) {
-#line 6944 "Dialogs.c"
+#line 7072 "Dialogs.c"
 			const gchar* _tmp125_ = NULL;
 			gchar* _tmp126_ = NULL;
-#line 701 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 717 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp125_ = message;
-#line 701 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 717 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp126_ = g_strconcat (_tmp125_, "\n", NULL);
-#line 701 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 717 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_free0 (message);
-#line 701 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 717 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			message = _tmp126_;
-#line 6955 "Dialogs.c"
+#line 7083 "Dialogs.c"
 		}
-#line 703 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 719 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp127_ = manifest;
-#line 703 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 719 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp128_ = _tmp127_->write_failed;
-#line 703 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 719 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp129_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp128_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 703 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 719 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp130_ = _tmp129_;
-#line 703 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 719 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp131_ = ngettext ("1 photo failed to import because the photo library folder was not writ" \
 "able:\n", "%d photos failed to import because the photo library folder was not wr" \
 "itable:\n", (gulong) _tmp130_);
-#line 703 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 719 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp132_ = manifest;
-#line 703 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 719 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp133_ = _tmp132_->write_failed;
-#line 703 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 719 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp134_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp133_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 703 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 719 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp135_ = _tmp134_;
-#line 703 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 719 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp136_ = g_strdup_printf (_tmp131_, _tmp135_);
-#line 703 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 719 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		photos_message = _tmp136_;
-#line 706 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 722 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp137_ = manifest;
-#line 706 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 722 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp138_ = _tmp137_->write_failed;
-#line 706 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 722 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp139_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp138_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 706 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 722 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp140_ = _tmp139_;
-#line 706 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 722 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp141_ = ngettext ("1 video failed to import because the photo library folder was not writ" \
 "able:\n", "%d videos failed to import because the photo library folder was not wr" \
 "itable:\n", (gulong) _tmp140_);
-#line 706 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 722 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp142_ = manifest;
-#line 706 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 722 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp143_ = _tmp142_->write_failed;
-#line 706 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 722 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp144_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp143_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 706 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 722 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp145_ = _tmp144_;
-#line 706 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 722 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp146_ = g_strdup_printf (_tmp141_, _tmp145_);
-#line 706 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 722 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		videos_message = _tmp146_;
-#line 709 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 725 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp147_ = manifest;
-#line 709 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 725 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp148_ = _tmp147_->write_failed;
-#line 709 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 725 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp149_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp148_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 709 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 725 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp150_ = _tmp149_;
-#line 709 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 725 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp151_ = ngettext ("1 photo/video failed to import because the photo library folder was no" \
 "t writable:\n", "%d photos/videos failed to import because the photo library folder was" \
 " not writable:\n", (gulong) _tmp150_);
-#line 709 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 725 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp152_ = manifest;
-#line 709 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 725 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp153_ = _tmp152_->write_failed;
-#line 709 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 725 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp154_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp153_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 709 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 725 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp155_ = _tmp154_;
-#line 709 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 725 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp156_ = g_strdup_printf (_tmp151_, _tmp155_);
-#line 709 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 725 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		both_message = _tmp156_;
-#line 712 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 728 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp157_ = manifest;
-#line 712 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 728 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp158_ = _tmp157_->write_failed;
-#line 712 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 728 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp159_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp158_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 712 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 728 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp160_ = _tmp159_;
-#line 712 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 728 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp161_ = ngettext ("1 file failed to import because the photo library folder was not writa" \
 "ble:\n", "%d files failed to import because the photo library folder was not wri" \
 "table:\n", (gulong) _tmp160_);
-#line 712 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 728 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp162_ = manifest;
-#line 712 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 728 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp163_ = _tmp162_->write_failed;
-#line 712 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 728 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp164_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp163_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 712 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 728 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp165_ = _tmp164_;
-#line 712 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 728 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp166_ = g_strdup_printf (_tmp161_, _tmp165_);
-#line 712 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 728 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		neither_message = _tmp166_;
-#line 716 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 732 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp167_ = message;
-#line 716 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 732 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp168_ = manifest;
-#line 716 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 732 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp169_ = _tmp168_->write_failed;
-#line 716 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 732 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp170_ = photos_message;
-#line 716 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 732 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp171_ = videos_message;
-#line 716 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 732 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp172_ = both_message;
-#line 716 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 732 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp173_ = neither_message;
-#line 716 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 732 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp174_ = import_ui_get_media_specific_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp169_, GEE_TYPE_COLLECTION, GeeCollection), _tmp170_, _tmp171_, _tmp172_, _tmp173_);
-#line 716 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 732 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp175_ = _tmp174_;
-#line 716 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 732 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp176_ = g_strconcat (_tmp167_, _tmp175_, NULL);
-#line 716 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 732 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (message);
-#line 716 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 732 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		message = _tmp176_;
-#line 716 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 732 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (_tmp175_);
-#line 719 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 735 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp177_ = message;
-#line 719 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 735 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp178_ = manifest;
-#line 719 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 735 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp179_ = _tmp178_->write_failed;
-#line 719 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 735 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp180_ = show_dest_id;
-#line 719 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 735 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp181_ = import_ui_generate_import_failure_list (_tmp179_, _tmp180_);
-#line 719 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 735 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp182_ = _tmp181_;
-#line 719 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 735 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp183_ = g_strconcat (_tmp177_, _tmp182_, NULL);
-#line 719 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 735 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (message);
-#line 719 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 735 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		message = _tmp183_;
-#line 719 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 735 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (_tmp182_);
-#line 699 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 715 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (neither_message);
-#line 699 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 715 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (both_message);
-#line 699 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 715 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (videos_message);
-#line 699 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 715 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (photos_message);
-#line 7099 "Dialogs.c"
+#line 7227 "Dialogs.c"
 	}
-#line 722 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 738 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp184_ = manifest;
-#line 722 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 738 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp185_ = _tmp184_->camera_failed;
-#line 722 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 738 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp186_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp185_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 722 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 738 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp187_ = _tmp186_;
-#line 722 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 738 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp187_ > 0) {
-#line 7111 "Dialogs.c"
+#line 7239 "Dialogs.c"
 		const gchar* _tmp188_ = NULL;
 		gint _tmp189_ = 0;
 		gint _tmp190_ = 0;
@@ -7187,182 +7315,182 @@ gboolean import_ui_report_manifest (ImportManifest* manifest, gboolean show_dest
 		gchar* _tmp247_ = NULL;
 		gchar* _tmp248_ = NULL;
 		gchar* _tmp249_ = NULL;
-#line 723 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 739 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp188_ = message;
-#line 723 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 739 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp189_ = strlen (_tmp188_);
-#line 723 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 739 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp190_ = _tmp189_;
-#line 723 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 739 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (_tmp190_ > 0) {
-#line 7184 "Dialogs.c"
+#line 7312 "Dialogs.c"
 			const gchar* _tmp191_ = NULL;
 			gchar* _tmp192_ = NULL;
-#line 724 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 740 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp191_ = message;
-#line 724 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 740 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp192_ = g_strconcat (_tmp191_, "\n", NULL);
-#line 724 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 740 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_free0 (message);
-#line 724 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 740 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			message = _tmp192_;
-#line 7195 "Dialogs.c"
+#line 7323 "Dialogs.c"
 		}
-#line 726 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 742 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp193_ = manifest;
-#line 726 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 742 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp194_ = _tmp193_->camera_failed;
-#line 726 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 742 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp195_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp194_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 726 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 742 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp196_ = _tmp195_;
-#line 726 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 742 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp197_ = ngettext ("1 photo failed to import due to a camera error:\n", "%d photos failed to import due to a camera error:\n", (gulong) _tmp196_);
-#line 726 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 742 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp198_ = manifest;
-#line 726 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 742 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp199_ = _tmp198_->camera_failed;
-#line 726 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 742 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp200_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp199_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 726 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 742 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp201_ = _tmp200_;
-#line 726 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 742 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp202_ = g_strdup_printf (_tmp197_, _tmp201_);
-#line 726 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 742 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		photos_message = _tmp202_;
-#line 729 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 745 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp203_ = manifest;
-#line 729 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 745 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp204_ = _tmp203_->camera_failed;
-#line 729 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 745 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp205_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp204_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 729 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 745 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp206_ = _tmp205_;
-#line 729 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 745 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp207_ = ngettext ("1 video failed to import due to a camera error:\n", "%d videos failed to import due to a camera error:\n", (gulong) _tmp206_);
-#line 729 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 745 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp208_ = manifest;
-#line 729 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 745 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp209_ = _tmp208_->camera_failed;
-#line 729 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 745 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp210_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp209_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 729 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 745 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp211_ = _tmp210_;
-#line 729 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 745 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp212_ = g_strdup_printf (_tmp207_, _tmp211_);
-#line 729 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 745 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		videos_message = _tmp212_;
-#line 732 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 748 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp213_ = manifest;
-#line 732 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 748 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp214_ = _tmp213_->camera_failed;
-#line 732 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 748 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp215_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp214_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 732 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 748 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp216_ = _tmp215_;
-#line 732 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 748 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp217_ = ngettext ("1 photo/video failed to import due to a camera error:\n", "%d photos/videos failed to import due to a camera error:\n", (gulong) _tmp216_);
-#line 732 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 748 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp218_ = manifest;
-#line 732 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 748 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp219_ = _tmp218_->camera_failed;
-#line 732 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 748 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp220_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp219_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 732 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 748 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp221_ = _tmp220_;
-#line 732 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 748 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp222_ = g_strdup_printf (_tmp217_, _tmp221_);
-#line 732 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 748 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		both_message = _tmp222_;
-#line 735 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 751 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp223_ = manifest;
-#line 735 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 751 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp224_ = _tmp223_->camera_failed;
-#line 735 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 751 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp225_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp224_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 735 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 751 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp226_ = _tmp225_;
-#line 735 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 751 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp227_ = ngettext ("1 file failed to import due to a camera error:\n", "%d files failed to import due to a camera error:\n", (gulong) _tmp226_);
-#line 735 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 751 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp228_ = manifest;
-#line 735 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 751 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp229_ = _tmp228_->camera_failed;
-#line 735 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 751 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp230_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp229_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 735 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 751 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp231_ = _tmp230_;
-#line 735 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 751 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp232_ = g_strdup_printf (_tmp227_, _tmp231_);
-#line 735 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 751 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		neither_message = _tmp232_;
-#line 739 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 755 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp233_ = message;
-#line 739 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 755 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp234_ = manifest;
-#line 739 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 755 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp235_ = _tmp234_->camera_failed;
-#line 739 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 755 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp236_ = photos_message;
-#line 739 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 755 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp237_ = videos_message;
-#line 739 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 755 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp238_ = both_message;
-#line 739 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 755 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp239_ = neither_message;
-#line 739 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 755 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp240_ = import_ui_get_media_specific_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp235_, GEE_TYPE_COLLECTION, GeeCollection), _tmp236_, _tmp237_, _tmp238_, _tmp239_);
-#line 739 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 755 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp241_ = _tmp240_;
-#line 739 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 755 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp242_ = g_strconcat (_tmp233_, _tmp241_, NULL);
-#line 739 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 755 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (message);
-#line 739 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 755 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		message = _tmp242_;
-#line 739 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 755 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (_tmp241_);
-#line 742 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 758 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp243_ = message;
-#line 742 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 758 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp244_ = manifest;
-#line 742 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 758 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp245_ = _tmp244_->camera_failed;
-#line 742 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 758 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp246_ = show_dest_id;
-#line 742 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 758 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp247_ = import_ui_generate_import_failure_list (_tmp245_, _tmp246_);
-#line 742 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 758 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp248_ = _tmp247_;
-#line 742 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 758 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp249_ = g_strconcat (_tmp243_, _tmp248_, NULL);
-#line 742 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 758 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (message);
-#line 742 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 758 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		message = _tmp249_;
-#line 742 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 758 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (_tmp248_);
-#line 722 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 738 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (neither_message);
-#line 722 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 738 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (both_message);
-#line 722 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 738 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (videos_message);
-#line 722 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 738 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (photos_message);
-#line 7339 "Dialogs.c"
+#line 7467 "Dialogs.c"
 	}
-#line 745 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 761 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp250_ = manifest;
-#line 745 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 761 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp251_ = _tmp250_->corrupt_files;
-#line 745 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 761 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp252_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp251_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 745 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 761 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp253_ = _tmp252_;
-#line 745 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 761 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp253_ > 0) {
-#line 7351 "Dialogs.c"
+#line 7479 "Dialogs.c"
 		const gchar* _tmp254_ = NULL;
 		gint _tmp255_ = 0;
 		gint _tmp256_ = 0;
@@ -7427,182 +7555,182 @@ gboolean import_ui_report_manifest (ImportManifest* manifest, gboolean show_dest
 		gchar* _tmp313_ = NULL;
 		gchar* _tmp314_ = NULL;
 		gchar* _tmp315_ = NULL;
-#line 746 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 762 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp254_ = message;
-#line 746 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 762 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp255_ = strlen (_tmp254_);
-#line 746 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 762 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp256_ = _tmp255_;
-#line 746 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 762 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (_tmp256_ > 0) {
-#line 7424 "Dialogs.c"
+#line 7552 "Dialogs.c"
 			const gchar* _tmp257_ = NULL;
 			gchar* _tmp258_ = NULL;
-#line 747 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 763 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp257_ = message;
-#line 747 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 763 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp258_ = g_strconcat (_tmp257_, "\n", NULL);
-#line 747 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 763 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_free0 (message);
-#line 747 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 763 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			message = _tmp258_;
-#line 7435 "Dialogs.c"
+#line 7563 "Dialogs.c"
 		}
-#line 749 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 765 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp259_ = manifest;
-#line 749 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 765 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp260_ = _tmp259_->corrupt_files;
-#line 749 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 765 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp261_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp260_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 749 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 765 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp262_ = _tmp261_;
-#line 749 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 765 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp263_ = ngettext ("1 photo failed to import because it was corrupt:\n", "%d photos failed to import because they were corrupt:\n", (gulong) _tmp262_);
-#line 749 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 765 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp264_ = manifest;
-#line 749 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 765 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp265_ = _tmp264_->corrupt_files;
-#line 749 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 765 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp266_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp265_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 749 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 765 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp267_ = _tmp266_;
-#line 749 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 765 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp268_ = g_strdup_printf (_tmp263_, _tmp267_);
-#line 749 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 765 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		photos_message = _tmp268_;
-#line 752 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 768 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp269_ = manifest;
-#line 752 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 768 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp270_ = _tmp269_->corrupt_files;
-#line 752 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 768 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp271_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp270_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 752 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 768 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp272_ = _tmp271_;
-#line 752 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 768 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp273_ = ngettext ("1 video failed to import because it was corrupt:\n", "%d videos failed to import because they were corrupt:\n", (gulong) _tmp272_);
-#line 752 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 768 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp274_ = manifest;
-#line 752 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 768 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp275_ = _tmp274_->corrupt_files;
-#line 752 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 768 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp276_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp275_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 752 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 768 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp277_ = _tmp276_;
-#line 752 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 768 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp278_ = g_strdup_printf (_tmp273_, _tmp277_);
-#line 752 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 768 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		videos_message = _tmp278_;
-#line 755 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 771 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp279_ = manifest;
-#line 755 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 771 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp280_ = _tmp279_->corrupt_files;
-#line 755 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 771 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp281_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp280_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 755 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 771 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp282_ = _tmp281_;
-#line 755 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 771 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp283_ = ngettext ("1 photo/video failed to import because it was corrupt:\n", "%d photos/videos failed to import because they were corrupt:\n", (gulong) _tmp282_);
-#line 755 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 771 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp284_ = manifest;
-#line 755 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 771 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp285_ = _tmp284_->corrupt_files;
-#line 755 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 771 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp286_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp285_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 755 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 771 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp287_ = _tmp286_;
-#line 755 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 771 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp288_ = g_strdup_printf (_tmp283_, _tmp287_);
-#line 755 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 771 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		both_message = _tmp288_;
-#line 758 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 774 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp289_ = manifest;
-#line 758 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 774 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp290_ = _tmp289_->corrupt_files;
-#line 758 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 774 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp291_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp290_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 758 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 774 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp292_ = _tmp291_;
-#line 758 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 774 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp293_ = ngettext ("1 file failed to import because it was corrupt:\n", "%d files failed to import because it was corrupt:\n", (gulong) _tmp292_);
-#line 758 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 774 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp294_ = manifest;
-#line 758 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 774 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp295_ = _tmp294_->corrupt_files;
-#line 758 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 774 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp296_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp295_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 758 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 774 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp297_ = _tmp296_;
-#line 758 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 774 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp298_ = g_strdup_printf (_tmp293_, _tmp297_);
-#line 758 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 774 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		neither_message = _tmp298_;
-#line 762 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 778 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp299_ = message;
-#line 762 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 778 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp300_ = manifest;
-#line 762 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 778 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp301_ = _tmp300_->corrupt_files;
-#line 762 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 778 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp302_ = photos_message;
-#line 762 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 778 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp303_ = videos_message;
-#line 762 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 778 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp304_ = both_message;
-#line 762 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 778 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp305_ = neither_message;
-#line 762 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 778 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp306_ = import_ui_get_media_specific_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp301_, GEE_TYPE_COLLECTION, GeeCollection), _tmp302_, _tmp303_, _tmp304_, _tmp305_);
-#line 762 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 778 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp307_ = _tmp306_;
-#line 762 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 778 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp308_ = g_strconcat (_tmp299_, _tmp307_, NULL);
-#line 762 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 778 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (message);
-#line 762 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 778 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		message = _tmp308_;
-#line 762 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 778 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (_tmp307_);
-#line 765 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 781 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp309_ = message;
-#line 765 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 781 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp310_ = manifest;
-#line 765 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 781 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp311_ = _tmp310_->corrupt_files;
-#line 765 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 781 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp312_ = show_dest_id;
-#line 765 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 781 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp313_ = import_ui_generate_import_failure_list (_tmp311_, _tmp312_);
-#line 765 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 781 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp314_ = _tmp313_;
-#line 765 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 781 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp315_ = g_strconcat (_tmp309_, _tmp314_, NULL);
-#line 765 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 781 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (message);
-#line 765 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 781 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		message = _tmp315_;
-#line 765 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 781 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (_tmp314_);
-#line 745 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 761 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (neither_message);
-#line 745 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 761 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (both_message);
-#line 745 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 761 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (videos_message);
-#line 745 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 761 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (photos_message);
-#line 7579 "Dialogs.c"
+#line 7707 "Dialogs.c"
 	}
-#line 768 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 784 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp316_ = manifest;
-#line 768 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 784 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp317_ = _tmp316_->skipped_photos;
-#line 768 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 784 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp318_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp317_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 768 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 784 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp319_ = _tmp318_;
-#line 768 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 784 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp319_ > 0) {
-#line 7591 "Dialogs.c"
+#line 7719 "Dialogs.c"
 		const gchar* _tmp320_ = NULL;
 		gint _tmp321_ = 0;
 		gint _tmp322_ = 0;
@@ -7627,94 +7755,94 @@ gboolean import_ui_report_manifest (ImportManifest* manifest, gboolean show_dest
 		gchar* _tmp342_ = NULL;
 		gchar* _tmp343_ = NULL;
 		gchar* _tmp344_ = NULL;
-#line 769 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 785 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp320_ = message;
-#line 769 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 785 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp321_ = strlen (_tmp320_);
-#line 769 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 785 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp322_ = _tmp321_;
-#line 769 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 785 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (_tmp322_ > 0) {
-#line 7624 "Dialogs.c"
+#line 7752 "Dialogs.c"
 			const gchar* _tmp323_ = NULL;
 			gchar* _tmp324_ = NULL;
-#line 770 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 786 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp323_ = message;
-#line 770 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 786 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp324_ = g_strconcat (_tmp323_, "\n", NULL);
-#line 770 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 786 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_free0 (message);
-#line 770 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 786 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			message = _tmp324_;
-#line 7635 "Dialogs.c"
+#line 7763 "Dialogs.c"
 		}
-#line 775 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 791 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp325_ = manifest;
-#line 775 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 791 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp326_ = _tmp325_->skipped_photos;
-#line 775 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 791 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp327_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp326_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 775 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 791 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp328_ = _tmp327_;
-#line 775 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 791 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp329_ = ngettext ("1 unsupported photo skipped:\n", "%d unsupported photos skipped:\n", (gulong) _tmp328_);
-#line 775 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 791 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp330_ = manifest;
-#line 775 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 791 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp331_ = _tmp330_->skipped_photos;
-#line 775 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 791 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp332_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp331_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 775 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 791 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp333_ = _tmp332_;
-#line 775 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 791 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp334_ = g_strdup_printf (_tmp329_, _tmp333_);
-#line 775 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 791 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		skipped_photos_message = _tmp334_;
-#line 779 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 795 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp335_ = message;
-#line 779 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 795 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp336_ = skipped_photos_message;
-#line 779 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 795 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp337_ = g_strconcat (_tmp335_, _tmp336_, NULL);
-#line 779 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 795 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (message);
-#line 779 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 795 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		message = _tmp337_;
-#line 781 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 797 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp338_ = message;
-#line 781 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 797 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp339_ = manifest;
-#line 781 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 797 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp340_ = _tmp339_->skipped_photos;
-#line 781 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 797 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp341_ = show_dest_id;
-#line 781 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 797 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp342_ = import_ui_generate_import_failure_list (_tmp340_, _tmp341_);
-#line 781 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 797 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp343_ = _tmp342_;
-#line 781 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 797 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp344_ = g_strconcat (_tmp338_, _tmp343_, NULL);
-#line 781 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 797 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (message);
-#line 781 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 797 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		message = _tmp344_;
-#line 781 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 797 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (_tmp343_);
-#line 768 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 784 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (skipped_photos_message);
-#line 7691 "Dialogs.c"
+#line 7819 "Dialogs.c"
 	}
-#line 784 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 800 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp345_ = manifest;
-#line 784 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 800 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp346_ = _tmp345_->skipped_files;
-#line 784 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 800 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp347_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp346_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 784 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 800 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp348_ = _tmp347_;
-#line 784 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 800 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp348_ > 0) {
-#line 7703 "Dialogs.c"
+#line 7831 "Dialogs.c"
 		const gchar* _tmp349_ = NULL;
 		gint _tmp350_ = 0;
 		gint _tmp351_ = 0;
@@ -7732,74 +7860,74 @@ gboolean import_ui_report_manifest (ImportManifest* manifest, gboolean show_dest
 		const gchar* _tmp364_ = NULL;
 		const gchar* _tmp365_ = NULL;
 		gchar* _tmp366_ = NULL;
-#line 785 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 801 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp349_ = message;
-#line 785 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 801 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp350_ = strlen (_tmp349_);
-#line 785 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 801 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp351_ = _tmp350_;
-#line 785 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 801 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (_tmp351_ > 0) {
-#line 7729 "Dialogs.c"
+#line 7857 "Dialogs.c"
 			const gchar* _tmp352_ = NULL;
 			gchar* _tmp353_ = NULL;
-#line 786 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 802 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp352_ = message;
-#line 786 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 802 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp353_ = g_strconcat (_tmp352_, "\n", NULL);
-#line 786 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 802 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_free0 (message);
-#line 786 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 802 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			message = _tmp353_;
-#line 7740 "Dialogs.c"
+#line 7868 "Dialogs.c"
 		}
-#line 790 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 806 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp354_ = manifest;
-#line 790 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 806 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp355_ = _tmp354_->skipped_files;
-#line 790 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 806 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp356_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp355_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 790 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 806 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp357_ = _tmp356_;
-#line 790 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 806 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp358_ = ngettext ("1 non-image file skipped.\n", "%d non-image files skipped.\n", (gulong) _tmp357_);
-#line 790 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 806 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp359_ = manifest;
-#line 790 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 806 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp360_ = _tmp359_->skipped_files;
-#line 790 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 806 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp361_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp360_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 790 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 806 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp362_ = _tmp361_;
-#line 790 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 806 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp363_ = g_strdup_printf (_tmp358_, _tmp362_);
-#line 790 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 806 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		skipped_files_message = _tmp363_;
-#line 794 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 810 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp364_ = message;
-#line 794 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 810 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp365_ = skipped_files_message;
-#line 794 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 810 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp366_ = g_strconcat (_tmp364_, _tmp365_, NULL);
-#line 794 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 810 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (message);
-#line 794 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 810 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		message = _tmp366_;
-#line 784 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 800 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (skipped_files_message);
-#line 7776 "Dialogs.c"
+#line 7904 "Dialogs.c"
 	}
-#line 797 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 813 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp367_ = manifest;
-#line 797 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 813 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp368_ = _tmp367_->aborted;
-#line 797 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 813 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp369_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp368_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 797 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 813 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp370_ = _tmp369_;
-#line 797 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 813 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp370_ > 0) {
-#line 7788 "Dialogs.c"
+#line 7916 "Dialogs.c"
 		const gchar* _tmp371_ = NULL;
 		gint _tmp372_ = 0;
 		gint _tmp373_ = 0;
@@ -7864,182 +7992,182 @@ gboolean import_ui_report_manifest (ImportManifest* manifest, gboolean show_dest
 		gchar* _tmp430_ = NULL;
 		gchar* _tmp431_ = NULL;
 		gchar* _tmp432_ = NULL;
-#line 798 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 814 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp371_ = message;
-#line 798 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 814 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp372_ = strlen (_tmp371_);
-#line 798 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 814 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp373_ = _tmp372_;
-#line 798 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 814 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (_tmp373_ > 0) {
-#line 7861 "Dialogs.c"
+#line 7989 "Dialogs.c"
 			const gchar* _tmp374_ = NULL;
 			gchar* _tmp375_ = NULL;
-#line 799 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 815 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp374_ = message;
-#line 799 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 815 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp375_ = g_strconcat (_tmp374_, "\n", NULL);
-#line 799 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 815 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_free0 (message);
-#line 799 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 815 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			message = _tmp375_;
-#line 7872 "Dialogs.c"
+#line 8000 "Dialogs.c"
 		}
-#line 801 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 817 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp376_ = manifest;
-#line 801 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 817 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp377_ = _tmp376_->aborted;
-#line 801 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 817 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp378_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp377_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 801 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 817 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp379_ = _tmp378_;
-#line 801 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 817 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp380_ = ngettext ("1 photo skipped due to user cancel:\n", "%d photos skipped due to user cancel:\n", (gulong) _tmp379_);
-#line 801 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 817 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp381_ = manifest;
-#line 801 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 817 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp382_ = _tmp381_->aborted;
-#line 801 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 817 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp383_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp382_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 801 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 817 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp384_ = _tmp383_;
-#line 801 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 817 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp385_ = g_strdup_printf (_tmp380_, _tmp384_);
-#line 801 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 817 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		photos_message = _tmp385_;
-#line 804 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 820 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp386_ = manifest;
-#line 804 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 820 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp387_ = _tmp386_->aborted;
-#line 804 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 820 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp388_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp387_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 804 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 820 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp389_ = _tmp388_;
-#line 804 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 820 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp390_ = ngettext ("1 video skipped due to user cancel:\n", "%d videos skipped due to user cancel:\n", (gulong) _tmp389_);
-#line 804 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 820 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp391_ = manifest;
-#line 804 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 820 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp392_ = _tmp391_->aborted;
-#line 804 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 820 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp393_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp392_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 804 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 820 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp394_ = _tmp393_;
-#line 804 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 820 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp395_ = g_strdup_printf (_tmp390_, _tmp394_);
-#line 804 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 820 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		videos_message = _tmp395_;
-#line 807 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 823 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp396_ = manifest;
-#line 807 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 823 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp397_ = _tmp396_->aborted;
-#line 807 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 823 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp398_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp397_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 807 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 823 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp399_ = _tmp398_;
-#line 807 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 823 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp400_ = ngettext ("1 photo/video skipped due to user cancel:\n", "%d photos/videos skipped due to user cancel:\n", (gulong) _tmp399_);
-#line 807 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 823 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp401_ = manifest;
-#line 807 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 823 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp402_ = _tmp401_->aborted;
-#line 807 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 823 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp403_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp402_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 807 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 823 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp404_ = _tmp403_;
-#line 807 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 823 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp405_ = g_strdup_printf (_tmp400_, _tmp404_);
-#line 807 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 823 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		both_message = _tmp405_;
-#line 810 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 826 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp406_ = manifest;
-#line 810 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 826 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp407_ = _tmp406_->aborted;
-#line 810 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 826 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp408_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp407_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 810 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 826 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp409_ = _tmp408_;
-#line 810 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 826 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp410_ = ngettext ("1 file skipped due to user cancel:\n", "%d file skipped due to user cancel:\n", (gulong) _tmp409_);
-#line 810 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 826 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp411_ = manifest;
-#line 810 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 826 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp412_ = _tmp411_->aborted;
-#line 810 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 826 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp413_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp412_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 810 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 826 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp414_ = _tmp413_;
-#line 810 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 826 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp415_ = g_strdup_printf (_tmp410_, _tmp414_);
-#line 810 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 826 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		neither_message = _tmp415_;
-#line 814 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 830 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp416_ = message;
-#line 814 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 830 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp417_ = manifest;
-#line 814 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 830 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp418_ = _tmp417_->aborted;
-#line 814 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 830 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp419_ = photos_message;
-#line 814 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 830 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp420_ = videos_message;
-#line 814 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 830 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp421_ = both_message;
-#line 814 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 830 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp422_ = neither_message;
-#line 814 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 830 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp423_ = import_ui_get_media_specific_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp418_, GEE_TYPE_COLLECTION, GeeCollection), _tmp419_, _tmp420_, _tmp421_, _tmp422_);
-#line 814 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 830 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp424_ = _tmp423_;
-#line 814 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 830 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp425_ = g_strconcat (_tmp416_, _tmp424_, NULL);
-#line 814 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 830 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (message);
-#line 814 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 830 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		message = _tmp425_;
-#line 814 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 830 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (_tmp424_);
-#line 817 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 833 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp426_ = message;
-#line 817 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 833 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp427_ = manifest;
-#line 817 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 833 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp428_ = _tmp427_->aborted;
-#line 817 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 833 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp429_ = show_dest_id;
-#line 817 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 833 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp430_ = import_ui_generate_import_failure_list (_tmp428_, _tmp429_);
-#line 817 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 833 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp431_ = _tmp430_;
-#line 817 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 833 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp432_ = g_strconcat (_tmp426_, _tmp431_, NULL);
-#line 817 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 833 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (message);
-#line 817 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 833 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		message = _tmp432_;
-#line 817 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 833 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (_tmp431_);
-#line 797 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 813 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (neither_message);
-#line 797 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 813 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (both_message);
-#line 797 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 813 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (videos_message);
-#line 797 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 813 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (photos_message);
-#line 8016 "Dialogs.c"
+#line 8144 "Dialogs.c"
 	}
-#line 820 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 836 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp433_ = manifest;
-#line 820 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 836 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp434_ = _tmp433_->success;
-#line 820 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 836 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp435_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp434_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 820 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 836 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp436_ = _tmp435_;
-#line 820 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 836 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp436_ > 0) {
-#line 8028 "Dialogs.c"
+#line 8156 "Dialogs.c"
 		const gchar* _tmp437_ = NULL;
 		gint _tmp438_ = 0;
 		gint _tmp439_ = 0;
@@ -8085,240 +8213,240 @@ gboolean import_ui_report_manifest (ImportManifest* manifest, gboolean show_dest
 		gchar* _tmp478_ = NULL;
 		gchar* _tmp479_ = NULL;
 		gchar* _tmp480_ = NULL;
-#line 821 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 837 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp437_ = message;
-#line 821 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 837 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp438_ = strlen (_tmp437_);
-#line 821 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 837 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp439_ = _tmp438_;
-#line 821 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 837 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (_tmp439_ > 0) {
-#line 8082 "Dialogs.c"
+#line 8210 "Dialogs.c"
 			const gchar* _tmp440_ = NULL;
 			gchar* _tmp441_ = NULL;
-#line 822 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 838 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp440_ = message;
-#line 822 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 838 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp441_ = g_strconcat (_tmp440_, "\n", NULL);
-#line 822 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 838 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_free0 (message);
-#line 822 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 838 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			message = _tmp441_;
-#line 8093 "Dialogs.c"
+#line 8221 "Dialogs.c"
 		}
-#line 824 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 840 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp442_ = manifest;
-#line 824 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 840 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp443_ = _tmp442_->success;
-#line 824 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 840 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp444_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp443_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 824 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 840 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp445_ = _tmp444_;
-#line 824 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 840 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp446_ = ngettext ("1 photo successfully imported.\n", "%d photos successfully imported.\n", (gulong) _tmp445_);
-#line 824 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 840 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp447_ = manifest;
-#line 824 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 840 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp448_ = _tmp447_->success;
-#line 824 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 840 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp449_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp448_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 824 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 840 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp450_ = _tmp449_;
-#line 824 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 840 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp451_ = g_strdup_printf (_tmp446_, _tmp450_);
-#line 824 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 840 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		photos_message = _tmp451_;
-#line 827 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 843 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp452_ = manifest;
-#line 827 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 843 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp453_ = _tmp452_->success;
-#line 827 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 843 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp454_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp453_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 827 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 843 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp455_ = _tmp454_;
-#line 827 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 843 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp456_ = ngettext ("1 video successfully imported.\n", "%d videos successfully imported.\n", (gulong) _tmp455_);
-#line 827 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 843 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp457_ = manifest;
-#line 827 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 843 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp458_ = _tmp457_->success;
-#line 827 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 843 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp459_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp458_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 827 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 843 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp460_ = _tmp459_;
-#line 827 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 843 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp461_ = g_strdup_printf (_tmp456_, _tmp460_);
-#line 827 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 843 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		videos_message = _tmp461_;
-#line 830 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 846 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp462_ = manifest;
-#line 830 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 846 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp463_ = _tmp462_->success;
-#line 830 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 846 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp464_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp463_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 830 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 846 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp465_ = _tmp464_;
-#line 830 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 846 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp466_ = ngettext ("1 photo/video successfully imported.\n", "%d photos/videos successfully imported.\n", (gulong) _tmp465_);
-#line 830 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 846 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp467_ = manifest;
-#line 830 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 846 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp468_ = _tmp467_->success;
-#line 830 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 846 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp469_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp468_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 830 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 846 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp470_ = _tmp469_;
-#line 830 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 846 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp471_ = g_strdup_printf (_tmp466_, _tmp470_);
-#line 830 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 846 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		both_message = _tmp471_;
-#line 834 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 850 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp472_ = message;
-#line 834 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 850 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp473_ = manifest;
-#line 834 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 850 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp474_ = _tmp473_->success;
-#line 834 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 850 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp475_ = photos_message;
-#line 834 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 850 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp476_ = videos_message;
-#line 834 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 850 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp477_ = both_message;
-#line 834 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 850 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp478_ = import_ui_get_media_specific_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp474_, GEE_TYPE_COLLECTION, GeeCollection), _tmp475_, _tmp476_, _tmp477_, "");
-#line 834 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 850 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp479_ = _tmp478_;
-#line 834 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 850 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp480_ = g_strconcat (_tmp472_, _tmp479_, NULL);
-#line 834 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 850 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (message);
-#line 834 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 850 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		message = _tmp480_;
-#line 834 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 850 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (_tmp479_);
-#line 820 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 836 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (both_message);
-#line 820 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 836 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (videos_message);
-#line 820 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 836 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (photos_message);
-#line 8191 "Dialogs.c"
+#line 8319 "Dialogs.c"
 	}
-#line 838 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 854 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp481_ = manifest;
-#line 838 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 854 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp482_ = _tmp481_->success;
-#line 838 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 854 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp483_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp482_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 838 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 854 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp484_ = _tmp483_;
-#line 838 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 854 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp485_ = manifest;
-#line 838 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 854 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp486_ = _tmp485_->failed;
-#line 838 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 854 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp487_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp486_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 838 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 854 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp488_ = _tmp487_;
-#line 838 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 854 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp489_ = manifest;
-#line 838 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 854 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp490_ = _tmp489_->camera_failed;
-#line 838 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 854 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp491_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp490_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 838 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 854 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp492_ = _tmp491_;
-#line 838 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 854 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp493_ = manifest;
-#line 838 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 854 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp494_ = _tmp493_->skipped_photos;
-#line 838 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 854 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp495_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp494_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 838 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 854 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp496_ = _tmp495_;
-#line 838 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 854 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp497_ = manifest;
-#line 838 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 854 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp498_ = _tmp497_->skipped_files;
-#line 838 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 854 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp499_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp498_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 838 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 854 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp500_ = _tmp499_;
-#line 838 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 854 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp501_ = manifest;
-#line 838 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 854 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp502_ = _tmp501_->corrupt_files;
-#line 838 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 854 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp503_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp502_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 838 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 854 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp504_ = _tmp503_;
-#line 838 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 854 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp505_ = manifest;
-#line 838 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 854 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp506_ = _tmp505_->already_imported;
-#line 838 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 854 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp507_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp506_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 838 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 854 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp508_ = _tmp507_;
-#line 838 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 854 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp509_ = manifest;
-#line 838 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 854 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp510_ = _tmp509_->aborted;
-#line 838 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 854 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp511_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp510_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 838 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 854 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp512_ = _tmp511_;
-#line 838 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 854 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp513_ = manifest;
-#line 838 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 854 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp514_ = _tmp513_->write_failed;
-#line 838 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 854 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp515_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp514_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 838 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 854 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp516_ = _tmp515_;
-#line 838 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 854 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	total = (((((((_tmp484_ + _tmp488_) + _tmp492_) + _tmp496_) + _tmp500_) + _tmp504_) + _tmp508_) + _tmp512_) + _tmp516_;
-#line 841 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 857 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp517_ = total;
-#line 841 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 857 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp518_ = manifest;
-#line 841 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 857 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp519_ = _tmp518_->all;
-#line 841 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 857 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp520_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp519_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 841 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 857 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp521_ = _tmp520_;
-#line 841 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 857 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_vala_assert (_tmp517_ == _tmp521_, "total == manifest.all.size");
-#line 845 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 861 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp522_ = total;
-#line 845 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 861 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp522_ == 0) {
-#line 8283 "Dialogs.c"
+#line 8411 "Dialogs.c"
 		const gchar* _tmp523_ = NULL;
 		const gchar* _tmp524_ = NULL;
 		gchar* _tmp525_ = NULL;
-#line 846 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 862 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp523_ = message;
-#line 846 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 862 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp524_ = _ ("No photos or videos imported.\n");
-#line 846 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 862 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp525_ = g_strconcat (_tmp523_, _tmp524_, NULL);
-#line 846 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 862 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (message);
-#line 846 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 862 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		message = _tmp525_;
-#line 8297 "Dialogs.c"
+#line 8425 "Dialogs.c"
 	}
-#line 848 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 864 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	dialog = NULL;
-#line 849 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 865 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	dialog_response = (gint) GTK_RESPONSE_NONE;
-#line 850 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 866 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp526_ = question;
-#line 850 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 866 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp526_ == NULL) {
-#line 8307 "Dialogs.c"
+#line 8435 "Dialogs.c"
 		AppWindow* _tmp527_ = NULL;
 		AppWindow* _tmp528_ = NULL;
 		const gchar* _tmp529_ = NULL;
@@ -8352,118 +8480,118 @@ gboolean import_ui_report_manifest (ImportManifest* manifest, gboolean show_dest
 		gint _tmp554_ = 0;
 		GtkMessageDialog* _tmp555_ = NULL;
 		gint _tmp556_ = 0;
-#line 851 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 867 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp527_ = app_window_get_instance ();
-#line 851 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 867 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp528_ = _tmp527_;
-#line 851 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 867 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp529_ = message;
-#line 851 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 867 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp530_ = (GtkMessageDialog*) gtk_message_dialog_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp528_, gtk_window_get_type (), GtkWindow), GTK_DIALOG_MODAL, GTK_MESSAGE_INFO, GTK_BUTTONS_NONE, "%s", _tmp529_);
-#line 851 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 867 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		g_object_ref_sink (_tmp530_);
-#line 851 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 867 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (dialog);
-#line 851 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 867 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		dialog = _tmp530_;
-#line 851 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 867 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (_tmp528_);
-#line 853 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 869 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp531_ = dialog;
-#line 853 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 869 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp532_ = _ ("Import Complete");
-#line 853 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 869 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_window_set_title (G_TYPE_CHECK_INSTANCE_CAST (_tmp531_, gtk_window_get_type (), GtkWindow), _tmp532_);
-#line 854 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 870 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp533_ = dialog;
-#line 854 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 870 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp534_ = gtk_dialog_add_button (G_TYPE_CHECK_INSTANCE_CAST (_tmp533_, gtk_dialog_get_type (), GtkDialog), IMPORT_UI_SAVE_RESULTS_BUTTON_NAME, IMPORT_UI_SAVE_RESULTS_RESPONSE_ID);
-#line 854 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 870 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp535_ = _g_object_ref0 (_tmp534_);
-#line 854 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 870 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		save_results_button = _tmp535_;
-#line 856 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 872 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp536_ = save_results_button;
-#line 856 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 872 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp537_ = manifest;
-#line 856 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 872 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp538_ = _tmp537_->success;
-#line 856 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 872 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp539_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp538_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 856 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 872 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp540_ = _tmp539_;
-#line 856 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 872 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp541_ = manifest;
-#line 856 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 872 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp542_ = _tmp541_->all;
-#line 856 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 872 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp543_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp542_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 856 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 872 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp544_ = _tmp543_;
-#line 856 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 872 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_widget_set_visible (_tmp536_, _tmp540_ < _tmp544_);
-#line 857 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 873 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp545_ = dialog;
-#line 857 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 873 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp546_ = gtk_dialog_add_button (G_TYPE_CHECK_INSTANCE_CAST (_tmp545_, gtk_dialog_get_type (), GtkDialog), RESOURCES_OK_LABEL, (gint) GTK_RESPONSE_OK);
-#line 857 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 873 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp547_ = _g_object_ref0 (_tmp546_);
-#line 857 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 873 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		ok_button = _tmp547_;
-#line 858 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 874 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp548_ = dialog;
-#line 858 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 874 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp549_ = ok_button;
-#line 858 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 874 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_window_set_default (G_TYPE_CHECK_INSTANCE_CAST (_tmp548_, gtk_window_get_type (), GtkWindow), _tmp549_);
-#line 860 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 876 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp550_ = dialog;
-#line 860 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 876 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp551_ = (GtkContainer*) gtk_widget_get_parent (G_TYPE_CHECK_INSTANCE_CAST (_tmp550_, gtk_widget_get_type (), GtkWidget));
-#line 860 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 876 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp552_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp551_, gtk_window_get_type (), GtkWindow));
-#line 860 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 876 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		dialog_parent = _tmp552_;
-#line 861 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 877 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp553_ = dialog;
-#line 861 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 877 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp554_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (_tmp553_, gtk_dialog_get_type (), GtkDialog));
-#line 861 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 877 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		dialog_response = _tmp554_;
-#line 862 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 878 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp555_ = dialog;
-#line 862 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 878 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp555_, gtk_widget_get_type (), GtkWidget));
-#line 864 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 880 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp556_ = dialog_response;
-#line 864 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 880 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (_tmp556_ == IMPORT_UI_SAVE_RESULTS_RESPONSE_ID) {
-#line 8427 "Dialogs.c"
+#line 8555 "Dialogs.c"
 			GtkWindow* _tmp557_ = NULL;
 			ImportManifest* _tmp558_ = NULL;
 			gchar* _tmp559_ = NULL;
 			gchar* _tmp560_ = NULL;
-#line 865 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 881 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp557_ = dialog_parent;
-#line 865 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 881 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp558_ = manifest;
-#line 865 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 881 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp559_ = import_ui_create_result_report_from_manifest (_tmp558_);
-#line 865 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 881 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp560_ = _tmp559_;
-#line 865 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 881 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			import_ui_save_import_results (_tmp557_, _tmp560_);
-#line 865 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 881 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_free0 (_tmp560_);
-#line 8444 "Dialogs.c"
+#line 8572 "Dialogs.c"
 		}
-#line 850 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 866 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (dialog_parent);
-#line 850 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 866 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (ok_button);
-#line 850 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 866 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (save_results_button);
-#line 8452 "Dialogs.c"
+#line 8580 "Dialogs.c"
 	} else {
 		const gchar* _tmp561_ = NULL;
 		ImportUIQuestionParams* _tmp562_ = NULL;
@@ -8505,109 +8633,109 @@ gboolean import_ui_report_manifest (ImportManifest* manifest, gboolean show_dest
 		gint _tmp596_ = 0;
 		GtkMessageDialog* _tmp604_ = NULL;
 		GtkMessageDialog* _tmp605_ = NULL;
-#line 868 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 884 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp561_ = message;
-#line 868 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 884 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp562_ = question;
-#line 868 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 884 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp563_ = _tmp562_->question;
-#line 868 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 884 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp564_ = g_strconcat ("\n", _tmp563_, NULL);
-#line 868 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 884 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp565_ = _tmp564_;
-#line 868 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 884 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp566_ = g_strconcat (_tmp561_, _tmp565_, NULL);
-#line 868 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 884 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (message);
-#line 868 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 884 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		message = _tmp566_;
-#line 868 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 884 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (_tmp565_);
-#line 870 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 886 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp567_ = app_window_get_instance ();
-#line 870 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 886 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp568_ = _tmp567_;
-#line 870 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 886 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp569_ = message;
-#line 870 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 886 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp570_ = (GtkMessageDialog*) gtk_message_dialog_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp568_, gtk_window_get_type (), GtkWindow), GTK_DIALOG_MODAL, GTK_MESSAGE_QUESTION, GTK_BUTTONS_NONE, "%s", _tmp569_);
-#line 870 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 886 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		g_object_ref_sink (_tmp570_);
-#line 870 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 886 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (dialog);
-#line 870 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 886 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		dialog = _tmp570_;
-#line 870 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 886 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (_tmp568_);
-#line 872 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 888 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp571_ = dialog;
-#line 872 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 888 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp572_ = _ ("Import Complete");
-#line 872 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 888 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_window_set_title (G_TYPE_CHECK_INSTANCE_CAST (_tmp571_, gtk_window_get_type (), GtkWindow), _tmp572_);
-#line 873 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 889 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp573_ = dialog;
-#line 873 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 889 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp574_ = gtk_dialog_add_button (G_TYPE_CHECK_INSTANCE_CAST (_tmp573_, gtk_dialog_get_type (), GtkDialog), IMPORT_UI_SAVE_RESULTS_BUTTON_NAME, IMPORT_UI_SAVE_RESULTS_RESPONSE_ID);
-#line 873 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 889 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp575_ = _g_object_ref0 (_tmp574_);
-#line 873 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 889 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		save_results_button = _tmp575_;
-#line 875 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 891 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp576_ = save_results_button;
-#line 875 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 891 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp577_ = manifest;
-#line 875 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 891 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp578_ = _tmp577_->success;
-#line 875 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 891 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp579_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp578_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 875 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 891 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp580_ = _tmp579_;
-#line 875 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 891 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp581_ = manifest;
-#line 875 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 891 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp582_ = _tmp581_->all;
-#line 875 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 891 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp583_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp582_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 875 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 891 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp584_ = _tmp583_;
-#line 875 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 891 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_widget_set_visible (_tmp576_, _tmp580_ < _tmp584_);
-#line 876 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 892 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp585_ = dialog;
-#line 876 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 892 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp586_ = question;
-#line 876 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 892 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp587_ = _tmp586_->no_button;
-#line 876 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 892 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp588_ = gtk_dialog_add_button (G_TYPE_CHECK_INSTANCE_CAST (_tmp585_, gtk_dialog_get_type (), GtkDialog), _tmp587_, (gint) GTK_RESPONSE_NO);
-#line 876 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 892 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp589_ = _g_object_ref0 (_tmp588_);
-#line 876 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 892 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		no_button = _tmp589_;
-#line 877 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 893 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp590_ = dialog;
-#line 877 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 893 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp591_ = question;
-#line 877 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 893 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp592_ = _tmp591_->yes_button;
-#line 877 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 893 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_dialog_add_button (G_TYPE_CHECK_INSTANCE_CAST (_tmp590_, gtk_dialog_get_type (), GtkDialog), _tmp592_, (gint) GTK_RESPONSE_YES);
-#line 878 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 894 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp593_ = dialog;
-#line 878 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 894 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp594_ = no_button;
-#line 878 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 894 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_window_set_default (G_TYPE_CHECK_INSTANCE_CAST (_tmp593_, gtk_window_get_type (), GtkWindow), _tmp594_);
-#line 880 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 896 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp595_ = dialog;
-#line 880 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 896 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp596_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (_tmp595_, gtk_dialog_get_type (), GtkDialog));
-#line 880 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 896 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		dialog_response = _tmp596_;
-#line 881 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 897 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		while (TRUE) {
-#line 8596 "Dialogs.c"
+#line 8724 "Dialogs.c"
 			gint _tmp597_ = 0;
 			GtkMessageDialog* _tmp598_ = NULL;
 			ImportManifest* _tmp599_ = NULL;
@@ -8615,59 +8743,59 @@ gboolean import_ui_report_manifest (ImportManifest* manifest, gboolean show_dest
 			gchar* _tmp601_ = NULL;
 			GtkMessageDialog* _tmp602_ = NULL;
 			gint _tmp603_ = 0;
-#line 881 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 897 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp597_ = dialog_response;
-#line 881 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 897 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			if (!(_tmp597_ == IMPORT_UI_SAVE_RESULTS_RESPONSE_ID)) {
-#line 881 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 897 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				break;
-#line 8610 "Dialogs.c"
+#line 8738 "Dialogs.c"
 			}
-#line 882 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 898 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp598_ = dialog;
-#line 882 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 898 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp599_ = manifest;
-#line 882 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 898 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp600_ = import_ui_create_result_report_from_manifest (_tmp599_);
-#line 882 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 898 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp601_ = _tmp600_;
-#line 882 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 898 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			import_ui_save_import_results (G_TYPE_CHECK_INSTANCE_CAST (_tmp598_, gtk_window_get_type (), GtkWindow), _tmp601_);
-#line 882 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 898 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_free0 (_tmp601_);
-#line 883 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 899 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp602_ = dialog;
-#line 883 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 899 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp603_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (_tmp602_, gtk_dialog_get_type (), GtkDialog));
-#line 883 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 899 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			dialog_response = _tmp603_;
-#line 8630 "Dialogs.c"
+#line 8758 "Dialogs.c"
 		}
-#line 886 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 902 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp604_ = dialog;
-#line 886 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 902 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp604_, gtk_widget_get_type (), GtkWidget));
-#line 887 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 903 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp605_ = dialog;
-#line 887 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 903 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp605_, gtk_widget_get_type (), GtkWidget));
-#line 850 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 866 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (no_button);
-#line 850 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 866 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (save_results_button);
-#line 8644 "Dialogs.c"
+#line 8772 "Dialogs.c"
 	}
-#line 890 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 906 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp606_ = dialog_response;
-#line 890 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 906 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	result = _tmp606_ == ((gint) GTK_RESPONSE_YES);
-#line 890 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 906 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (dialog);
-#line 890 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 906 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (message);
-#line 890 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 906 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 8656 "Dialogs.c"
+#line 8784 "Dialogs.c"
 }
 
 
@@ -8711,13 +8839,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 8700 "Dialogs.c"
+#line 8828 "Dialogs.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 8706 "Dialogs.c"
+#line 8834 "Dialogs.c"
 }
 
 
@@ -8741,75 +8869,75 @@ void import_ui_save_import_results (GtkWindow* chooser_dialog_parent, const gcha
 	gboolean _tmp13_ = FALSE;
 	gint _tmp14_ = 0;
 	GError * _inner_error_ = NULL;
-#line 893 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 909 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail ((chooser_dialog_parent == NULL) || GTK_IS_WINDOW (chooser_dialog_parent));
-#line 893 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 909 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (results_log != NULL);
-#line 894 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 910 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = chooser_dialog_parent;
-#line 894 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 910 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = (GtkFileChooserDialog*) gtk_file_chooser_dialog_new (IMPORT_UI_SAVE_RESULTS_FILE_CHOOSER_TITLE, _tmp0_, GTK_FILE_CHOOSER_ACTION_SAVE, RESOURCES_CANCEL_LABEL, GTK_RESPONSE_CANCEL, RESOURCES_SAVE_AS_LABEL, GTK_RESPONSE_ACCEPT, NULL, NULL);
-#line 894 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 910 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_object_ref_sink (_tmp1_);
-#line 894 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 910 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	chooser_dialog = _tmp1_;
-#line 897 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 913 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = chooser_dialog;
-#line 897 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 913 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_file_chooser_set_do_overwrite_confirmation (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser), TRUE);
-#line 898 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 914 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = chooser_dialog;
-#line 898 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 914 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp4_ = g_get_home_dir ();
-#line 898 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 914 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_file_chooser_set_current_folder (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser), _tmp4_);
-#line 899 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 915 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp5_ = chooser_dialog;
-#line 899 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 915 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_file_chooser_set_current_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser), "Shotwell Import Log.txt");
-#line 900 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 916 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp6_ = chooser_dialog;
-#line 900 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 916 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_file_chooser_set_local_only (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser), FALSE);
-#line 902 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 918 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp7_ = chooser_dialog;
-#line 902 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 918 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp8_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_dialog_get_type (), GtkDialog));
-#line 902 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 918 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	dialog_result = _tmp8_;
-#line 903 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 919 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp9_ = chooser_dialog;
-#line 903 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 919 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp10_ = gtk_file_chooser_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser));
-#line 903 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 919 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	chosen_file = _tmp10_;
-#line 904 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 920 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp11_ = chooser_dialog;
-#line 904 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 920 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_widget_get_type (), GtkWidget));
-#line 905 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 921 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp12_ = chooser_dialog;
-#line 905 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 921 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_widget_get_type (), GtkWidget));
-#line 907 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 923 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp14_ = dialog_result;
-#line 907 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 923 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp14_ == ((gint) GTK_RESPONSE_ACCEPT)) {
-#line 8784 "Dialogs.c"
+#line 8912 "Dialogs.c"
 		GFile* _tmp15_ = NULL;
-#line 907 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 923 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp15_ = chosen_file;
-#line 907 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 923 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp13_ = _tmp15_ != NULL;
-#line 8790 "Dialogs.c"
+#line 8918 "Dialogs.c"
 	} else {
-#line 907 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 923 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp13_ = FALSE;
-#line 8794 "Dialogs.c"
+#line 8922 "Dialogs.c"
 	}
-#line 907 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 923 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp13_) {
-#line 8798 "Dialogs.c"
+#line 8926 "Dialogs.c"
 		{
 			GFileOutputStream* outstream = NULL;
 			GFile* _tmp16_ = NULL;
@@ -8821,53 +8949,53 @@ void import_ui_save_import_results (GtkWindow* chooser_dialog_parent, const gcha
 			guint8* _tmp21_ = NULL;
 			gint _tmp21__length1 = 0;
 			GFileOutputStream* _tmp22_ = NULL;
-#line 909 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 925 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp16_ = chosen_file;
-#line 909 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 925 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp17_ = g_file_replace (_tmp16_, NULL, FALSE, G_FILE_CREATE_NONE, NULL, &_inner_error_);
-#line 909 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 925 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			outstream = _tmp17_;
-#line 909 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 925 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 8818 "Dialogs.c"
-				goto __catch411_g_error;
+#line 8946 "Dialogs.c"
+				goto __catch424_g_error;
 			}
-#line 910 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 926 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp18_ = outstream;
-#line 910 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 926 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp19_ = results_log;
-#line 910 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 926 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp20_ = string_get_data (_tmp19_, &_tmp20__length1);
-#line 910 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 926 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp21_ = _tmp20_;
-#line 910 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 926 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp21__length1 = _tmp20__length1;
-#line 910 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 926 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			g_output_stream_write (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, g_output_stream_get_type (), GOutputStream), _tmp21_, (gsize) _tmp21__length1, NULL, &_inner_error_);
-#line 910 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 926 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 910 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 926 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_object_unref0 (outstream);
-#line 8837 "Dialogs.c"
-				goto __catch411_g_error;
+#line 8965 "Dialogs.c"
+				goto __catch424_g_error;
 			}
-#line 911 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 927 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp22_ = outstream;
-#line 911 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 927 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			g_output_stream_close (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, g_output_stream_get_type (), GOutputStream), NULL, &_inner_error_);
-#line 911 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 927 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 911 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 927 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_object_unref0 (outstream);
-#line 8848 "Dialogs.c"
-				goto __catch411_g_error;
+#line 8976 "Dialogs.c"
+				goto __catch424_g_error;
 			}
-#line 908 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 924 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_object_unref0 (outstream);
-#line 8853 "Dialogs.c"
+#line 8981 "Dialogs.c"
 		}
-		goto __finally411;
-		__catch411_g_error:
+		goto __finally424;
+		__catch424_g_error:
 		{
 			GError* err = NULL;
 			GFile* _tmp23_ = NULL;
@@ -8875,58 +9003,58 @@ void import_ui_save_import_results (GtkWindow* chooser_dialog_parent, const gcha
 			gchar* _tmp25_ = NULL;
 			GError* _tmp26_ = NULL;
 			const gchar* _tmp27_ = NULL;
-#line 908 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 924 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			err = _inner_error_;
-#line 908 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 924 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_inner_error_ = NULL;
-#line 913 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 929 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp23_ = chosen_file;
-#line 913 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 929 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp24_ = g_file_get_path (_tmp23_);
-#line 913 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 929 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp25_ = _tmp24_;
-#line 913 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 929 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp26_ = err;
-#line 913 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 929 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp27_ = _tmp26_->message;
-#line 913 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			g_critical ("Dialogs.vala:913: couldn't save import results to log file %s: %s", _tmp25_, _tmp27_);
-#line 913 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 929 "/home/jens/Source/shotwell/src/Dialogs.vala"
+			g_critical ("Dialogs.vala:929: couldn't save import results to log file %s: %s", _tmp25_, _tmp27_);
+#line 929 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_free0 (_tmp25_);
-#line 908 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 924 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_error_free0 (err);
-#line 8884 "Dialogs.c"
+#line 9012 "Dialogs.c"
 		}
-		__finally411:
-#line 908 "/home/jens/Source/shotwell/src/Dialogs.vala"
+		__finally424:
+#line 924 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 908 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 924 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_object_unref0 (chosen_file);
-#line 908 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 924 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_object_unref0 (chooser_dialog);
-#line 908 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 924 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 908 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 924 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			g_clear_error (&_inner_error_);
-#line 908 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 924 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			return;
-#line 8899 "Dialogs.c"
+#line 9027 "Dialogs.c"
 		}
 	}
-#line 893 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 909 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (chosen_file);
-#line 893 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 909 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (chooser_dialog);
-#line 8906 "Dialogs.c"
+#line 9034 "Dialogs.c"
 }
 
 
 static gboolean _text_entry_dialog_mediator_on_modify_validate_text_entry_dialog_on_modify_validate_type (const gchar* text, gpointer self) {
 	gboolean result;
 	result = text_entry_dialog_mediator_on_modify_validate ((TextEntryDialogMediator*) self, text);
-#line 930 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 946 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 8915 "Dialogs.c"
+#line 9043 "Dialogs.c"
 }
 
 
@@ -8945,78 +9073,78 @@ TextEntryDialogMediator* text_entry_dialog_mediator_construct (GType object_type
 	const gchar* _tmp9_ = NULL;
 	GeeCollection* _tmp10_ = NULL;
 	const gchar* _tmp11_ = NULL;
-#line 924 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 940 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (title != NULL, NULL);
-#line 924 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 940 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (label != NULL, NULL);
-#line 924 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 940 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail ((completion_list == NULL) || GEE_IS_COLLECTION (completion_list), NULL);
-#line 924 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 940 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self = (TextEntryDialogMediator*) g_type_create_instance (object_type);
-#line 926 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 942 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = app_window_create_builder ("shotwell.ui", NULL);
-#line 926 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 942 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	builder = _tmp0_;
-#line 927 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 943 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = text_entry_dialog_new ();
-#line 927 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 943 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_object_ref_sink (_tmp1_);
-#line 927 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 943 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->dialog);
-#line 927 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 943 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->dialog = _tmp1_;
-#line 928 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 944 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = self->priv->dialog;
-#line 928 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 944 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = (GtkBox*) gtk_dialog_get_content_area (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_dialog_get_type (), GtkDialog));
-#line 928 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 944 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp4_ = gtk_builder_get_object (builder, "dialog-vbox2");
-#line 928 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 944 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_box_get_type (), GtkBox), gtk_widget_get_type (), GtkWidget));
-#line 929 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 945 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp5_ = self->priv->dialog;
-#line 929 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 945 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	text_entry_dialog_set_builder (_tmp5_, builder);
-#line 930 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 946 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp6_ = self->priv->dialog;
-#line 930 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 946 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp7_ = title;
-#line 930 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 946 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp8_ = label;
-#line 930 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 946 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp9_ = initial_text;
-#line 930 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 946 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp10_ = completion_list;
-#line 930 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 946 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp11_ = completion_delimiter;
-#line 930 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 946 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	text_entry_dialog_setup (_tmp6_, _text_entry_dialog_mediator_on_modify_validate_text_entry_dialog_on_modify_validate_type, self, _tmp7_, _tmp8_, _tmp9_, _tmp10_, _tmp11_);
-#line 924 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 940 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (builder);
-#line 924 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 940 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return self;
-#line 8984 "Dialogs.c"
+#line 9112 "Dialogs.c"
 }
 
 
 static gboolean text_entry_dialog_mediator_real_on_modify_validate (TextEntryDialogMediator* self, const gchar* text) {
 	gboolean result = FALSE;
-#line 933 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 949 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (text != NULL, FALSE);
-#line 934 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 950 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	result = TRUE;
-#line 934 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 950 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 8996 "Dialogs.c"
+#line 9124 "Dialogs.c"
 }
 
 
 gboolean text_entry_dialog_mediator_on_modify_validate (TextEntryDialogMediator* self, const gchar* text) {
-#line 933 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 949 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (IS_TEXT_ENTRY_DIALOG_MEDIATOR (self), FALSE);
-#line 933 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 949 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return TEXT_ENTRY_DIALOG_MEDIATOR_GET_CLASS (self)->on_modify_validate (self, text);
-#line 9005 "Dialogs.c"
+#line 9133 "Dialogs.c"
 }
 
 
@@ -9024,231 +9152,231 @@ gchar* _text_entry_dialog_mediator_execute (TextEntryDialogMediator* self) {
 	gchar* result = NULL;
 	TextEntryDialog* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
-#line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 953 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (IS_TEXT_ENTRY_DIALOG_MEDIATOR (self), NULL);
-#line 938 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 954 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = self->priv->dialog;
-#line 938 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 954 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = text_entry_dialog_execute (_tmp0_);
-#line 938 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 954 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	result = _tmp1_;
-#line 938 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 954 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 9023 "Dialogs.c"
+#line 9151 "Dialogs.c"
 }
 
 
 static void value_text_entry_dialog_mediator_init (GValue* value) {
-#line 921 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	value->data[0].v_pointer = NULL;
-#line 9030 "Dialogs.c"
+#line 9158 "Dialogs.c"
 }
 
 
 static void value_text_entry_dialog_mediator_free_value (GValue* value) {
-#line 921 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (value->data[0].v_pointer) {
-#line 921 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		text_entry_dialog_mediator_unref (value->data[0].v_pointer);
-#line 9039 "Dialogs.c"
+#line 9167 "Dialogs.c"
 	}
 }
 
 
 static void value_text_entry_dialog_mediator_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 921 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (src_value->data[0].v_pointer) {
-#line 921 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		dest_value->data[0].v_pointer = text_entry_dialog_mediator_ref (src_value->data[0].v_pointer);
-#line 9049 "Dialogs.c"
+#line 9177 "Dialogs.c"
 	} else {
-#line 921 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 9053 "Dialogs.c"
+#line 9181 "Dialogs.c"
 	}
 }
 
 
 static gpointer value_text_entry_dialog_mediator_peek_pointer (const GValue* value) {
-#line 921 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return value->data[0].v_pointer;
-#line 9061 "Dialogs.c"
+#line 9189 "Dialogs.c"
 }
 
 
 static gchar* value_text_entry_dialog_mediator_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 921 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (collect_values[0].v_pointer) {
-#line 9068 "Dialogs.c"
+#line 9196 "Dialogs.c"
 		TextEntryDialogMediator* object;
 		object = collect_values[0].v_pointer;
-#line 921 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (object->parent_instance.g_class == NULL) {
-#line 921 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 9075 "Dialogs.c"
+#line 9203 "Dialogs.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 921 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 9079 "Dialogs.c"
+#line 9207 "Dialogs.c"
 		}
-#line 921 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		value->data[0].v_pointer = text_entry_dialog_mediator_ref (object);
-#line 9083 "Dialogs.c"
+#line 9211 "Dialogs.c"
 	} else {
-#line 921 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		value->data[0].v_pointer = NULL;
-#line 9087 "Dialogs.c"
+#line 9215 "Dialogs.c"
 	}
-#line 921 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return NULL;
-#line 9091 "Dialogs.c"
+#line 9219 "Dialogs.c"
 }
 
 
 static gchar* value_text_entry_dialog_mediator_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 	TextEntryDialogMediator** object_p;
 	object_p = collect_values[0].v_pointer;
-#line 921 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (!object_p) {
-#line 921 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 9102 "Dialogs.c"
+#line 9230 "Dialogs.c"
 	}
-#line 921 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (!value->data[0].v_pointer) {
-#line 921 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		*object_p = NULL;
-#line 9108 "Dialogs.c"
+#line 9236 "Dialogs.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 921 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		*object_p = value->data[0].v_pointer;
-#line 9112 "Dialogs.c"
+#line 9240 "Dialogs.c"
 	} else {
-#line 921 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		*object_p = text_entry_dialog_mediator_ref (value->data[0].v_pointer);
-#line 9116 "Dialogs.c"
+#line 9244 "Dialogs.c"
 	}
-#line 921 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return NULL;
-#line 9120 "Dialogs.c"
+#line 9248 "Dialogs.c"
 }
 
 
 GParamSpec* param_spec_text_entry_dialog_mediator (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
 	ParamSpecTextEntryDialogMediator* spec;
-#line 921 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, TYPE_TEXT_ENTRY_DIALOG_MEDIATOR), NULL);
-#line 921 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 921 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 921 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return G_PARAM_SPEC (spec);
-#line 9134 "Dialogs.c"
+#line 9262 "Dialogs.c"
 }
 
 
 gpointer value_get_text_entry_dialog_mediator (const GValue* value) {
-#line 921 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_TEXT_ENTRY_DIALOG_MEDIATOR), NULL);
-#line 921 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return value->data[0].v_pointer;
-#line 9143 "Dialogs.c"
+#line 9271 "Dialogs.c"
 }
 
 
 void value_set_text_entry_dialog_mediator (GValue* value, gpointer v_object) {
 	TextEntryDialogMediator* old;
-#line 921 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_TEXT_ENTRY_DIALOG_MEDIATOR));
-#line 921 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	old = value->data[0].v_pointer;
-#line 921 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (v_object) {
-#line 921 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_TEXT_ENTRY_DIALOG_MEDIATOR));
-#line 921 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 921 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		value->data[0].v_pointer = v_object;
-#line 921 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		text_entry_dialog_mediator_ref (value->data[0].v_pointer);
-#line 9163 "Dialogs.c"
+#line 9291 "Dialogs.c"
 	} else {
-#line 921 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		value->data[0].v_pointer = NULL;
-#line 9167 "Dialogs.c"
+#line 9295 "Dialogs.c"
 	}
-#line 921 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (old) {
-#line 921 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		text_entry_dialog_mediator_unref (old);
-#line 9173 "Dialogs.c"
+#line 9301 "Dialogs.c"
 	}
 }
 
 
 void value_take_text_entry_dialog_mediator (GValue* value, gpointer v_object) {
 	TextEntryDialogMediator* old;
-#line 921 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_TEXT_ENTRY_DIALOG_MEDIATOR));
-#line 921 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	old = value->data[0].v_pointer;
-#line 921 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (v_object) {
-#line 921 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_TEXT_ENTRY_DIALOG_MEDIATOR));
-#line 921 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 921 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		value->data[0].v_pointer = v_object;
-#line 9192 "Dialogs.c"
+#line 9320 "Dialogs.c"
 	} else {
-#line 921 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		value->data[0].v_pointer = NULL;
-#line 9196 "Dialogs.c"
+#line 9324 "Dialogs.c"
 	}
-#line 921 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (old) {
-#line 921 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		text_entry_dialog_mediator_unref (old);
-#line 9202 "Dialogs.c"
+#line 9330 "Dialogs.c"
 	}
 }
 
 
 static void text_entry_dialog_mediator_class_init (TextEntryDialogMediatorClass * klass) {
-#line 921 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	text_entry_dialog_mediator_parent_class = g_type_class_peek_parent (klass);
-#line 921 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	((TextEntryDialogMediatorClass *) klass)->finalize = text_entry_dialog_mediator_finalize;
-#line 921 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_type_class_add_private (klass, sizeof (TextEntryDialogMediatorPrivate));
-#line 921 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	((TextEntryDialogMediatorClass *) klass)->on_modify_validate = text_entry_dialog_mediator_real_on_modify_validate;
-#line 9216 "Dialogs.c"
+#line 9344 "Dialogs.c"
 }
 
 
 static void text_entry_dialog_mediator_instance_init (TextEntryDialogMediator * self) {
-#line 921 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv = TEXT_ENTRY_DIALOG_MEDIATOR_GET_PRIVATE (self);
-#line 921 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->ref_count = 1;
-#line 9225 "Dialogs.c"
+#line 9353 "Dialogs.c"
 }
 
 
 static void text_entry_dialog_mediator_finalize (TextEntryDialogMediator* obj) {
 	TextEntryDialogMediator * self;
-#line 921 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_TEXT_ENTRY_DIALOG_MEDIATOR, TextEntryDialogMediator);
-#line 921 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_signal_handlers_destroy (self);
-#line 922 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 938 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->dialog);
-#line 9237 "Dialogs.c"
+#line 9365 "Dialogs.c"
 }
 
 
@@ -9269,24 +9397,24 @@ GType text_entry_dialog_mediator_get_type (void) {
 gpointer text_entry_dialog_mediator_ref (gpointer instance) {
 	TextEntryDialogMediator* self;
 	self = instance;
-#line 921 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_atomic_int_inc (&self->ref_count);
-#line 921 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return instance;
-#line 9262 "Dialogs.c"
+#line 9390 "Dialogs.c"
 }
 
 
 void text_entry_dialog_mediator_unref (gpointer instance) {
 	TextEntryDialogMediator* self;
 	self = instance;
-#line 921 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 921 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		TEXT_ENTRY_DIALOG_MEDIATOR_GET_CLASS (self)->finalize (self);
-#line 921 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 937 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 9275 "Dialogs.c"
+#line 9403 "Dialogs.c"
 	}
 }
 
@@ -9294,9 +9422,9 @@ void text_entry_dialog_mediator_unref (gpointer instance) {
 static gboolean _multi_text_entry_dialog_mediator_on_modify_validate_multi_text_entry_dialog_on_modify_validate_type (const gchar* text, gpointer self) {
 	gboolean result;
 	result = multi_text_entry_dialog_mediator_on_modify_validate ((MultiTextEntryDialogMediator*) self, text);
-#line 950 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 966 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 9285 "Dialogs.c"
+#line 9413 "Dialogs.c"
 }
 
 
@@ -9313,72 +9441,72 @@ MultiTextEntryDialogMediator* multi_text_entry_dialog_mediator_construct (GType
 	const gchar* _tmp7_ = NULL;
 	const gchar* _tmp8_ = NULL;
 	const gchar* _tmp9_ = NULL;
-#line 945 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 961 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (title != NULL, NULL);
-#line 945 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 961 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (label != NULL, NULL);
-#line 945 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 961 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self = (MultiTextEntryDialogMediator*) g_type_create_instance (object_type);
-#line 946 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 962 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = app_window_create_builder ("shotwell.ui", NULL);
-#line 946 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 962 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	builder = _tmp0_;
-#line 947 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 963 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = multi_text_entry_dialog_new ();
-#line 947 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 963 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_object_ref_sink (_tmp1_);
-#line 947 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 963 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->dialog);
-#line 947 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 963 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->dialog = _tmp1_;
-#line 948 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 964 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = self->priv->dialog;
-#line 948 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 964 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = (GtkBox*) gtk_dialog_get_content_area (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_dialog_get_type (), GtkDialog));
-#line 948 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 964 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp4_ = gtk_builder_get_object (builder, "dialog-vbox4");
-#line 948 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 964 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_box_get_type (), GtkBox), gtk_widget_get_type (), GtkWidget));
-#line 949 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 965 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp5_ = self->priv->dialog;
-#line 949 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 965 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	multi_text_entry_dialog_set_builder (_tmp5_, builder);
-#line 950 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 966 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp6_ = self->priv->dialog;
-#line 950 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 966 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp7_ = title;
-#line 950 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 966 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp8_ = label;
-#line 950 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 966 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp9_ = initial_text;
-#line 950 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 966 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	multi_text_entry_dialog_setup (_tmp6_, _multi_text_entry_dialog_mediator_on_modify_validate_multi_text_entry_dialog_on_modify_validate_type, self, _tmp7_, _tmp8_, _tmp9_);
-#line 945 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 961 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (builder);
-#line 945 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 961 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return self;
-#line 9346 "Dialogs.c"
+#line 9474 "Dialogs.c"
 }
 
 
 static gboolean multi_text_entry_dialog_mediator_real_on_modify_validate (MultiTextEntryDialogMediator* self, const gchar* text) {
 	gboolean result = FALSE;
-#line 953 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 969 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (text != NULL, FALSE);
-#line 954 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 970 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	result = TRUE;
-#line 954 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 970 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 9358 "Dialogs.c"
+#line 9486 "Dialogs.c"
 }
 
 
 gboolean multi_text_entry_dialog_mediator_on_modify_validate (MultiTextEntryDialogMediator* self, const gchar* text) {
-#line 953 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 969 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (IS_MULTI_TEXT_ENTRY_DIALOG_MEDIATOR (self), FALSE);
-#line 953 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 969 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return MULTI_TEXT_ENTRY_DIALOG_MEDIATOR_GET_CLASS (self)->on_modify_validate (self, text);
-#line 9367 "Dialogs.c"
+#line 9495 "Dialogs.c"
 }
 
 
@@ -9386,231 +9514,231 @@ gchar* _multi_text_entry_dialog_mediator_execute (MultiTextEntryDialogMediator*
 	gchar* result = NULL;
 	MultiTextEntryDialog* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
-#line 957 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 973 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (IS_MULTI_TEXT_ENTRY_DIALOG_MEDIATOR (self), NULL);
-#line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 974 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = self->priv->dialog;
-#line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 974 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = multi_text_entry_dialog_execute (_tmp0_);
-#line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 974 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	result = _tmp1_;
-#line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 974 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 9385 "Dialogs.c"
+#line 9513 "Dialogs.c"
 }
 
 
 static void value_multi_text_entry_dialog_mediator_init (GValue* value) {
-#line 942 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	value->data[0].v_pointer = NULL;
-#line 9392 "Dialogs.c"
+#line 9520 "Dialogs.c"
 }
 
 
 static void value_multi_text_entry_dialog_mediator_free_value (GValue* value) {
-#line 942 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (value->data[0].v_pointer) {
-#line 942 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		multi_text_entry_dialog_mediator_unref (value->data[0].v_pointer);
-#line 9401 "Dialogs.c"
+#line 9529 "Dialogs.c"
 	}
 }
 
 
 static void value_multi_text_entry_dialog_mediator_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 942 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (src_value->data[0].v_pointer) {
-#line 942 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		dest_value->data[0].v_pointer = multi_text_entry_dialog_mediator_ref (src_value->data[0].v_pointer);
-#line 9411 "Dialogs.c"
+#line 9539 "Dialogs.c"
 	} else {
-#line 942 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 9415 "Dialogs.c"
+#line 9543 "Dialogs.c"
 	}
 }
 
 
 static gpointer value_multi_text_entry_dialog_mediator_peek_pointer (const GValue* value) {
-#line 942 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return value->data[0].v_pointer;
-#line 9423 "Dialogs.c"
+#line 9551 "Dialogs.c"
 }
 
 
 static gchar* value_multi_text_entry_dialog_mediator_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 942 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (collect_values[0].v_pointer) {
-#line 9430 "Dialogs.c"
+#line 9558 "Dialogs.c"
 		MultiTextEntryDialogMediator* object;
 		object = collect_values[0].v_pointer;
-#line 942 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (object->parent_instance.g_class == NULL) {
-#line 942 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 9437 "Dialogs.c"
+#line 9565 "Dialogs.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 942 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 9441 "Dialogs.c"
+#line 9569 "Dialogs.c"
 		}
-#line 942 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		value->data[0].v_pointer = multi_text_entry_dialog_mediator_ref (object);
-#line 9445 "Dialogs.c"
+#line 9573 "Dialogs.c"
 	} else {
-#line 942 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		value->data[0].v_pointer = NULL;
-#line 9449 "Dialogs.c"
+#line 9577 "Dialogs.c"
 	}
-#line 942 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return NULL;
-#line 9453 "Dialogs.c"
+#line 9581 "Dialogs.c"
 }
 
 
 static gchar* value_multi_text_entry_dialog_mediator_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 	MultiTextEntryDialogMediator** object_p;
 	object_p = collect_values[0].v_pointer;
-#line 942 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (!object_p) {
-#line 942 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 9464 "Dialogs.c"
+#line 9592 "Dialogs.c"
 	}
-#line 942 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (!value->data[0].v_pointer) {
-#line 942 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		*object_p = NULL;
-#line 9470 "Dialogs.c"
+#line 9598 "Dialogs.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 942 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		*object_p = value->data[0].v_pointer;
-#line 9474 "Dialogs.c"
+#line 9602 "Dialogs.c"
 	} else {
-#line 942 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		*object_p = multi_text_entry_dialog_mediator_ref (value->data[0].v_pointer);
-#line 9478 "Dialogs.c"
+#line 9606 "Dialogs.c"
 	}
-#line 942 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return NULL;
-#line 9482 "Dialogs.c"
+#line 9610 "Dialogs.c"
 }
 
 
 GParamSpec* param_spec_multi_text_entry_dialog_mediator (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
 	ParamSpecMultiTextEntryDialogMediator* spec;
-#line 942 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, TYPE_MULTI_TEXT_ENTRY_DIALOG_MEDIATOR), NULL);
-#line 942 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 942 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 942 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return G_PARAM_SPEC (spec);
-#line 9496 "Dialogs.c"
+#line 9624 "Dialogs.c"
 }
 
 
 gpointer value_get_multi_text_entry_dialog_mediator (const GValue* value) {
-#line 942 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_MULTI_TEXT_ENTRY_DIALOG_MEDIATOR), NULL);
-#line 942 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return value->data[0].v_pointer;
-#line 9505 "Dialogs.c"
+#line 9633 "Dialogs.c"
 }
 
 
 void value_set_multi_text_entry_dialog_mediator (GValue* value, gpointer v_object) {
 	MultiTextEntryDialogMediator* old;
-#line 942 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_MULTI_TEXT_ENTRY_DIALOG_MEDIATOR));
-#line 942 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	old = value->data[0].v_pointer;
-#line 942 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (v_object) {
-#line 942 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_MULTI_TEXT_ENTRY_DIALOG_MEDIATOR));
-#line 942 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 942 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		value->data[0].v_pointer = v_object;
-#line 942 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		multi_text_entry_dialog_mediator_ref (value->data[0].v_pointer);
-#line 9525 "Dialogs.c"
+#line 9653 "Dialogs.c"
 	} else {
-#line 942 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		value->data[0].v_pointer = NULL;
-#line 9529 "Dialogs.c"
+#line 9657 "Dialogs.c"
 	}
-#line 942 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (old) {
-#line 942 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		multi_text_entry_dialog_mediator_unref (old);
-#line 9535 "Dialogs.c"
+#line 9663 "Dialogs.c"
 	}
 }
 
 
 void value_take_multi_text_entry_dialog_mediator (GValue* value, gpointer v_object) {
 	MultiTextEntryDialogMediator* old;
-#line 942 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_MULTI_TEXT_ENTRY_DIALOG_MEDIATOR));
-#line 942 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	old = value->data[0].v_pointer;
-#line 942 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (v_object) {
-#line 942 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_MULTI_TEXT_ENTRY_DIALOG_MEDIATOR));
-#line 942 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 942 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		value->data[0].v_pointer = v_object;
-#line 9554 "Dialogs.c"
+#line 9682 "Dialogs.c"
 	} else {
-#line 942 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		value->data[0].v_pointer = NULL;
-#line 9558 "Dialogs.c"
+#line 9686 "Dialogs.c"
 	}
-#line 942 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (old) {
-#line 942 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		multi_text_entry_dialog_mediator_unref (old);
-#line 9564 "Dialogs.c"
+#line 9692 "Dialogs.c"
 	}
 }
 
 
 static void multi_text_entry_dialog_mediator_class_init (MultiTextEntryDialogMediatorClass * klass) {
-#line 942 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	multi_text_entry_dialog_mediator_parent_class = g_type_class_peek_parent (klass);
-#line 942 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	((MultiTextEntryDialogMediatorClass *) klass)->finalize = multi_text_entry_dialog_mediator_finalize;
-#line 942 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_type_class_add_private (klass, sizeof (MultiTextEntryDialogMediatorPrivate));
-#line 942 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	((MultiTextEntryDialogMediatorClass *) klass)->on_modify_validate = multi_text_entry_dialog_mediator_real_on_modify_validate;
-#line 9578 "Dialogs.c"
+#line 9706 "Dialogs.c"
 }
 
 
 static void multi_text_entry_dialog_mediator_instance_init (MultiTextEntryDialogMediator * self) {
-#line 942 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv = MULTI_TEXT_ENTRY_DIALOG_MEDIATOR_GET_PRIVATE (self);
-#line 942 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->ref_count = 1;
-#line 9587 "Dialogs.c"
+#line 9715 "Dialogs.c"
 }
 
 
 static void multi_text_entry_dialog_mediator_finalize (MultiTextEntryDialogMediator* obj) {
 	MultiTextEntryDialogMediator * self;
-#line 942 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_MULTI_TEXT_ENTRY_DIALOG_MEDIATOR, MultiTextEntryDialogMediator);
-#line 942 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_signal_handlers_destroy (self);
-#line 943 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 959 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->dialog);
-#line 9599 "Dialogs.c"
+#line 9727 "Dialogs.c"
 }
 
 
@@ -9631,24 +9759,24 @@ GType multi_text_entry_dialog_mediator_get_type (void) {
 gpointer multi_text_entry_dialog_mediator_ref (gpointer instance) {
 	MultiTextEntryDialogMediator* self;
 	self = instance;
-#line 942 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_atomic_int_inc (&self->ref_count);
-#line 942 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return instance;
-#line 9624 "Dialogs.c"
+#line 9752 "Dialogs.c"
 }
 
 
 void multi_text_entry_dialog_mediator_unref (gpointer instance) {
 	MultiTextEntryDialogMediator* self;
 	self = instance;
-#line 942 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 942 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		MULTI_TEXT_ENTRY_DIALOG_MEDIATOR_GET_CLASS (self)->finalize (self);
-#line 942 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 958 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 9637 "Dialogs.c"
+#line 9765 "Dialogs.c"
 	}
 }
 
@@ -9662,11 +9790,11 @@ gchar* build_alert_body_text (const gchar* primary_text, const gchar* secondary_
 	const gchar* _tmp12_ = NULL;
 	gchar* _tmp13_ = NULL;
 	gchar* _tmp14_ = NULL;
-#line 967 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 983 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = should_escape;
-#line 967 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 983 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp0_) {
-#line 9655 "Dialogs.c"
+#line 9783 "Dialogs.c"
 		const gchar* _tmp1_ = NULL;
 		gchar* _tmp2_ = NULL;
 		gchar* _tmp3_ = NULL;
@@ -9675,60 +9803,60 @@ gchar* build_alert_body_text (const gchar* primary_text, const gchar* secondary_
 		gchar* _tmp6_ = NULL;
 		gchar* _tmp7_ = NULL;
 		gchar* _tmp8_ = NULL;
-#line 968 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 984 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp1_ = primary_text;
-#line 968 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 984 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp2_ = guarded_markup_escape_text (_tmp1_);
-#line 968 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 984 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp3_ = _tmp2_;
-#line 968 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 984 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp4_ = secondary_text;
-#line 968 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 984 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp5_ = guarded_markup_escape_text (_tmp4_);
-#line 968 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 984 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp6_ = _tmp5_;
-#line 968 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 984 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp7_ = g_strdup_printf ("<span weight=\"Bold\" size=\"larger\">%s</span>\n%s", _tmp3_, _tmp6_);
-#line 968 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 984 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp8_ = _tmp7_;
-#line 968 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 984 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (_tmp6_);
-#line 968 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 984 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (_tmp3_);
-#line 968 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 984 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		result = _tmp8_;
-#line 968 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 984 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		return result;
-#line 9688 "Dialogs.c"
+#line 9816 "Dialogs.c"
 	}
-#line 972 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 988 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp9_ = primary_text;
-#line 972 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 988 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp10_ = guarded_markup_escape_text (_tmp9_);
-#line 972 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 988 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp11_ = _tmp10_;
-#line 972 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 988 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp12_ = secondary_text;
-#line 972 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 988 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp13_ = g_strdup_printf ("<span weight=\"Bold\" size=\"larger\">%s</span>\n%s", _tmp11_, _tmp12_);
-#line 972 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 988 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp14_ = _tmp13_;
-#line 972 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 988 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (_tmp11_);
-#line 972 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 988 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	result = _tmp14_;
-#line 972 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 988 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 9708 "Dialogs.c"
+#line 9836 "Dialogs.c"
 }
 
 
 static gboolean _entry_multi_completion_match_func_gtk_entry_completion_match_func (GtkEntryCompletion* completion, const gchar* key, GtkTreeIter* iter, gpointer self) {
 	gboolean result;
 	result = entry_multi_completion_match_func ((EntryMultiCompletion*) self, completion, key, iter);
-#line 987 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1003 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 9717 "Dialogs.c"
+#line 9845 "Dialogs.c"
 }
 
 
@@ -9741,65 +9869,65 @@ EntryMultiCompletion* entry_multi_completion_construct (GType object_type, GeeCo
 	GeeCollection* _tmp7_ = NULL;
 	GtkListStore* _tmp8_ = NULL;
 	GtkListStore* _tmp9_ = NULL;
-#line 981 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 997 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (GEE_IS_COLLECTION (completion_list), NULL);
-#line 981 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 997 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self = (EntryMultiCompletion*) g_object_new (object_type, NULL);
-#line 982 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 998 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = delimiter;
-#line 982 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 998 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp1_ == NULL) {
-#line 982 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 998 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp0_ = TRUE;
-#line 9740 "Dialogs.c"
+#line 9868 "Dialogs.c"
 	} else {
 		const gchar* _tmp2_ = NULL;
 		gint _tmp3_ = 0;
 		gint _tmp4_ = 0;
-#line 982 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 998 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp2_ = delimiter;
-#line 982 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 998 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp3_ = strlen (_tmp2_);
-#line 982 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 998 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp4_ = _tmp3_;
-#line 982 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 998 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp0_ = _tmp4_ == 1;
-#line 9753 "Dialogs.c"
+#line 9881 "Dialogs.c"
 	}
-#line 982 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 998 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_vala_assert (_tmp0_, "delimiter == null || delimiter.length == 1");
-#line 983 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 999 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp5_ = delimiter;
-#line 983 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 999 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp6_ = g_strdup (_tmp5_);
-#line 983 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 999 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (self->priv->delimiter);
-#line 983 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 999 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->delimiter = _tmp6_;
-#line 985 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1001 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp7_ = completion_list;
-#line 985 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1001 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp8_ = entry_multi_completion_create_completion_store (_tmp7_);
-#line 985 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1001 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp9_ = _tmp8_;
-#line 985 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1001 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_entry_completion_set_model (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_entry_completion_get_type (), GtkEntryCompletion), G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GTK_TYPE_TREE_MODEL, GtkTreeModel));
-#line 985 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1001 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (_tmp9_);
-#line 986 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1002 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_entry_completion_set_text_column (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_entry_completion_get_type (), GtkEntryCompletion), 0);
-#line 987 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1003 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_entry_completion_set_match_func (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_entry_completion_get_type (), GtkEntryCompletion), _entry_multi_completion_match_func_gtk_entry_completion_match_func, g_object_ref (self), g_object_unref);
-#line 981 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 997 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return self;
-#line 9781 "Dialogs.c"
+#line 9909 "Dialogs.c"
 }
 
 
 EntryMultiCompletion* entry_multi_completion_new (GeeCollection* completion_list, const gchar* delimiter) {
-#line 981 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 997 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return entry_multi_completion_construct (TYPE_ENTRY_MULTI_COMPLETION, completion_list, delimiter);
-#line 9788 "Dialogs.c"
+#line 9916 "Dialogs.c"
 }
 
 
@@ -9811,21 +9939,21 @@ static GtkListStore* entry_multi_completion_create_completion_store (GeeCollecti
 	GeeIterator* completion_iter = NULL;
 	GeeCollection* _tmp1_ = NULL;
 	GeeIterator* _tmp2_ = NULL;
-#line 990 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1006 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (GEE_IS_COLLECTION (completion_list), NULL);
-#line 991 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1007 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = gtk_list_store_new (1, G_TYPE_STRING, -1);
-#line 991 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1007 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	completion_store = _tmp0_;
-#line 993 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1009 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = completion_list;
-#line 993 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1009 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 993 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1009 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	completion_iter = _tmp2_;
-#line 994 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1010 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	while (TRUE) {
-#line 9814 "Dialogs.c"
+#line 9942 "Dialogs.c"
 		GeeIterator* _tmp3_ = NULL;
 		gboolean _tmp4_ = FALSE;
 		GtkListStore* _tmp5_ = NULL;
@@ -9835,45 +9963,45 @@ static GtkListStore* entry_multi_completion_create_completion_store (GeeCollecti
 		GeeIterator* _tmp9_ = NULL;
 		gpointer _tmp10_ = NULL;
 		gchar* _tmp11_ = NULL;
-#line 994 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1010 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp3_ = completion_iter;
-#line 994 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1010 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp4_ = gee_iterator_next (_tmp3_);
-#line 994 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1010 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (!_tmp4_) {
-#line 994 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1010 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			break;
-#line 9832 "Dialogs.c"
+#line 9960 "Dialogs.c"
 		}
-#line 995 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1011 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp5_ = completion_store;
-#line 995 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1011 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_list_store_append (_tmp5_, &_tmp6_);
-#line 995 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1011 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		store_iter = _tmp6_;
-#line 996 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1012 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp7_ = completion_store;
-#line 996 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1012 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp8_ = store_iter;
-#line 996 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1012 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp9_ = completion_iter;
-#line 996 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1012 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp10_ = gee_iterator_get (_tmp9_);
-#line 996 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1012 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp11_ = (gchar*) _tmp10_;
-#line 996 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1012 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_list_store_set (_tmp7_, &_tmp8_, 0, _tmp11_, -1, -1);
-#line 996 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1012 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (_tmp11_);
-#line 9854 "Dialogs.c"
+#line 9982 "Dialogs.c"
 	}
-#line 999 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1015 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	result = completion_store;
-#line 999 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1015 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (completion_iter);
-#line 999 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1015 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 9862 "Dialogs.c"
+#line 9990 "Dialogs.c"
 }
 
 
@@ -9896,7 +10024,7 @@ static gchar* string_strip (const gchar* self) {
 	result = _result_;
 #line 1210 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
-#line 9885 "Dialogs.c"
+#line 10013 "Dialogs.c"
 }
 
 
@@ -9916,7 +10044,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 9905 "Dialogs.c"
+#line 10033 "Dialogs.c"
 }
 
 
@@ -9941,7 +10069,7 @@ static gint string_last_index_of_char (const gchar* self, gunichar c, gint start
 	_tmp3_ = _result_;
 #line 1020 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp3_ != NULL) {
-#line 9930 "Dialogs.c"
+#line 10058 "Dialogs.c"
 		gchar* _tmp4_ = NULL;
 #line 1021 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp4_ = _result_;
@@ -9949,13 +10077,13 @@ static gint string_last_index_of_char (const gchar* self, gunichar c, gint start
 		result = (gint) (_tmp4_ - ((gchar*) self));
 #line 1021 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return result;
-#line 9938 "Dialogs.c"
+#line 10066 "Dialogs.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 9944 "Dialogs.c"
+#line 10072 "Dialogs.c"
 	}
 }
 
@@ -9977,84 +10105,84 @@ static gboolean entry_multi_completion_match_func (EntryMultiCompletion* self, G
 	const gchar* _tmp9_ = NULL;
 	gchar* _tmp10_ = NULL;
 	const gchar* _tmp11_ = NULL;
-#line 1002 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1018 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (IS_ENTRY_MULTI_COMPLETION (self), FALSE);
-#line 1002 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1018 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (GTK_IS_ENTRY_COMPLETION (completion), FALSE);
-#line 1002 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1018 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (key != NULL, FALSE);
-#line 1002 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1018 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (iter != NULL, FALSE);
-#line 1003 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1019 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = completion;
-#line 1003 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1019 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = gtk_entry_completion_get_model (_tmp0_);
-#line 1003 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1019 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = _g_object_ref0 (_tmp1_);
-#line 1003 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1019 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	model = _tmp2_;
-#line 1005 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1021 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = model;
-#line 1005 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1021 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp4_ = *iter;
-#line 1005 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1021 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_tree_model_get (_tmp3_, &_tmp4_, 0, &possible_match, -1);
-#line 1011 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1027 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp5_ = possible_match;
-#line 1011 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1027 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp6_ = g_utf8_casefold (_tmp5_, (gssize) -1);
-#line 1011 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1027 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp7_ = _tmp6_;
-#line 1011 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1027 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp8_ = g_utf8_normalize (_tmp7_, (gssize) -1, G_NORMALIZE_ALL_COMPOSE);
-#line 1011 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1027 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (possible_match);
-#line 1011 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1027 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	possible_match = _tmp8_;
-#line 1011 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1027 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (_tmp7_);
-#line 1012 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1028 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp9_ = key;
-#line 1012 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1028 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp10_ = g_utf8_normalize (_tmp9_, (gssize) -1, G_NORMALIZE_ALL_COMPOSE);
-#line 1012 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1028 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	normed_key = _tmp10_;
-#line 1014 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1030 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp11_ = self->priv->delimiter;
-#line 1014 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1030 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp11_ == NULL) {
-#line 10012 "Dialogs.c"
+#line 10140 "Dialogs.c"
 		const gchar* _tmp12_ = NULL;
 		const gchar* _tmp13_ = NULL;
 		gchar* _tmp14_ = NULL;
 		gchar* _tmp15_ = NULL;
 		gboolean _tmp16_ = FALSE;
 		gboolean _tmp17_ = FALSE;
-#line 1015 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1031 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp12_ = possible_match;
-#line 1015 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1031 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp13_ = normed_key;
-#line 1015 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1031 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp14_ = string_strip (_tmp13_);
-#line 1015 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1031 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp15_ = _tmp14_;
-#line 1015 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1031 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp16_ = g_str_has_prefix (_tmp12_, _tmp15_);
-#line 1015 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1031 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp17_ = _tmp16_;
-#line 1015 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1031 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (_tmp15_);
-#line 1015 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1031 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		result = _tmp17_;
-#line 1015 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1031 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (normed_key);
-#line 1015 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1031 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (possible_match);
-#line 1015 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1031 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (model);
-#line 1015 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1031 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		return result;
-#line 10043 "Dialogs.c"
+#line 10171 "Dialogs.c"
 	} else {
 		const gchar* _tmp18_ = NULL;
 		const gchar* _tmp19_ = NULL;
@@ -10075,15 +10203,15 @@ static gboolean entry_multi_completion_match_func (EntryMultiCompletion* self, G
 		gchar* _tmp43_ = NULL;
 		gboolean _tmp44_ = FALSE;
 		gboolean _tmp45_ = FALSE;
-#line 1017 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1033 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp18_ = normed_key;
-#line 1017 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1033 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp19_ = self->priv->delimiter;
-#line 1017 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1033 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp20_ = string_contains (_tmp18_, _tmp19_);
-#line 1017 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1033 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (_tmp20_) {
-#line 10072 "Dialogs.c"
+#line 10200 "Dialogs.c"
 			gint offset = 0;
 			const gchar* _tmp21_ = NULL;
 			const gchar* _tmp22_ = NULL;
@@ -10096,118 +10224,118 @@ static gboolean entry_multi_completion_match_func (EntryMultiCompletion* self, G
 			gint _tmp28_ = 0;
 			gint _tmp29_ = 0;
 			gint _tmp30_ = 0;
-#line 1019 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1035 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp21_ = normed_key;
-#line 1019 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1035 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp22_ = normed_key;
-#line 1019 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1035 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp23_ = self->priv->delimiter;
-#line 1019 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1035 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp24_ = string_get (_tmp23_, (glong) 0);
-#line 1019 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1035 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp25_ = string_last_index_of_char (_tmp22_, (gunichar) _tmp24_, 0);
-#line 1019 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1035 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp26_ = g_utf8_strlen (_tmp21_, (gssize) _tmp25_);
-#line 1019 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1035 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			offset = _tmp26_;
-#line 1020 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1036 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp27_ = gtk_entry_completion_get_entry (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_entry_completion_get_type (), GtkEntryCompletion));
-#line 1020 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1036 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp28_ = gtk_editable_get_position (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, gtk_entry_get_type (), GtkEntry), GTK_TYPE_EDITABLE, GtkEditable));
-#line 1020 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1036 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			position = _tmp28_;
-#line 1021 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1037 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp29_ = position;
-#line 1021 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1037 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp30_ = offset;
-#line 1021 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1037 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			if (_tmp29_ <= _tmp30_) {
-#line 1022 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1038 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				result = FALSE;
-#line 1022 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1038 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_free0 (normed_key);
-#line 1022 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1038 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_free0 (possible_match);
-#line 1022 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1038 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_object_unref0 (model);
-#line 1022 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1038 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				return result;
-#line 10121 "Dialogs.c"
+#line 10249 "Dialogs.c"
 			}
 		}
-#line 1025 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1041 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp31_ = normed_key;
-#line 1025 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1041 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp32_ = string_strip (_tmp31_);
-#line 1025 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1041 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp33_ = _tmp32_;
-#line 1025 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1041 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp34_ = self->priv->delimiter;
-#line 1025 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1041 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp35_ = entry_multi_completion_get_last_part (_tmp33_, _tmp34_);
-#line 1025 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1041 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp36_ = _tmp35_;
-#line 1025 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1041 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (_tmp33_);
-#line 1025 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1041 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		last_part = _tmp36_;
-#line 1027 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1043 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp37_ = last_part;
-#line 1027 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1043 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp38_ = strlen (_tmp37_);
-#line 1027 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1043 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp39_ = _tmp38_;
-#line 1027 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1043 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (_tmp39_ == 0) {
-#line 1028 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1044 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			result = FALSE;
-#line 1028 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1044 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_free0 (last_part);
-#line 1028 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1044 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_free0 (normed_key);
-#line 1028 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1044 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_free0 (possible_match);
-#line 1028 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1044 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_object_unref0 (model);
-#line 1028 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1044 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			return result;
-#line 10160 "Dialogs.c"
+#line 10288 "Dialogs.c"
 		}
-#line 1030 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1046 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp40_ = possible_match;
-#line 1030 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1046 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp41_ = last_part;
-#line 1030 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1046 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp42_ = string_strip (_tmp41_);
-#line 1030 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1046 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp43_ = _tmp42_;
-#line 1030 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1046 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp44_ = g_str_has_prefix (_tmp40_, _tmp43_);
-#line 1030 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1046 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp45_ = _tmp44_;
-#line 1030 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1046 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (_tmp43_);
-#line 1030 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1046 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		result = _tmp45_;
-#line 1030 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1046 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (last_part);
-#line 1030 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1046 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (normed_key);
-#line 1030 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1046 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (possible_match);
-#line 1030 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1046 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (model);
-#line 1030 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1046 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		return result;
-#line 10188 "Dialogs.c"
+#line 10316 "Dialogs.c"
 	}
-#line 1002 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1018 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (normed_key);
-#line 1002 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1018 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (possible_match);
-#line 1002 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1018 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (model);
-#line 10196 "Dialogs.c"
+#line 10324 "Dialogs.c"
 }
 
 
@@ -10230,7 +10358,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 10219 "Dialogs.c"
+#line 10347 "Dialogs.c"
 		glong _tmp4_ = 0L;
 #line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp4_ = maxlen;
@@ -10238,7 +10366,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 10227 "Dialogs.c"
+#line 10355 "Dialogs.c"
 	} else {
 		gchar* _tmp5_ = NULL;
 		gchar* _tmp6_ = NULL;
@@ -10250,7 +10378,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 10239 "Dialogs.c"
+#line 10367 "Dialogs.c"
 	}
 }
 
@@ -10274,21 +10402,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 10263 "Dialogs.c"
+#line 10391 "Dialogs.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 10269 "Dialogs.c"
+#line 10397 "Dialogs.c"
 	} else {
 #line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp0_ = FALSE;
-#line 10273 "Dialogs.c"
+#line 10401 "Dialogs.c"
 	}
 #line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp0_) {
-#line 10277 "Dialogs.c"
+#line 10405 "Dialogs.c"
 		glong _tmp3_ = 0L;
 		glong _tmp4_ = 0L;
 		glong _tmp5_ = 0L;
@@ -10300,7 +10428,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 10289 "Dialogs.c"
+#line 10417 "Dialogs.c"
 	} else {
 		gint _tmp6_ = 0;
 		gint _tmp7_ = 0;
@@ -10310,13 +10438,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 10299 "Dialogs.c"
+#line 10427 "Dialogs.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 10305 "Dialogs.c"
+#line 10433 "Dialogs.c"
 		glong _tmp9_ = 0L;
 		glong _tmp10_ = 0L;
 		glong _tmp11_ = 0L;
@@ -10330,7 +10458,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 10319 "Dialogs.c"
+#line 10447 "Dialogs.c"
 	} else {
 		glong _tmp12_ = 0L;
 		glong _tmp13_ = 0L;
@@ -10340,13 +10468,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 10329 "Dialogs.c"
+#line 10457 "Dialogs.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 10335 "Dialogs.c"
+#line 10463 "Dialogs.c"
 		glong _tmp15_ = 0L;
 		glong _tmp16_ = 0L;
 #line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -10355,7 +10483,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 10344 "Dialogs.c"
+#line 10472 "Dialogs.c"
 	}
 #line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp17_ = offset;
@@ -10375,7 +10503,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 10364 "Dialogs.c"
+#line 10492 "Dialogs.c"
 }
 
 
@@ -10411,53 +10539,53 @@ static gboolean entry_multi_completion_real_match_selected (GtkEntryCompletion*
 	GtkEntry* _tmp36_ = NULL;
 	gint _tmp37_ = 0;
 	gint _tmp38_ = 0;
-#line 1034 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1050 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_ENTRY_MULTI_COMPLETION, EntryMultiCompletion);
-#line 1034 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1050 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (GTK_IS_TREE_MODEL (model), FALSE);
-#line 1034 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1050 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (iter != NULL, FALSE);
-#line 1036 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1052 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = model;
-#line 1036 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1052 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = *iter;
-#line 1036 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1052 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_tree_model_get (_tmp0_, &_tmp1_, 0, &match, -1);
-#line 1038 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1054 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = gtk_entry_completion_get_entry (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_entry_completion_get_type (), GtkEntryCompletion));
-#line 1038 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1054 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_entry_get_type (), GtkEntry));
-#line 1038 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1054 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	entry = _tmp3_;
-#line 1040 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1056 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp4_ = entry;
-#line 1040 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1056 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp5_ = gtk_entry_get_text (_tmp4_);
-#line 1040 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1056 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp6_ = g_utf8_normalize (_tmp5_, (gssize) -1, G_NORMALIZE_ALL_COMPOSE);
-#line 1040 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1056 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	old_text = _tmp6_;
-#line 1041 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1057 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp7_ = old_text;
-#line 1041 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1057 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp8_ = strlen (_tmp7_);
-#line 1041 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1057 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp9_ = _tmp8_;
-#line 1041 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1057 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp9_ > 0) {
-#line 10434 "Dialogs.c"
+#line 10562 "Dialogs.c"
 		const gchar* _tmp10_ = NULL;
 		const gchar* _tmp11_ = NULL;
 		gboolean _tmp12_ = FALSE;
-#line 1042 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1058 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp10_ = old_text;
-#line 1042 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1058 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp11_ = self->priv->delimiter;
-#line 1042 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1058 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp12_ = string_contains (_tmp10_, _tmp11_);
-#line 1042 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1058 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (_tmp12_) {
-#line 10446 "Dialogs.c"
+#line 10574 "Dialogs.c"
 			const gchar* _tmp13_ = NULL;
 			const gchar* _tmp14_ = NULL;
 			const gchar* _tmp15_ = NULL;
@@ -10468,113 +10596,113 @@ static gboolean entry_multi_completion_real_match_selected (GtkEntryCompletion*
 			gchar* _tmp20_ = NULL;
 			gchar* _tmp21_ = NULL;
 			gchar* _tmp22_ = NULL;
-#line 1043 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1059 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp14_ = self->priv->delimiter;
-#line 1043 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1059 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			if (g_strcmp0 (_tmp14_, " ") != 0) {
-#line 1043 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1059 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp13_ = " ";
-#line 10463 "Dialogs.c"
+#line 10591 "Dialogs.c"
 			} else {
-#line 1043 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1059 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp13_ = "";
-#line 10467 "Dialogs.c"
+#line 10595 "Dialogs.c"
 			}
-#line 1043 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1059 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp15_ = old_text;
-#line 1043 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1059 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp16_ = old_text;
-#line 1043 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1059 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp17_ = self->priv->delimiter;
-#line 1043 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1059 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp18_ = string_get (_tmp17_, (glong) 0);
-#line 1043 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1059 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp19_ = string_last_index_of_char (_tmp16_, (gunichar) _tmp18_, 0);
-#line 1043 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1059 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp20_ = string_substring (_tmp15_, (glong) 0, (glong) (_tmp19_ + 1));
-#line 1043 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1059 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp21_ = _tmp20_;
-#line 1043 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1059 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp22_ = g_strconcat (_tmp21_, _tmp13_, NULL);
-#line 1043 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1059 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_free0 (old_text);
-#line 1043 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1059 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			old_text = _tmp22_;
-#line 1043 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1059 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_free0 (_tmp21_);
-#line 10491 "Dialogs.c"
+#line 10619 "Dialogs.c"
 		} else {
 			gchar* _tmp23_ = NULL;
-#line 1045 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1061 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp23_ = g_strdup ("");
-#line 1045 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1061 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_free0 (old_text);
-#line 1045 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1061 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			old_text = _tmp23_;
-#line 10500 "Dialogs.c"
+#line 10628 "Dialogs.c"
 		}
 	}
-#line 1048 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1064 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp25_ = self->priv->delimiter;
-#line 1048 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1064 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (g_strcmp0 (_tmp25_, " ") != 0) {
-#line 1048 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1064 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp24_ = " ";
-#line 10509 "Dialogs.c"
+#line 10637 "Dialogs.c"
 	} else {
-#line 1048 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1064 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp24_ = "";
-#line 10513 "Dialogs.c"
+#line 10641 "Dialogs.c"
 	}
-#line 1048 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1064 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp26_ = old_text;
-#line 1048 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1064 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp27_ = match;
-#line 1048 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1064 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp28_ = g_strconcat (_tmp26_, _tmp27_, NULL);
-#line 1048 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1064 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp29_ = _tmp28_;
-#line 1048 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1064 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp30_ = self->priv->delimiter;
-#line 1048 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1064 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp31_ = g_strconcat (_tmp29_, _tmp30_, NULL);
-#line 1048 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1064 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp32_ = _tmp31_;
-#line 1048 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1064 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp33_ = g_strconcat (_tmp32_, _tmp24_, NULL);
-#line 1048 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1064 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp34_ = _tmp33_;
-#line 1048 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1064 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (_tmp32_);
-#line 1048 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1064 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (_tmp29_);
-#line 1048 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1064 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	new_text = _tmp34_;
-#line 1049 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1065 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp35_ = entry;
-#line 1049 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1065 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_entry_set_text (_tmp35_, new_text);
-#line 1050 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1066 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp36_ = entry;
-#line 1050 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1066 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp37_ = strlen (new_text);
-#line 1050 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1066 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp38_ = _tmp37_;
-#line 1050 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1066 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_editable_set_position (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, GTK_TYPE_EDITABLE, GtkEditable), (gint) _tmp38_);
-#line 1052 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1068 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	result = TRUE;
-#line 1052 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1068 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (new_text);
-#line 1052 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1068 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (old_text);
-#line 1052 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1068 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (entry);
-#line 1052 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1068 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (match);
-#line 1052 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1068 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 10563 "Dialogs.c"
+#line 10691 "Dialogs.c"
 }
 
 
@@ -10590,121 +10718,121 @@ static gchar* entry_multi_completion_get_last_part (const gchar* s, const gchar*
 	gboolean _tmp4_ = FALSE;
 	gchar** _tmp5_ = NULL;
 	gint _tmp5__length1 = 0;
-#line 1056 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1072 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (s != NULL, NULL);
-#line 1056 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1072 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (delimiter != NULL, NULL);
-#line 1057 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1073 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = s;
-#line 1057 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1073 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = delimiter;
-#line 1057 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1073 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = _tmp2_ = g_strsplit (_tmp0_, _tmp1_, 0);
-#line 1057 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1073 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	split = _tmp3_;
-#line 1057 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1073 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	split_length1 = _vala_array_length (_tmp2_);
-#line 1057 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1073 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_split_size_ = split_length1;
-#line 1059 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1075 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp5_ = split;
-#line 1059 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1075 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp5__length1 = split_length1;
-#line 1059 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1075 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp5_ != NULL) {
-#line 10601 "Dialogs.c"
+#line 10729 "Dialogs.c"
 		gchar** _tmp6_ = NULL;
 		gint _tmp6__length1 = 0;
 		const gchar* _tmp7_ = NULL;
-#line 1059 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1075 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp6_ = split;
-#line 1059 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1075 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp6__length1 = split_length1;
-#line 1059 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1075 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp7_ = _tmp6_[0];
-#line 1059 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1075 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp4_ = _tmp7_ != NULL;
-#line 10613 "Dialogs.c"
+#line 10741 "Dialogs.c"
 	} else {
-#line 1059 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1075 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp4_ = FALSE;
-#line 10617 "Dialogs.c"
+#line 10745 "Dialogs.c"
 	}
-#line 1059 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1075 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp4_) {
-#line 10621 "Dialogs.c"
+#line 10749 "Dialogs.c"
 		gchar** _tmp8_ = NULL;
 		gint _tmp8__length1 = 0;
 		gchar** _tmp9_ = NULL;
 		gint _tmp9__length1 = 0;
 		const gchar* _tmp10_ = NULL;
 		gchar* _tmp11_ = NULL;
-#line 1060 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1076 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp8_ = split;
-#line 1060 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1076 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp8__length1 = split_length1;
-#line 1060 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1076 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp9_ = split;
-#line 1060 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1076 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp9__length1 = split_length1;
-#line 1060 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1076 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp10_ = _tmp8_[_tmp9__length1 - 1];
-#line 1060 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1076 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp11_ = g_strdup (_tmp10_);
-#line 1060 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1076 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		result = _tmp11_;
-#line 1060 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1076 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		split = (_vala_array_free (split, split_length1, (GDestroyNotify) g_free), NULL);
-#line 1060 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1076 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		return result;
-#line 10646 "Dialogs.c"
+#line 10774 "Dialogs.c"
 	} else {
 		gchar* _tmp12_ = NULL;
-#line 1062 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1078 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp12_ = g_strdup ("");
-#line 1062 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1078 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		result = _tmp12_;
-#line 1062 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1078 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		split = (_vala_array_free (split, split_length1, (GDestroyNotify) g_free), NULL);
-#line 1062 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1078 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		return result;
-#line 10657 "Dialogs.c"
+#line 10785 "Dialogs.c"
 	}
-#line 1056 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1072 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	split = (_vala_array_free (split, split_length1, (GDestroyNotify) g_free), NULL);
-#line 10661 "Dialogs.c"
+#line 10789 "Dialogs.c"
 }
 
 
 static void entry_multi_completion_class_init (EntryMultiCompletionClass * klass) {
-#line 978 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 994 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	entry_multi_completion_parent_class = g_type_class_peek_parent (klass);
-#line 978 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 994 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_type_class_add_private (klass, sizeof (EntryMultiCompletionPrivate));
-#line 978 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 994 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	((GtkEntryCompletionClass *) klass)->match_selected = entry_multi_completion_real_match_selected;
-#line 978 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 994 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	G_OBJECT_CLASS (klass)->finalize = entry_multi_completion_finalize;
-#line 10674 "Dialogs.c"
+#line 10802 "Dialogs.c"
 }
 
 
 static void entry_multi_completion_instance_init (EntryMultiCompletion * self) {
-#line 978 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 994 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv = ENTRY_MULTI_COMPLETION_GET_PRIVATE (self);
-#line 10681 "Dialogs.c"
+#line 10809 "Dialogs.c"
 }
 
 
 static void entry_multi_completion_finalize (GObject* obj) {
 	EntryMultiCompletion * self;
-#line 978 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 994 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_ENTRY_MULTI_COMPLETION, EntryMultiCompletion);
-#line 979 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 995 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (self->priv->delimiter);
-#line 978 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 994 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	G_OBJECT_CLASS (entry_multi_completion_parent_class)->finalize (obj);
-#line 10693 "Dialogs.c"
+#line 10821 "Dialogs.c"
 }
 
 
@@ -10721,9 +10849,9 @@ GType entry_multi_completion_get_type (void) {
 
 
 static void _set_background_dialog_on_checkbox_clicked_gtk_toggle_button_toggled (GtkToggleButton* _sender, gpointer self) {
-#line 1086 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1102 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	set_background_dialog_on_checkbox_clicked ((SetBackgroundDialog*) self);
-#line 10712 "Dialogs.c"
+#line 10840 "Dialogs.c"
 }
 
 
@@ -10756,103 +10884,103 @@ SetBackgroundDialog* set_background_dialog_construct (GType object_type, GtkBuil
 	GtkBuilder* _tmp24_ = NULL;
 	GObject* _tmp25_ = NULL;
 	GtkButton* _tmp26_ = NULL;
-#line 1076 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1092 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (GTK_IS_BUILDER (builder), NULL);
-#line 1076 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1092 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self = (SetBackgroundDialog*) g_type_create_instance (object_type);
-#line 1078 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1094 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = builder;
-#line 1078 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1094 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = gtk_builder_get_object (_tmp0_, "dialog1");
-#line 1078 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1094 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, gtk_dialog_get_type ()) ? ((GtkDialog*) _tmp1_) : NULL);
-#line 1078 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1094 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->dialog);
-#line 1078 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1094 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->dialog = _tmp2_;
-#line 1079 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1095 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = self->dialog;
-#line 1079 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1095 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_window_set_type_hint (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_window_get_type (), GtkWindow), GDK_WINDOW_TYPE_HINT_DIALOG);
-#line 1080 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1096 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp4_ = self->dialog;
-#line 1080 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1096 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp5_ = app_window_get_instance ();
-#line 1080 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1096 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp6_ = _tmp5_;
-#line 1080 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1096 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp7_ = gtk_widget_get_parent_window (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_widget_get_type (), GtkWidget));
-#line 1080 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1096 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_set_parent_window (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_widget_get_type (), GtkWidget), _tmp7_);
-#line 1080 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1096 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (_tmp6_);
-#line 1081 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1097 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp8_ = self->dialog;
-#line 1081 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1097 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp9_ = app_window_get_instance ();
-#line 1081 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1097 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp10_ = _tmp9_;
-#line 1081 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1097 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_window_set_transient_for (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_window_get_type (), GtkWindow), G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_window_get_type (), GtkWindow));
-#line 1081 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1097 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (_tmp10_);
-#line 1082 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1098 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp11_ = self->dialog;
-#line 1082 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1098 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_dialog_set_default_response (_tmp11_, (gint) GTK_RESPONSE_OK);
-#line 1084 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1100 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp12_ = builder;
-#line 1084 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1100 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp13_ = gtk_builder_get_object (_tmp12_, "desktop_background_checkbox");
-#line 1084 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1100 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp14_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp13_, gtk_check_button_get_type ()) ? ((GtkCheckButton*) _tmp13_) : NULL);
-#line 1084 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1100 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->desktop_background_button);
-#line 1084 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1100 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->desktop_background_button = _tmp14_;
-#line 1085 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1101 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp15_ = self->desktop_background_button;
-#line 1085 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1101 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp16_ = self->desktop;
-#line 1085 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1101 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, gtk_toggle_button_get_type (), GtkToggleButton), _tmp16_);
-#line 1086 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1102 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp17_ = self->desktop_background_button;
-#line 1086 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1102 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_toggle_button_get_type (), GtkToggleButton), "toggled", (GCallback) _set_background_dialog_on_checkbox_clicked_gtk_toggle_button_toggled, self);
-#line 1087 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1103 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp18_ = builder;
-#line 1087 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1103 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp19_ = gtk_builder_get_object (_tmp18_, "screensaver_checkbox");
-#line 1087 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1103 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp20_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp19_, gtk_check_button_get_type ()) ? ((GtkCheckButton*) _tmp19_) : NULL);
-#line 1087 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1103 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->screensaver_button);
-#line 1087 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1103 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->screensaver_button = _tmp20_;
-#line 1088 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1104 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp21_ = self->screensaver_button;
-#line 1088 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1104 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp22_ = self->screensaver;
-#line 1088 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1104 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, gtk_toggle_button_get_type (), GtkToggleButton), _tmp22_);
-#line 1089 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1105 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp23_ = self->screensaver_button;
-#line 1089 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1105 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, gtk_toggle_button_get_type (), GtkToggleButton), "toggled", (GCallback) _set_background_dialog_on_checkbox_clicked_gtk_toggle_button_toggled, self);
-#line 1091 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1107 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp24_ = builder;
-#line 1091 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1107 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp25_ = gtk_builder_get_object (_tmp24_, "ok_button");
-#line 1091 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1107 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp26_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp25_, gtk_button_get_type ()) ? ((GtkButton*) _tmp25_) : NULL);
-#line 1091 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1107 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->ok_button);
-#line 1091 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1107 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->ok_button = _tmp26_;
-#line 1076 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1092 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return self;
-#line 10841 "Dialogs.c"
+#line 10969 "Dialogs.c"
 }
 
 
@@ -10865,56 +10993,56 @@ void set_background_dialog_on_checkbox_clicked (SetBackgroundDialog* self) {
 	gboolean _tmp5_ = FALSE;
 	gboolean _tmp6_ = FALSE;
 	gboolean _tmp7_ = FALSE;
-#line 1094 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1110 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_SET_BACKGROUND_DIALOG (self));
-#line 1095 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1111 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = self->desktop_background_button;
-#line 1095 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1111 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_toggle_button_get_type (), GtkToggleButton));
-#line 1095 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1111 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = _tmp1_;
-#line 1095 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1111 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->desktop = _tmp2_;
-#line 1096 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1112 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = self->screensaver_button;
-#line 1096 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1112 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp4_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_toggle_button_get_type (), GtkToggleButton));
-#line 1096 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1112 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp5_ = _tmp4_;
-#line 1096 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1112 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->screensaver = _tmp5_;
-#line 1098 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1114 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp7_ = self->desktop;
-#line 1098 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1114 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (!_tmp7_) {
-#line 10876 "Dialogs.c"
+#line 11004 "Dialogs.c"
 		gboolean _tmp8_ = FALSE;
-#line 1098 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1114 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp8_ = self->screensaver;
-#line 1098 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1114 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp6_ = !_tmp8_;
-#line 10882 "Dialogs.c"
+#line 11010 "Dialogs.c"
 	} else {
-#line 1098 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1114 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp6_ = FALSE;
-#line 10886 "Dialogs.c"
+#line 11014 "Dialogs.c"
 	}
-#line 1098 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1114 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp6_) {
-#line 10890 "Dialogs.c"
+#line 11018 "Dialogs.c"
 		GtkButton* _tmp9_ = NULL;
-#line 1099 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1115 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp9_ = self->ok_button;
-#line 1099 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1115 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 10896 "Dialogs.c"
+#line 11024 "Dialogs.c"
 	} else {
 		GtkButton* _tmp10_ = NULL;
-#line 1101 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1117 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp10_ = self->ok_button;
-#line 1101 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1117 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_widget_get_type (), GtkWidget), TRUE);
-#line 10903 "Dialogs.c"
+#line 11031 "Dialogs.c"
 	}
 }
 
@@ -10926,245 +11054,245 @@ gboolean set_background_dialog_execute_base (SetBackgroundDialog* self) {
 	GtkDialog* _tmp1_ = NULL;
 	gint _tmp2_ = 0;
 	GtkDialog* _tmp3_ = NULL;
-#line 1105 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1121 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (IS_SET_BACKGROUND_DIALOG (self), FALSE);
-#line 1106 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1122 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = self->dialog;
-#line 1106 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1122 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget));
-#line 1107 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1123 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = self->dialog;
-#line 1107 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1123 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = gtk_dialog_run (_tmp1_);
-#line 1107 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1123 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_result_ = _tmp2_ == ((gint) GTK_RESPONSE_OK);
-#line 1108 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1124 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = self->dialog;
-#line 1108 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1124 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget));
-#line 1110 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1126 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	result = _result_;
-#line 1110 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1126 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 10935 "Dialogs.c"
+#line 11063 "Dialogs.c"
 }
 
 
 static void value_set_background_dialog_init (GValue* value) {
-#line 1067 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1083 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	value->data[0].v_pointer = NULL;
-#line 10942 "Dialogs.c"
+#line 11070 "Dialogs.c"
 }
 
 
 static void value_set_background_dialog_free_value (GValue* value) {
-#line 1067 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1083 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (value->data[0].v_pointer) {
-#line 1067 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1083 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		set_background_dialog_unref (value->data[0].v_pointer);
-#line 10951 "Dialogs.c"
+#line 11079 "Dialogs.c"
 	}
 }
 
 
 static void value_set_background_dialog_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 1067 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1083 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (src_value->data[0].v_pointer) {
-#line 1067 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1083 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		dest_value->data[0].v_pointer = set_background_dialog_ref (src_value->data[0].v_pointer);
-#line 10961 "Dialogs.c"
+#line 11089 "Dialogs.c"
 	} else {
-#line 1067 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1083 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 10965 "Dialogs.c"
+#line 11093 "Dialogs.c"
 	}
 }
 
 
 static gpointer value_set_background_dialog_peek_pointer (const GValue* value) {
-#line 1067 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1083 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return value->data[0].v_pointer;
-#line 10973 "Dialogs.c"
+#line 11101 "Dialogs.c"
 }
 
 
 static gchar* value_set_background_dialog_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 1067 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1083 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (collect_values[0].v_pointer) {
-#line 10980 "Dialogs.c"
+#line 11108 "Dialogs.c"
 		SetBackgroundDialog* object;
 		object = collect_values[0].v_pointer;
-#line 1067 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1083 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (object->parent_instance.g_class == NULL) {
-#line 1067 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1083 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 10987 "Dialogs.c"
+#line 11115 "Dialogs.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 1067 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1083 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 10991 "Dialogs.c"
+#line 11119 "Dialogs.c"
 		}
-#line 1067 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1083 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		value->data[0].v_pointer = set_background_dialog_ref (object);
-#line 10995 "Dialogs.c"
+#line 11123 "Dialogs.c"
 	} else {
-#line 1067 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1083 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		value->data[0].v_pointer = NULL;
-#line 10999 "Dialogs.c"
+#line 11127 "Dialogs.c"
 	}
-#line 1067 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1083 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return NULL;
-#line 11003 "Dialogs.c"
+#line 11131 "Dialogs.c"
 }
 
 
 static gchar* value_set_background_dialog_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 	SetBackgroundDialog** object_p;
 	object_p = collect_values[0].v_pointer;
-#line 1067 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1083 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (!object_p) {
-#line 1067 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1083 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 11014 "Dialogs.c"
+#line 11142 "Dialogs.c"
 	}
-#line 1067 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1083 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (!value->data[0].v_pointer) {
-#line 1067 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1083 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		*object_p = NULL;
-#line 11020 "Dialogs.c"
+#line 11148 "Dialogs.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 1067 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1083 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		*object_p = value->data[0].v_pointer;
-#line 11024 "Dialogs.c"
+#line 11152 "Dialogs.c"
 	} else {
-#line 1067 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1083 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		*object_p = set_background_dialog_ref (value->data[0].v_pointer);
-#line 11028 "Dialogs.c"
+#line 11156 "Dialogs.c"
 	}
-#line 1067 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1083 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return NULL;
-#line 11032 "Dialogs.c"
+#line 11160 "Dialogs.c"
 }
 
 
 GParamSpec* param_spec_set_background_dialog (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
 	ParamSpecSetBackgroundDialog* spec;
-#line 1067 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1083 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, TYPE_SET_BACKGROUND_DIALOG), NULL);
-#line 1067 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1083 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 1067 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1083 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 1067 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1083 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return G_PARAM_SPEC (spec);
-#line 11046 "Dialogs.c"
+#line 11174 "Dialogs.c"
 }
 
 
 gpointer value_get_set_background_dialog (const GValue* value) {
-#line 1067 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1083 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SET_BACKGROUND_DIALOG), NULL);
-#line 1067 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1083 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return value->data[0].v_pointer;
-#line 11055 "Dialogs.c"
+#line 11183 "Dialogs.c"
 }
 
 
 void value_set_set_background_dialog (GValue* value, gpointer v_object) {
 	SetBackgroundDialog* old;
-#line 1067 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1083 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SET_BACKGROUND_DIALOG));
-#line 1067 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1083 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	old = value->data[0].v_pointer;
-#line 1067 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1083 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (v_object) {
-#line 1067 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1083 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_SET_BACKGROUND_DIALOG));
-#line 1067 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1083 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 1067 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1083 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		value->data[0].v_pointer = v_object;
-#line 1067 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1083 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		set_background_dialog_ref (value->data[0].v_pointer);
-#line 11075 "Dialogs.c"
+#line 11203 "Dialogs.c"
 	} else {
-#line 1067 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1083 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		value->data[0].v_pointer = NULL;
-#line 11079 "Dialogs.c"
+#line 11207 "Dialogs.c"
 	}
-#line 1067 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1083 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (old) {
-#line 1067 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1083 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		set_background_dialog_unref (old);
-#line 11085 "Dialogs.c"
+#line 11213 "Dialogs.c"
 	}
 }
 
 
 void value_take_set_background_dialog (GValue* value, gpointer v_object) {
 	SetBackgroundDialog* old;
-#line 1067 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1083 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SET_BACKGROUND_DIALOG));
-#line 1067 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1083 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	old = value->data[0].v_pointer;
-#line 1067 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1083 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (v_object) {
-#line 1067 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1083 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_SET_BACKGROUND_DIALOG));
-#line 1067 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1083 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 1067 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1083 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		value->data[0].v_pointer = v_object;
-#line 11104 "Dialogs.c"
+#line 11232 "Dialogs.c"
 	} else {
-#line 1067 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1083 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		value->data[0].v_pointer = NULL;
-#line 11108 "Dialogs.c"
+#line 11236 "Dialogs.c"
 	}
-#line 1067 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1083 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (old) {
-#line 1067 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1083 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		set_background_dialog_unref (old);
-#line 11114 "Dialogs.c"
+#line 11242 "Dialogs.c"
 	}
 }
 
 
 static void set_background_dialog_class_init (SetBackgroundDialogClass * klass) {
-#line 1067 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1083 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	set_background_dialog_parent_class = g_type_class_peek_parent (klass);
-#line 1067 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1083 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	((SetBackgroundDialogClass *) klass)->finalize = set_background_dialog_finalize;
-#line 11124 "Dialogs.c"
+#line 11252 "Dialogs.c"
 }
 
 
 static void set_background_dialog_instance_init (SetBackgroundDialog * self) {
-#line 1073 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1089 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->desktop = TRUE;
-#line 1074 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1090 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->screensaver = FALSE;
-#line 1067 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1083 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->ref_count = 1;
-#line 11135 "Dialogs.c"
+#line 11263 "Dialogs.c"
 }
 
 
 static void set_background_dialog_finalize (SetBackgroundDialog* obj) {
 	SetBackgroundDialog * self;
-#line 1067 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1083 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SET_BACKGROUND_DIALOG, SetBackgroundDialog);
-#line 1067 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1083 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_signal_handlers_destroy (self);
-#line 1068 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1084 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->dialog);
-#line 1069 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1085 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->desktop_background_button);
-#line 1070 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1086 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->screensaver_button);
-#line 1071 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1087 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->ok_button);
-#line 11153 "Dialogs.c"
+#line 11281 "Dialogs.c"
 }
 
 
@@ -11185,24 +11313,24 @@ GType set_background_dialog_get_type (void) {
 gpointer set_background_dialog_ref (gpointer instance) {
 	SetBackgroundDialog* self;
 	self = instance;
-#line 1067 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1083 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_atomic_int_inc (&self->ref_count);
-#line 1067 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1083 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return instance;
-#line 11178 "Dialogs.c"
+#line 11306 "Dialogs.c"
 }
 
 
 void set_background_dialog_unref (gpointer instance) {
 	SetBackgroundDialog* self;
 	self = instance;
-#line 1067 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1083 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 1067 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1083 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		SET_BACKGROUND_DIALOG_GET_CLASS (self)->finalize (self);
-#line 1067 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1083 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 11191 "Dialogs.c"
+#line 11319 "Dialogs.c"
 	}
 }
 
@@ -11211,24 +11339,24 @@ SetBackgroundPhotoDialog* set_background_photo_dialog_construct (GType object_ty
 	SetBackgroundPhotoDialog* self = NULL;
 	GtkBuilder* builder = NULL;
 	GtkBuilder* _tmp0_ = NULL;
-#line 1117 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1133 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = app_window_create_builder ("set_background_dialog.ui", self);
-#line 1117 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1133 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	builder = _tmp0_;
-#line 1118 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1134 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self = (SetBackgroundPhotoDialog*) set_background_dialog_construct (object_type, builder);
-#line 1116 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1132 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (builder);
-#line 1116 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1132 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return self;
-#line 11210 "Dialogs.c"
+#line 11338 "Dialogs.c"
 }
 
 
 SetBackgroundPhotoDialog* set_background_photo_dialog_new (void) {
-#line 1116 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1132 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return set_background_photo_dialog_construct (TYPE_SET_BACKGROUND_PHOTO_DIALOG);
-#line 11217 "Dialogs.c"
+#line 11345 "Dialogs.c"
 }
 
 
@@ -11240,44 +11368,44 @@ gboolean set_background_photo_dialog_execute (SetBackgroundPhotoDialog* self, gb
 	gboolean _tmp0_ = FALSE;
 	gboolean _tmp1_ = FALSE;
 	gboolean _tmp2_ = FALSE;
-#line 1121 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1137 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (IS_SET_BACKGROUND_PHOTO_DIALOG (self), FALSE);
-#line 1122 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1138 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = set_background_dialog_execute_base (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SET_BACKGROUND_DIALOG, SetBackgroundDialog));
-#line 1122 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1138 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_result_ = _tmp0_;
-#line 1124 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1140 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SET_BACKGROUND_DIALOG, SetBackgroundDialog)->desktop;
-#line 1124 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1140 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_vala_desktop_background = _tmp1_;
-#line 1125 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1141 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SET_BACKGROUND_DIALOG, SetBackgroundDialog)->screensaver;
-#line 1125 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1141 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_vala_screensaver = _tmp2_;
-#line 1127 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1143 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	result = _result_;
-#line 1127 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1143 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (desktop_background) {
-#line 1127 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1143 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		*desktop_background = _vala_desktop_background;
-#line 11249 "Dialogs.c"
+#line 11377 "Dialogs.c"
 	}
-#line 1127 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1143 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (screensaver) {
-#line 1127 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1143 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		*screensaver = _vala_screensaver;
-#line 11255 "Dialogs.c"
+#line 11383 "Dialogs.c"
 	}
-#line 1127 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1143 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 11259 "Dialogs.c"
+#line 11387 "Dialogs.c"
 }
 
 
 static void set_background_photo_dialog_class_init (SetBackgroundPhotoDialogClass * klass) {
-#line 1114 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1130 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	set_background_photo_dialog_parent_class = g_type_class_peek_parent (klass);
-#line 11266 "Dialogs.c"
+#line 11394 "Dialogs.c"
 }
 
 
@@ -11298,9 +11426,9 @@ GType set_background_photo_dialog_get_type (void) {
 
 
 static void _set_background_slideshow_dialog_on_delay_scale_value_changed_gtk_range_value_changed (GtkRange* _sender, gpointer self) {
-#line 1143 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1159 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	set_background_slideshow_dialog_on_delay_scale_value_changed ((SetBackgroundSlideshowDialog*) self);
-#line 11289 "Dialogs.c"
+#line 11417 "Dialogs.c"
 }
 
 
@@ -11316,52 +11444,52 @@ SetBackgroundSlideshowDialog* set_background_slideshow_dialog_construct (GType o
 	GtkScale* _tmp6_ = NULL;
 	GtkAdjustment* _tmp7_ = NULL;
 	GtkAdjustment* _tmp8_ = NULL;
-#line 1137 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1153 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = app_window_create_builder ("set_background_slideshow_dialog.ui", self);
-#line 1137 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1153 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	builder = _tmp0_;
-#line 1138 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1154 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self = (SetBackgroundSlideshowDialog*) set_background_dialog_construct (object_type, builder);
-#line 1140 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1156 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = gtk_builder_get_object (builder, "delay_value_label");
-#line 1140 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1156 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, gtk_label_get_type ()) ? ((GtkLabel*) _tmp1_) : NULL);
-#line 1140 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1156 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->delay_value_label);
-#line 1140 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1156 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->delay_value_label = _tmp2_;
-#line 1142 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1158 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = gtk_builder_get_object (builder, "delay_scale");
-#line 1142 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1158 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp4_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp3_, gtk_scale_get_type ()) ? ((GtkScale*) _tmp3_) : NULL);
-#line 1142 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1158 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->delay_scale);
-#line 1142 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1158 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->delay_scale = _tmp4_;
-#line 1143 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1159 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp5_ = self->priv->delay_scale;
-#line 1143 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1159 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_range_get_type (), GtkRange), "value-changed", (GCallback) _set_background_slideshow_dialog_on_delay_scale_value_changed_gtk_range_value_changed, self);
-#line 1144 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1160 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp6_ = self->priv->delay_scale;
-#line 1144 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1160 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp7_ = gtk_range_get_adjustment (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_range_get_type (), GtkRange));
-#line 1144 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1160 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp8_ = _tmp7_;
-#line 1144 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1160 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_adjustment_set_value (_tmp8_, (gdouble) 50);
-#line 1136 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1152 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (builder);
-#line 1136 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1152 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return self;
-#line 11343 "Dialogs.c"
+#line 11471 "Dialogs.c"
 }
 
 
 SetBackgroundSlideshowDialog* set_background_slideshow_dialog_new (void) {
-#line 1136 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1152 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return set_background_slideshow_dialog_construct (TYPE_SET_BACKGROUND_SLIDESHOW_DIALOG);
-#line 11350 "Dialogs.c"
+#line 11478 "Dialogs.c"
 }
 
 
@@ -11379,57 +11507,57 @@ static void set_background_slideshow_dialog_on_delay_scale_value_changed (SetBac
 	gint _tmp8_ = 0;
 	GtkLabel* _tmp29_ = NULL;
 	const gchar* _tmp30_ = NULL;
-#line 1147 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1163 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_SET_BACKGROUND_SLIDESHOW_DIALOG (self));
-#line 1148 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1164 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = self->priv->delay_scale;
-#line 1148 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1164 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = gtk_range_get_adjustment (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_range_get_type (), GtkRange));
-#line 1148 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1164 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = _tmp1_;
-#line 1148 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1164 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = gtk_adjustment_get_value (_tmp2_);
-#line 1148 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1164 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp4_ = _tmp3_;
-#line 1148 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1164 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	value = _tmp4_;
-#line 1153 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1169 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp5_ = value;
-#line 1153 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1169 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp6_ = pow (_tmp5_, (gdouble) 5);
-#line 1153 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1169 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp7_ = pow ((gdouble) 90, (gdouble) 5);
-#line 1153 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1169 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->delay_value = (gint) (((((_tmp6_ / _tmp7_) * 60) * 60) * 24) + 5);
-#line 1157 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1173 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp8_ = self->priv->delay_value;
-#line 1157 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1173 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp8_ < 60) {
-#line 11394 "Dialogs.c"
+#line 11522 "Dialogs.c"
 		gint _tmp9_ = 0;
 		const gchar* _tmp10_ = NULL;
 		gint _tmp11_ = 0;
 		gchar* _tmp12_ = NULL;
-#line 1158 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1174 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp9_ = self->priv->delay_value;
-#line 1158 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1174 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp10_ = ngettext ("%d second", "%d seconds", (gulong) _tmp9_);
-#line 1158 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1174 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp11_ = self->priv->delay_value;
-#line 1158 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1174 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp12_ = g_strdup_printf (_tmp10_, _tmp11_);
-#line 1158 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1174 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (text);
-#line 1158 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1174 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		text = _tmp12_;
-#line 11411 "Dialogs.c"
+#line 11539 "Dialogs.c"
 	} else {
 		gint _tmp13_ = 0;
-#line 1159 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1175 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp13_ = self->priv->delay_value;
-#line 1159 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1175 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (_tmp13_ < (60 * 60)) {
-#line 11418 "Dialogs.c"
+#line 11546 "Dialogs.c"
 			gint minutes = 0;
 			gint _tmp14_ = 0;
 			gint _tmp15_ = 0;
@@ -11437,34 +11565,34 @@ static void set_background_slideshow_dialog_on_delay_scale_value_changed (SetBac
 			gint _tmp17_ = 0;
 			gchar* _tmp18_ = NULL;
 			gint _tmp19_ = 0;
-#line 1160 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1176 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp14_ = self->priv->delay_value;
-#line 1160 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1176 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			minutes = _tmp14_ / 60;
-#line 1161 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1177 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp15_ = minutes;
-#line 1161 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1177 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp16_ = ngettext ("%d minute", "%d minutes", (gulong) _tmp15_);
-#line 1161 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1177 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp17_ = minutes;
-#line 1161 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1177 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp18_ = g_strdup_printf (_tmp16_, _tmp17_);
-#line 1161 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1177 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_free0 (text);
-#line 1161 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1177 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			text = _tmp18_;
-#line 1162 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1178 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp19_ = minutes;
-#line 1162 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1178 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			self->priv->delay_value = _tmp19_ * 60;
-#line 11446 "Dialogs.c"
+#line 11574 "Dialogs.c"
 		} else {
 			gint _tmp20_ = 0;
-#line 1163 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1179 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp20_ = self->priv->delay_value;
-#line 1163 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1179 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			if (_tmp20_ < ((60 * 60) * 24)) {
-#line 11453 "Dialogs.c"
+#line 11581 "Dialogs.c"
 				gint hours = 0;
 				gint _tmp21_ = 0;
 				gint _tmp22_ = 0;
@@ -11472,53 +11600,53 @@ static void set_background_slideshow_dialog_on_delay_scale_value_changed (SetBac
 				gint _tmp24_ = 0;
 				gchar* _tmp25_ = NULL;
 				gint _tmp26_ = 0;
-#line 1164 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1180 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp21_ = self->priv->delay_value;
-#line 1164 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1180 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				hours = _tmp21_ / (60 * 60);
-#line 1165 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1181 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp22_ = hours;
-#line 1165 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1181 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp23_ = ngettext ("%d hour", "%d hours", (gulong) _tmp22_);
-#line 1165 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1181 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp24_ = hours;
-#line 1165 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1181 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp25_ = g_strdup_printf (_tmp23_, _tmp24_);
-#line 1165 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1181 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_free0 (text);
-#line 1165 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1181 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				text = _tmp25_;
-#line 1166 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1182 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp26_ = hours;
-#line 1166 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1182 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				self->priv->delay_value = _tmp26_ * (60 * 60);
-#line 11481 "Dialogs.c"
+#line 11609 "Dialogs.c"
 			} else {
 				const gchar* _tmp27_ = NULL;
 				gchar* _tmp28_ = NULL;
-#line 1168 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1184 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp27_ = _ ("1 day");
-#line 1168 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1184 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp28_ = g_strdup (_tmp27_);
-#line 1168 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1184 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_free0 (text);
-#line 1168 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1184 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				text = _tmp28_;
-#line 1169 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1185 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				self->priv->delay_value = (60 * 60) * 24;
-#line 11495 "Dialogs.c"
+#line 11623 "Dialogs.c"
 			}
 		}
 	}
-#line 1172 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1188 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp29_ = self->priv->delay_value_label;
-#line 1172 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1188 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp30_ = text;
-#line 1172 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1188 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_label_set_label (_tmp29_, _tmp30_);
-#line 1147 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1163 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (text);
-#line 11507 "Dialogs.c"
+#line 11635 "Dialogs.c"
 }
 
 
@@ -11532,81 +11660,81 @@ gboolean set_background_slideshow_dialog_execute (SetBackgroundSlideshowDialog*
 	gint _tmp1_ = 0;
 	gboolean _tmp2_ = FALSE;
 	gboolean _tmp3_ = FALSE;
-#line 1175 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1191 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (IS_SET_BACKGROUND_SLIDESHOW_DIALOG (self), FALSE);
-#line 1176 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1192 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = set_background_dialog_execute_base (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SET_BACKGROUND_DIALOG, SetBackgroundDialog));
-#line 1176 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1192 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_result_ = _tmp0_;
-#line 1178 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1194 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = self->priv->delay_value;
-#line 1178 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1194 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_vala_delay_value = _tmp1_;
-#line 1179 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1195 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SET_BACKGROUND_DIALOG, SetBackgroundDialog)->desktop;
-#line 1179 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1195 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_vala_desktop_background = _tmp2_;
-#line 1180 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1196 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SET_BACKGROUND_DIALOG, SetBackgroundDialog)->screensaver;
-#line 1180 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1196 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_vala_screensaver = _tmp3_;
-#line 1182 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1198 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	result = _result_;
-#line 1182 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1198 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (delay_value) {
-#line 1182 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1198 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		*delay_value = _vala_delay_value;
-#line 11545 "Dialogs.c"
+#line 11673 "Dialogs.c"
 	}
-#line 1182 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1198 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (desktop_background) {
-#line 1182 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1198 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		*desktop_background = _vala_desktop_background;
-#line 11551 "Dialogs.c"
+#line 11679 "Dialogs.c"
 	}
-#line 1182 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1198 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (screensaver) {
-#line 1182 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1198 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		*screensaver = _vala_screensaver;
-#line 11557 "Dialogs.c"
+#line 11685 "Dialogs.c"
 	}
-#line 1182 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1198 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 11561 "Dialogs.c"
+#line 11689 "Dialogs.c"
 }
 
 
 static void set_background_slideshow_dialog_class_init (SetBackgroundSlideshowDialogClass * klass) {
-#line 1131 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1147 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	set_background_slideshow_dialog_parent_class = g_type_class_peek_parent (klass);
-#line 1131 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1147 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	((SetBackgroundDialogClass *) klass)->finalize = set_background_slideshow_dialog_finalize;
-#line 1131 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1147 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_type_class_add_private (klass, sizeof (SetBackgroundSlideshowDialogPrivate));
-#line 11572 "Dialogs.c"
+#line 11700 "Dialogs.c"
 }
 
 
 static void set_background_slideshow_dialog_instance_init (SetBackgroundSlideshowDialog * self) {
-#line 1131 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1147 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv = SET_BACKGROUND_SLIDESHOW_DIALOG_GET_PRIVATE (self);
-#line 1134 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1150 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->delay_value = 0;
-#line 11581 "Dialogs.c"
+#line 11709 "Dialogs.c"
 }
 
 
 static void set_background_slideshow_dialog_finalize (SetBackgroundDialog* obj) {
 	SetBackgroundSlideshowDialog * self;
-#line 1131 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1147 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SET_BACKGROUND_SLIDESHOW_DIALOG, SetBackgroundSlideshowDialog);
-#line 1132 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1148 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->delay_value_label);
-#line 1133 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1149 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->delay_scale);
-#line 1131 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1147 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	SET_BACKGROUND_DIALOG_CLASS (set_background_slideshow_dialog_parent_class)->finalize (obj);
-#line 11595 "Dialogs.c"
+#line 11723 "Dialogs.c"
 }
 
 
@@ -11628,60 +11756,60 @@ TextEntryDialog* text_entry_dialog_construct (GType object_type) {
 	GtkSettings* _tmp0_ = NULL;
 	gint _tmp1_ = 0;
 	gboolean _tmp2_ = FALSE;
-#line 1198 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1214 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = gtk_settings_get_default ();
-#line 1198 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1214 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_object_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, G_TYPE_OBJECT, GObject), "gtk-dialogs-use-header", &use_header, NULL);
-#line 1199 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1215 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = use_header;
-#line 1199 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1215 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp2_) {
-#line 1199 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1215 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp1_ = 1;
-#line 11627 "Dialogs.c"
+#line 11755 "Dialogs.c"
 	} else {
-#line 1199 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1215 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp1_ = 0;
-#line 11631 "Dialogs.c"
+#line 11759 "Dialogs.c"
 	}
-#line 1199 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1215 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self = (TextEntryDialog*) g_object_new (object_type, "use-header-bar", _tmp1_, NULL);
-#line 1196 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1212 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return self;
-#line 11637 "Dialogs.c"
+#line 11765 "Dialogs.c"
 }
 
 
 TextEntryDialog* text_entry_dialog_new (void) {
-#line 1196 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1212 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return text_entry_dialog_construct (TYPE_TEXT_ENTRY_DIALOG);
-#line 11644 "Dialogs.c"
+#line 11772 "Dialogs.c"
 }
 
 
 void text_entry_dialog_set_builder (TextEntryDialog* self, GtkBuilder* builder) {
 	GtkBuilder* _tmp0_ = NULL;
 	GtkBuilder* _tmp1_ = NULL;
-#line 1202 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1218 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_TEXT_ENTRY_DIALOG (self));
-#line 1202 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1218 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (GTK_IS_BUILDER (builder));
-#line 1203 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1219 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = builder;
-#line 1203 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1219 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 1203 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1219 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->builder);
-#line 1203 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1219 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->builder = _tmp1_;
-#line 11663 "Dialogs.c"
+#line 11791 "Dialogs.c"
 }
 
 
 static void _text_entry_dialog_on_entry_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self) {
-#line 1220 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1236 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	text_entry_dialog_on_entry_changed ((TextEntryDialog*) self);
-#line 11670 "Dialogs.c"
+#line 11798 "Dialogs.c"
 }
 
 
@@ -11716,164 +11844,164 @@ void text_entry_dialog_setup (TextEntryDialog* self, TextEntryDialogOnModifyVali
 	GtkWidget* _tmp26_ = NULL;
 	GtkButton* _tmp27_ = NULL;
 	GeeCollection* _tmp28_ = NULL;
-#line 1206 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1222 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_TEXT_ENTRY_DIALOG (self));
-#line 1206 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1222 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (title != NULL);
-#line 1206 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1222 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (label != NULL);
-#line 1206 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1222 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail ((completion_list == NULL) || GEE_IS_COLLECTION (completion_list));
-#line 1208 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1224 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = title;
-#line 1208 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1224 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_window_set_title (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), _tmp0_);
-#line 1209 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1225 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_window_set_resizable (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), TRUE);
-#line 1210 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1226 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = app_window_get_instance ();
-#line 1210 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1226 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = _tmp1_;
-#line 1210 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1226 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = gtk_widget_get_parent_window (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget));
-#line 1210 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1226 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_set_parent_window (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), _tmp3_);
-#line 1210 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1226 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (_tmp2_);
-#line 1211 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1227 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp4_ = app_window_get_instance ();
-#line 1211 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1227 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp5_ = _tmp4_;
-#line 1211 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1227 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_window_set_transient_for (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_window_get_type (), GtkWindow));
-#line 1211 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1227 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (_tmp5_);
-#line 1212 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1228 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp6_ = modify_validate;
-#line 1212 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1228 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp6__target = modify_validate_target;
-#line 1212 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1228 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->on_modify_validate = _tmp6_;
-#line 1212 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1228 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->on_modify_validate_target = _tmp6__target;
-#line 1214 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1230 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp7_ = self->priv->builder;
-#line 1214 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1230 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp8_ = gtk_builder_get_object (_tmp7_, "label");
-#line 1214 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1230 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp9_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp8_, gtk_label_get_type ()) ? ((GtkLabel*) _tmp8_) : NULL);
-#line 1214 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1230 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	name_label = _tmp9_;
-#line 1215 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1231 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp10_ = name_label;
-#line 1215 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1231 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp11_ = label;
-#line 1215 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1231 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_label_set_text (_tmp10_, _tmp11_);
-#line 1217 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1233 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp12_ = self->priv->builder;
-#line 1217 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1233 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp13_ = gtk_builder_get_object (_tmp12_, "entry");
-#line 1217 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1233 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp14_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp13_, gtk_entry_get_type ()) ? ((GtkEntry*) _tmp13_) : NULL);
-#line 1217 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1233 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->entry);
-#line 1217 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1233 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->entry = _tmp14_;
-#line 1218 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1234 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp16_ = initial_text;
-#line 1218 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1234 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp16_ != NULL) {
-#line 11773 "Dialogs.c"
+#line 11901 "Dialogs.c"
 		const gchar* _tmp17_ = NULL;
-#line 1218 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1234 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp17_ = initial_text;
-#line 1218 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1234 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp15_ = _tmp17_;
-#line 11779 "Dialogs.c"
+#line 11907 "Dialogs.c"
 	} else {
-#line 1218 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1234 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp15_ = "";
-#line 11783 "Dialogs.c"
+#line 11911 "Dialogs.c"
 	}
-#line 1218 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1234 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp18_ = self->priv->entry;
-#line 1218 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1234 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_entry_set_text (_tmp18_, _tmp15_);
-#line 1219 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1235 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp19_ = self->priv->entry;
-#line 1219 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1235 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_grab_focus (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, gtk_widget_get_type (), GtkWidget));
-#line 1220 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1236 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp20_ = self->priv->entry;
-#line 1220 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1236 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, GTK_TYPE_EDITABLE, GtkEditable), "changed", (GCallback) _text_entry_dialog_on_entry_changed_gtk_editable_changed, self, 0);
-#line 1222 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1238 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp21_ = gtk_dialog_get_action_area (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
-#line 1222 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1238 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp22_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, gtk_button_box_get_type (), GtkButtonBox));
-#line 1222 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1238 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->action_area_box);
-#line 1222 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1238 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->action_area_box = _tmp22_;
-#line 1223 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1239 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp23_ = self->priv->action_area_box;
-#line 1223 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1239 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_button_box_set_layout (_tmp23_, GTK_BUTTONBOX_END);
-#line 1225 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1241 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp24_ = gtk_dialog_add_button (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), RESOURCES_CANCEL_LABEL, (gint) GTK_RESPONSE_CANCEL);
-#line 1225 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1241 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp25_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, gtk_button_get_type (), GtkButton));
-#line 1225 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1241 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->button1);
-#line 1225 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1241 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->button1 = _tmp25_;
-#line 1226 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1242 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp26_ = gtk_dialog_add_button (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), RESOURCES_SAVE_LABEL, (gint) GTK_RESPONSE_OK);
-#line 1226 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1242 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp27_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, gtk_button_get_type (), GtkButton));
-#line 1226 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1242 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->button2);
-#line 1226 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1242 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->button2 = _tmp27_;
-#line 1227 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1243 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_dialog_set_default_response (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), (gint) GTK_RESPONSE_OK);
-#line 1229 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1245 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp28_ = completion_list;
-#line 1229 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1245 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp28_ != NULL) {
-#line 11831 "Dialogs.c"
+#line 11959 "Dialogs.c"
 		EntryMultiCompletion* completion = NULL;
 		GeeCollection* _tmp29_ = NULL;
 		const gchar* _tmp30_ = NULL;
 		EntryMultiCompletion* _tmp31_ = NULL;
 		GtkEntry* _tmp32_ = NULL;
 		EntryMultiCompletion* _tmp33_ = NULL;
-#line 1230 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1246 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp29_ = completion_list;
-#line 1230 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1246 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp30_ = completion_delimiter;
-#line 1230 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1246 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp31_ = entry_multi_completion_new (_tmp29_, _tmp30_);
-#line 1230 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1246 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		completion = _tmp31_;
-#line 1232 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1248 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp32_ = self->priv->entry;
-#line 1232 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1248 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp33_ = completion;
-#line 1232 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1248 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_entry_set_completion (_tmp32_, G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, gtk_entry_completion_get_type (), GtkEntryCompletion));
-#line 1229 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1245 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (completion);
-#line 11854 "Dialogs.c"
+#line 11982 "Dialogs.c"
 	}
-#line 1235 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1251 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_dialog_set_default_response (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), (gint) GTK_RESPONSE_OK);
-#line 1236 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1252 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_window_set_has_resize_grip (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), FALSE);
-#line 1206 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1222 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (name_label);
-#line 11862 "Dialogs.c"
+#line 11990 "Dialogs.c"
 }
 
 
@@ -11888,57 +12016,57 @@ gchar* text_entry_dialog_execute (TextEntryDialog* self) {
 	gint _tmp4_ = 0;
 	GtkEntry* _tmp8_ = NULL;
 	guint _tmp9_ = 0U;
-#line 1239 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1255 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (IS_TEXT_ENTRY_DIALOG (self), NULL);
-#line 1240 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1256 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	text = NULL;
-#line 1243 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1259 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = self->priv->on_modify_validate;
-#line 1243 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1259 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0__target = self->priv->on_modify_validate_target;
-#line 1243 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1259 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = self->priv->entry;
-#line 1243 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1259 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = gtk_entry_get_text (_tmp1_);
-#line 1243 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1259 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = _tmp0_ (_tmp2_, _tmp0__target);
-#line 1243 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1259 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_dialog_set_response_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), (gint) GTK_RESPONSE_OK, _tmp3_);
-#line 1245 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1261 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 1247 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1263 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp4_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
-#line 1247 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1263 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp4_ == ((gint) GTK_RESPONSE_OK)) {
-#line 11899 "Dialogs.c"
+#line 12027 "Dialogs.c"
 		GtkEntry* _tmp5_ = NULL;
 		const gchar* _tmp6_ = NULL;
 		gchar* _tmp7_ = NULL;
-#line 1248 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1264 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp5_ = self->priv->entry;
-#line 1248 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1264 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp6_ = gtk_entry_get_text (_tmp5_);
-#line 1248 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1264 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp7_ = g_strdup (_tmp6_);
-#line 1248 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1264 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (text);
-#line 1248 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1264 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		text = _tmp7_;
-#line 11913 "Dialogs.c"
+#line 12041 "Dialogs.c"
 	}
-#line 1250 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1266 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp8_ = self->priv->entry;
-#line 1250 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1266 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_signal_parse_name ("changed", GTK_TYPE_EDITABLE, &_tmp9_, NULL, FALSE);
-#line 1250 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1266 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GTK_TYPE_EDITABLE, GtkEditable), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp9_, 0, NULL, (GCallback) _text_entry_dialog_on_entry_changed_gtk_editable_changed, self);
-#line 1251 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1267 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 1253 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1269 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	result = text;
-#line 1253 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1269 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 11927 "Dialogs.c"
+#line 12055 "Dialogs.c"
 }
 
 
@@ -11948,59 +12076,59 @@ void text_entry_dialog_on_entry_changed (TextEntryDialog* self) {
 	GtkEntry* _tmp1_ = NULL;
 	const gchar* _tmp2_ = NULL;
 	gboolean _tmp3_ = FALSE;
-#line 1256 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1272 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_TEXT_ENTRY_DIALOG (self));
-#line 1257 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1273 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = self->priv->on_modify_validate;
-#line 1257 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1273 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0__target = self->priv->on_modify_validate_target;
-#line 1257 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1273 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = self->priv->entry;
-#line 1257 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1273 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = gtk_entry_get_text (_tmp1_);
-#line 1257 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1273 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = _tmp0_ (_tmp2_, _tmp0__target);
-#line 1257 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1273 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_dialog_set_response_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), (gint) GTK_RESPONSE_OK, _tmp3_);
-#line 11951 "Dialogs.c"
+#line 12079 "Dialogs.c"
 }
 
 
 static void text_entry_dialog_class_init (TextEntryDialogClass * klass) {
-#line 1186 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1202 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	text_entry_dialog_parent_class = g_type_class_peek_parent (klass);
-#line 1186 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1202 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_type_class_add_private (klass, sizeof (TextEntryDialogPrivate));
-#line 1186 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1202 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	G_OBJECT_CLASS (klass)->finalize = text_entry_dialog_finalize;
-#line 11962 "Dialogs.c"
+#line 12090 "Dialogs.c"
 }
 
 
 static void text_entry_dialog_instance_init (TextEntryDialog * self) {
-#line 1186 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1202 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv = TEXT_ENTRY_DIALOG_GET_PRIVATE (self);
-#line 11969 "Dialogs.c"
+#line 12097 "Dialogs.c"
 }
 
 
 static void text_entry_dialog_finalize (GObject* obj) {
 	TextEntryDialog * self;
-#line 1186 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1202 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_TEXT_ENTRY_DIALOG, TextEntryDialog);
-#line 1190 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1206 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->entry);
-#line 1191 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1207 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->builder);
-#line 1192 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1208 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->button1);
-#line 1193 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1209 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->button2);
-#line 1194 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1210 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->action_area_box);
-#line 1186 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1202 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	G_OBJECT_CLASS (text_entry_dialog_parent_class)->finalize (obj);
-#line 11989 "Dialogs.c"
+#line 12117 "Dialogs.c"
 }
 
 
@@ -12022,53 +12150,53 @@ MultiTextEntryDialog* multi_text_entry_dialog_construct (GType object_type) {
 	GtkSettings* _tmp0_ = NULL;
 	gint _tmp1_ = 0;
 	gboolean _tmp2_ = FALSE;
-#line 1273 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1289 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = gtk_settings_get_default ();
-#line 1273 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1289 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_object_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, G_TYPE_OBJECT, GObject), "gtk-dialogs-use-header", &use_header, NULL);
-#line 1274 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1290 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = use_header;
-#line 1274 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1290 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp2_) {
-#line 1274 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1290 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp1_ = 1;
-#line 12021 "Dialogs.c"
+#line 12149 "Dialogs.c"
 	} else {
-#line 1274 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1290 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp1_ = 0;
-#line 12025 "Dialogs.c"
+#line 12153 "Dialogs.c"
 	}
-#line 1274 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1290 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self = (MultiTextEntryDialog*) g_object_new (object_type, "use-header-bar", _tmp1_, NULL);
-#line 1271 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1287 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return self;
-#line 12031 "Dialogs.c"
+#line 12159 "Dialogs.c"
 }
 
 
 MultiTextEntryDialog* multi_text_entry_dialog_new (void) {
-#line 1271 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1287 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return multi_text_entry_dialog_construct (TYPE_MULTI_TEXT_ENTRY_DIALOG);
-#line 12038 "Dialogs.c"
+#line 12166 "Dialogs.c"
 }
 
 
 void multi_text_entry_dialog_set_builder (MultiTextEntryDialog* self, GtkBuilder* builder) {
 	GtkBuilder* _tmp0_ = NULL;
 	GtkBuilder* _tmp1_ = NULL;
-#line 1277 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1293 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_MULTI_TEXT_ENTRY_DIALOG (self));
-#line 1277 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1293 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (GTK_IS_BUILDER (builder));
-#line 1278 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1294 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = builder;
-#line 1278 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1294 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 1278 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1294 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->builder);
-#line 1278 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1294 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->builder = _tmp1_;
-#line 12057 "Dialogs.c"
+#line 12185 "Dialogs.c"
 }
 
 
@@ -12101,131 +12229,131 @@ void multi_text_entry_dialog_setup (MultiTextEntryDialog* self, MultiTextEntryDi
 	GtkButton* _tmp25_ = NULL;
 	GtkWidget* _tmp26_ = NULL;
 	GtkButton* _tmp27_ = NULL;
-#line 1281 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1297 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_MULTI_TEXT_ENTRY_DIALOG (self));
-#line 1281 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1297 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (title != NULL);
-#line 1281 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1297 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (label != NULL);
-#line 1282 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1298 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = title;
-#line 1282 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1298 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_window_set_title (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), _tmp0_);
-#line 1283 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1299 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_window_set_resizable (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), TRUE);
-#line 1284 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1300 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_window_set_default_size (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), 500, 300);
-#line 1285 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1301 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = app_window_get_instance ();
-#line 1285 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1301 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = _tmp1_;
-#line 1285 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1301 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = gtk_widget_get_parent_window (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget));
-#line 1285 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1301 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_set_parent_window (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), _tmp3_);
-#line 1285 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1301 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (_tmp2_);
-#line 1286 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1302 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp4_ = app_window_get_instance ();
-#line 1286 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1302 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp5_ = _tmp4_;
-#line 1286 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1302 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_window_set_transient_for (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_window_get_type (), GtkWindow));
-#line 1286 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1302 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (_tmp5_);
-#line 1287 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1303 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp6_ = modify_validate;
-#line 1287 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1303 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp6__target = modify_validate_target;
-#line 1287 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1303 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->on_modify_validate = _tmp6_;
-#line 1287 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1303 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->on_modify_validate_target = _tmp6__target;
-#line 1289 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1305 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp7_ = self->priv->builder;
-#line 1289 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1305 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp8_ = gtk_builder_get_object (_tmp7_, "textview1");
-#line 1289 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1305 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp9_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp8_, gtk_text_view_get_type ()) ? ((GtkTextView*) _tmp8_) : NULL);
-#line 1289 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1305 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->entry);
-#line 1289 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1305 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->entry = _tmp9_;
-#line 1290 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1306 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp10_ = self->priv->entry;
-#line 1290 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1306 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_text_view_set_wrap_mode (_tmp10_, GTK_WRAP_WORD);
-#line 1291 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1307 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp11_ = self->priv->entry;
-#line 1291 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1307 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp12_ = gtk_text_buffer_new (NULL);
-#line 1291 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1307 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp13_ = _tmp12_;
-#line 1291 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1307 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_text_view_set_buffer (_tmp11_, _tmp13_);
-#line 1291 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1307 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (_tmp13_);
-#line 1292 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1308 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp15_ = initial_text;
-#line 1292 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1308 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp15_ != NULL) {
-#line 12158 "Dialogs.c"
+#line 12286 "Dialogs.c"
 		const gchar* _tmp16_ = NULL;
-#line 1292 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1308 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp16_ = initial_text;
-#line 1292 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1308 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp14_ = _tmp16_;
-#line 12164 "Dialogs.c"
+#line 12292 "Dialogs.c"
 	} else {
-#line 1292 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1308 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp14_ = "";
-#line 12168 "Dialogs.c"
+#line 12296 "Dialogs.c"
 	}
-#line 1292 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1308 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp17_ = self->priv->entry;
-#line 1292 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1308 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp18_ = gtk_text_view_get_buffer (_tmp17_);
-#line 1292 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1308 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp19_ = _tmp18_;
-#line 1292 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1308 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_object_set (_tmp19_, "text", _tmp14_, NULL);
-#line 1294 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1310 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp20_ = self->priv->entry;
-#line 1294 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1310 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_grab_focus (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, gtk_widget_get_type (), GtkWidget));
-#line 1296 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1312 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp21_ = gtk_dialog_get_action_area (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
-#line 1296 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1312 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp22_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, gtk_button_box_get_type (), GtkButtonBox));
-#line 1296 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1312 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->action_area_box);
-#line 1296 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1312 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->action_area_box = _tmp22_;
-#line 1297 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1313 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp23_ = self->priv->action_area_box;
-#line 1297 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1313 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_button_box_set_layout (_tmp23_, GTK_BUTTONBOX_END);
-#line 1299 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1315 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp24_ = gtk_dialog_add_button (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), RESOURCES_CANCEL_LABEL, (gint) GTK_RESPONSE_CANCEL);
-#line 1299 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1315 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp25_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, gtk_button_get_type (), GtkButton));
-#line 1299 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1315 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->button1);
-#line 1299 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1315 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->button1 = _tmp25_;
-#line 1300 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1316 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp26_ = gtk_dialog_add_button (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), RESOURCES_SAVE_LABEL, (gint) GTK_RESPONSE_OK);
-#line 1300 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1316 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp27_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, gtk_button_get_type (), GtkButton));
-#line 1300 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1316 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->button2);
-#line 1300 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1316 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->button2 = _tmp27_;
-#line 1301 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1317 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_dialog_set_default_response (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), (gint) GTK_RESPONSE_OK);
-#line 1303 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1319 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_window_set_has_resize_grip (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), TRUE);
-#line 12214 "Dialogs.c"
+#line 12342 "Dialogs.c"
 }
 
 
@@ -12233,83 +12361,83 @@ gchar* multi_text_entry_dialog_execute (MultiTextEntryDialog* self) {
 	gchar* result = NULL;
 	gchar* text = NULL;
 	gint _tmp0_ = 0;
-#line 1306 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1322 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (IS_MULTI_TEXT_ENTRY_DIALOG (self), NULL);
-#line 1307 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1323 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	text = NULL;
-#line 1309 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1325 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 1311 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1327 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
-#line 1311 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1327 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp0_ == ((gint) GTK_RESPONSE_OK)) {
-#line 12232 "Dialogs.c"
+#line 12360 "Dialogs.c"
 		GtkTextView* _tmp1_ = NULL;
 		GtkTextBuffer* _tmp2_ = NULL;
 		GtkTextBuffer* _tmp3_ = NULL;
 		gchar* _tmp4_ = NULL;
 		gchar* _tmp5_ = NULL;
-#line 1312 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1328 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp1_ = self->priv->entry;
-#line 1312 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1328 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp2_ = gtk_text_view_get_buffer (_tmp1_);
-#line 1312 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1328 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp3_ = _tmp2_;
-#line 1312 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1328 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		g_object_get (_tmp3_, "text", &_tmp4_, NULL);
-#line 1312 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1328 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp5_ = _tmp4_;
-#line 1312 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1328 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (text);
-#line 1312 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1328 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		text = _tmp5_;
-#line 12252 "Dialogs.c"
+#line 12380 "Dialogs.c"
 	}
-#line 1314 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1330 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 1316 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1332 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	result = text;
-#line 1316 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1332 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 12260 "Dialogs.c"
+#line 12388 "Dialogs.c"
 }
 
 
 static void multi_text_entry_dialog_class_init (MultiTextEntryDialogClass * klass) {
-#line 1261 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1277 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	multi_text_entry_dialog_parent_class = g_type_class_peek_parent (klass);
-#line 1261 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1277 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_type_class_add_private (klass, sizeof (MultiTextEntryDialogPrivate));
-#line 1261 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1277 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	G_OBJECT_CLASS (klass)->finalize = multi_text_entry_dialog_finalize;
-#line 12271 "Dialogs.c"
+#line 12399 "Dialogs.c"
 }
 
 
 static void multi_text_entry_dialog_instance_init (MultiTextEntryDialog * self) {
-#line 1261 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1277 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv = MULTI_TEXT_ENTRY_DIALOG_GET_PRIVATE (self);
-#line 12278 "Dialogs.c"
+#line 12406 "Dialogs.c"
 }
 
 
 static void multi_text_entry_dialog_finalize (GObject* obj) {
 	MultiTextEntryDialog * self;
-#line 1261 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1277 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_MULTI_TEXT_ENTRY_DIALOG, MultiTextEntryDialog);
-#line 1265 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1281 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->entry);
-#line 1266 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1282 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->builder);
-#line 1267 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1283 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->button1);
-#line 1268 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1284 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->button2);
-#line 1269 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1285 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->action_area_box);
-#line 1261 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1277 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	G_OBJECT_CLASS (multi_text_entry_dialog_parent_class)->finalize (obj);
-#line 12298 "Dialogs.c"
+#line 12426 "Dialogs.c"
 }
 
 
@@ -12330,24 +12458,24 @@ EventRenameDialog* event_rename_dialog_construct (GType object_type, const gchar
 	const gchar* _tmp0_ = NULL;
 	const gchar* _tmp1_ = NULL;
 	const gchar* _tmp2_ = NULL;
-#line 1322 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1338 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = _ ("Rename Event");
-#line 1322 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1338 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = _ ("Name:");
-#line 1322 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1338 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = event_name;
-#line 1322 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1338 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self = (EventRenameDialog*) text_entry_dialog_mediator_construct (object_type, _tmp0_, _tmp1_, _tmp2_, NULL, NULL);
-#line 1321 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1337 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return self;
-#line 12329 "Dialogs.c"
+#line 12457 "Dialogs.c"
 }
 
 
 EventRenameDialog* event_rename_dialog_new (const gchar* event_name) {
-#line 1321 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1337 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return event_rename_dialog_construct (TYPE_EVENT_RENAME_DIALOG, event_name);
-#line 12336 "Dialogs.c"
+#line 12464 "Dialogs.c"
 }
 
 
@@ -12357,39 +12485,39 @@ static gchar* event_rename_dialog_real_execute (EventRenameDialog* self) {
 	gchar* _tmp1_ = NULL;
 	gchar* _tmp2_ = NULL;
 	gchar* _tmp3_ = NULL;
-#line 1326 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1342 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = _text_entry_dialog_mediator_execute (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_TEXT_ENTRY_DIALOG_MEDIATOR, TextEntryDialogMediator));
-#line 1326 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1342 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = _tmp0_;
-#line 1326 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1342 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = event_prep_event_name (_tmp1_);
-#line 1326 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1342 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = _tmp2_;
-#line 1326 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1342 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (_tmp1_);
-#line 1326 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1342 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	result = _tmp3_;
-#line 1326 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1342 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 12360 "Dialogs.c"
+#line 12488 "Dialogs.c"
 }
 
 
 gchar* event_rename_dialog_execute (EventRenameDialog* self) {
-#line 1325 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1341 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (IS_EVENT_RENAME_DIALOG (self), NULL);
-#line 1325 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1341 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return EVENT_RENAME_DIALOG_GET_CLASS (self)->execute (self);
-#line 12369 "Dialogs.c"
+#line 12497 "Dialogs.c"
 }
 
 
 static void event_rename_dialog_class_init (EventRenameDialogClass * klass) {
-#line 1320 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1336 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	event_rename_dialog_parent_class = g_type_class_peek_parent (klass);
-#line 1320 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1336 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	((EventRenameDialogClass *) klass)->execute = event_rename_dialog_real_execute;
-#line 12378 "Dialogs.c"
+#line 12506 "Dialogs.c"
 }
 
 
@@ -12414,24 +12542,24 @@ EditTitleDialog* edit_title_dialog_construct (GType object_type, const gchar* ph
 	const gchar* _tmp0_ = NULL;
 	const gchar* _tmp1_ = NULL;
 	const gchar* _tmp2_ = NULL;
-#line 1333 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1349 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = C_ ("Dialog Title", "Edit Title");
-#line 1333 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1349 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = _ ("Title:");
-#line 1333 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1349 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = photo_title;
-#line 1333 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1349 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self = (EditTitleDialog*) text_entry_dialog_mediator_construct (object_type, _tmp0_, _tmp1_, _tmp2_, NULL, NULL);
-#line 1331 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1347 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return self;
-#line 12413 "Dialogs.c"
+#line 12541 "Dialogs.c"
 }
 
 
 EditTitleDialog* edit_title_dialog_new (const gchar* photo_title) {
-#line 1331 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1347 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return edit_title_dialog_construct (TYPE_EDIT_TITLE_DIALOG, photo_title);
-#line 12420 "Dialogs.c"
+#line 12548 "Dialogs.c"
 }
 
 
@@ -12441,56 +12569,56 @@ static gchar* edit_title_dialog_real_execute (EditTitleDialog* self) {
 	gchar* _tmp1_ = NULL;
 	gchar* _tmp2_ = NULL;
 	gchar* _tmp3_ = NULL;
-#line 1338 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1354 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = _text_entry_dialog_mediator_execute (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_TEXT_ENTRY_DIALOG_MEDIATOR, TextEntryDialogMediator));
-#line 1338 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1354 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = _tmp0_;
-#line 1338 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1354 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = media_source_prep_title (_tmp1_);
-#line 1338 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1354 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = _tmp2_;
-#line 1338 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1354 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (_tmp1_);
-#line 1338 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1354 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	result = _tmp3_;
-#line 1338 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1354 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 12444 "Dialogs.c"
+#line 12572 "Dialogs.c"
 }
 
 
 gchar* edit_title_dialog_execute (EditTitleDialog* self) {
-#line 1337 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1353 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (IS_EDIT_TITLE_DIALOG (self), NULL);
-#line 1337 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1353 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return EDIT_TITLE_DIALOG_GET_CLASS (self)->execute (self);
-#line 12453 "Dialogs.c"
+#line 12581 "Dialogs.c"
 }
 
 
 static gboolean edit_title_dialog_real_on_modify_validate (TextEntryDialogMediator* base, const gchar* text) {
 	EditTitleDialog * self;
 	gboolean result = FALSE;
-#line 1341 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1357 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDIT_TITLE_DIALOG, EditTitleDialog);
-#line 1341 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1357 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (text != NULL, FALSE);
-#line 1342 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1358 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	result = TRUE;
-#line 1342 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1358 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 12468 "Dialogs.c"
+#line 12596 "Dialogs.c"
 }
 
 
 static void edit_title_dialog_class_init (EditTitleDialogClass * klass) {
-#line 1330 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1346 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	edit_title_dialog_parent_class = g_type_class_peek_parent (klass);
-#line 1330 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1346 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	((EditTitleDialogClass *) klass)->execute = edit_title_dialog_real_execute;
-#line 1330 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1346 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	((TextEntryDialogMediatorClass *) klass)->on_modify_validate = edit_title_dialog_real_on_modify_validate;
-#line 12479 "Dialogs.c"
+#line 12607 "Dialogs.c"
 }
 
 
@@ -12518,47 +12646,47 @@ EditCommentDialog* edit_comment_dialog_construct (GType object_type, const gchar
 	gchar* _tmp4_ = NULL;
 	const gchar* _tmp5_ = NULL;
 	const gchar* _tmp6_ = NULL;
-#line 1348 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1364 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = is_event;
-#line 1348 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1364 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp1_) {
-#line 12511 "Dialogs.c"
+#line 12639 "Dialogs.c"
 		const gchar* _tmp2_ = NULL;
-#line 1350 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1366 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp2_ = _ ("Edit Event Comment");
-#line 1350 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1366 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp0_ = _tmp2_;
-#line 12517 "Dialogs.c"
+#line 12645 "Dialogs.c"
 	} else {
 		const gchar* _tmp3_ = NULL;
-#line 1351 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1367 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp3_ = _ ("Edit Photo/Video Comment");
-#line 1351 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1367 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp0_ = _tmp3_;
-#line 12524 "Dialogs.c"
+#line 12652 "Dialogs.c"
 	}
-#line 1348 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1364 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp4_ = g_strdup (_tmp0_);
-#line 1348 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1364 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	title_tmp = _tmp4_;
-#line 1352 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1368 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp5_ = _ ("Comment:");
-#line 1352 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1368 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp6_ = comment;
-#line 1352 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1368 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self = (EditCommentDialog*) multi_text_entry_dialog_mediator_construct (object_type, title_tmp, _tmp5_, _tmp6_);
-#line 1347 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1363 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (title_tmp);
-#line 1347 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1363 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return self;
-#line 12540 "Dialogs.c"
+#line 12668 "Dialogs.c"
 }
 
 
 EditCommentDialog* edit_comment_dialog_new (const gchar* comment, gboolean is_event) {
-#line 1347 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1363 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return edit_comment_dialog_construct (TYPE_EDIT_COMMENT_DIALOG, comment, is_event);
-#line 12547 "Dialogs.c"
+#line 12675 "Dialogs.c"
 }
 
 
@@ -12568,56 +12696,56 @@ static gchar* edit_comment_dialog_real_execute (EditCommentDialog* self) {
 	gchar* _tmp1_ = NULL;
 	gchar* _tmp2_ = NULL;
 	gchar* _tmp3_ = NULL;
-#line 1356 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1372 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = _multi_text_entry_dialog_mediator_execute (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MULTI_TEXT_ENTRY_DIALOG_MEDIATOR, MultiTextEntryDialogMediator));
-#line 1356 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1372 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = _tmp0_;
-#line 1356 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1372 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = media_source_prep_comment (_tmp1_);
-#line 1356 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1372 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = _tmp2_;
-#line 1356 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1372 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (_tmp1_);
-#line 1356 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1372 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	result = _tmp3_;
-#line 1356 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1372 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 12571 "Dialogs.c"
+#line 12699 "Dialogs.c"
 }
 
 
 gchar* edit_comment_dialog_execute (EditCommentDialog* self) {
-#line 1355 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1371 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (IS_EDIT_COMMENT_DIALOG (self), NULL);
-#line 1355 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1371 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return EDIT_COMMENT_DIALOG_GET_CLASS (self)->execute (self);
-#line 12580 "Dialogs.c"
+#line 12708 "Dialogs.c"
 }
 
 
 static gboolean edit_comment_dialog_real_on_modify_validate (MultiTextEntryDialogMediator* base, const gchar* text) {
 	EditCommentDialog * self;
 	gboolean result = FALSE;
-#line 1359 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1375 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDIT_COMMENT_DIALOG, EditCommentDialog);
-#line 1359 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1375 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (text != NULL, FALSE);
-#line 1360 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1376 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	result = TRUE;
-#line 1360 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1376 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 12595 "Dialogs.c"
+#line 12723 "Dialogs.c"
 }
 
 
 static void edit_comment_dialog_class_init (EditCommentDialogClass * klass) {
-#line 1346 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1362 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	edit_comment_dialog_parent_class = g_type_class_peek_parent (klass);
-#line 1346 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1362 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	((EditCommentDialogClass *) klass)->execute = edit_comment_dialog_real_execute;
-#line 1346 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1362 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	((MultiTextEntryDialogMediatorClass *) klass)->on_modify_validate = edit_comment_dialog_real_on_modify_validate;
-#line 12606 "Dialogs.c"
+#line 12734 "Dialogs.c"
 }
 
 
@@ -12654,63 +12782,63 @@ GtkResponseType remove_from_library_dialog (GtkWindow* owner, const gchar* title
 	gchar* _tmp10_ = NULL;
 	GtkResponseType _result_ = 0;
 	gint _tmp11_ = 0;
-#line 1366 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1382 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (GTK_IS_WINDOW (owner), 0);
-#line 1366 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1382 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (title != NULL, 0);
-#line 1366 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1382 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (user_message != NULL, 0);
-#line 1368 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1384 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = count;
-#line 1368 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1384 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = ngettext ("Remove and _Trash File", "Remove and _Trash Files", (gulong) _tmp0_);
-#line 1368 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1384 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = g_strdup (_tmp1_);
-#line 1368 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1384 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	trash_action = _tmp2_;
-#line 1370 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1386 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = owner;
-#line 1370 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1386 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp4_ = user_message;
-#line 1370 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1386 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp5_ = (GtkMessageDialog*) gtk_message_dialog_new (_tmp3_, GTK_DIALOG_MODAL, GTK_MESSAGE_WARNING, GTK_BUTTONS_CANCEL, "%s", _tmp4_);
-#line 1370 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1386 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_object_ref_sink (_tmp5_);
-#line 1370 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1386 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	dialog = _tmp5_;
-#line 1372 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1388 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp6_ = _ ("_Remove From Library");
-#line 1372 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1388 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_dialog_add_button (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_dialog_get_type (), GtkDialog), _tmp6_, (gint) GTK_RESPONSE_NO);
-#line 1373 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1389 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_dialog_add_button (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_dialog_get_type (), GtkDialog), trash_action, (gint) GTK_RESPONSE_YES);
-#line 1378 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1394 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp7_ = title;
-#line 1378 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1394 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp8_ = user_message;
-#line 1378 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1394 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp9_ = build_alert_body_text (_tmp7_, _tmp8_, TRUE);
-#line 1378 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1394 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp10_ = _tmp9_;
-#line 1378 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1394 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_message_dialog_set_markup (dialog, _tmp10_);
-#line 1378 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1394 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (_tmp10_);
-#line 1380 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1396 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp11_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_dialog_get_type (), GtkDialog));
-#line 1380 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1396 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_result_ = (GtkResponseType) _tmp11_;
-#line 1382 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1398 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_widget_get_type (), GtkWidget));
-#line 1384 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1400 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	result = _result_;
-#line 1384 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1400 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (dialog);
-#line 1384 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1400 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (trash_action);
-#line 1384 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1400 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 12699 "Dialogs.c"
+#line 12827 "Dialogs.c"
 }
 
 
@@ -12728,57 +12856,57 @@ GtkResponseType remove_from_filesystem_dialog (GtkWindow* owner, const gchar* ti
 	gchar* _tmp8_ = NULL;
 	GtkResponseType _result_ = 0;
 	gint _tmp9_ = 0;
-#line 1388 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1404 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (GTK_IS_WINDOW (owner), 0);
-#line 1388 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1404 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (title != NULL, 0);
-#line 1388 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1404 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (user_message != NULL, 0);
-#line 1390 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1406 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = owner;
-#line 1390 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1406 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = user_message;
-#line 1390 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1406 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = (GtkMessageDialog*) gtk_message_dialog_new (_tmp0_, GTK_DIALOG_MODAL, GTK_MESSAGE_QUESTION, GTK_BUTTONS_NONE, "%s", _tmp1_);
-#line 1390 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1406 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_object_ref_sink (_tmp2_);
-#line 1390 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1406 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	dialog = _tmp2_;
-#line 1392 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1408 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = _ ("_Keep");
-#line 1392 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1408 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_dialog_add_button (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_dialog_get_type (), GtkDialog), _tmp3_, (gint) GTK_RESPONSE_NO);
-#line 1393 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1409 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp4_ = _ ("_Delete");
-#line 1393 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1409 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_dialog_add_button (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_dialog_get_type (), GtkDialog), _tmp4_, (gint) GTK_RESPONSE_YES);
-#line 1394 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1410 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_dialog_set_default_response (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_dialog_get_type (), GtkDialog), (gint) GTK_RESPONSE_NO);
-#line 1396 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1412 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp5_ = title;
-#line 1396 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1412 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp6_ = user_message;
-#line 1396 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1412 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp7_ = build_alert_body_text (_tmp5_, _tmp6_, TRUE);
-#line 1396 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1412 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp8_ = _tmp7_;
-#line 1396 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1412 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_message_dialog_set_markup (dialog, _tmp8_);
-#line 1396 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1412 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (_tmp8_);
-#line 1398 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1414 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp9_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_dialog_get_type (), GtkDialog));
-#line 1398 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1414 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_result_ = (GtkResponseType) _tmp9_;
-#line 1400 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1416 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_widget_get_type (), GtkWidget));
-#line 1402 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1418 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	result = _result_;
-#line 1402 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1418 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (dialog);
-#line 1402 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1418 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 12767 "Dialogs.c"
+#line 12895 "Dialogs.c"
 }
 
 
@@ -12817,26 +12945,26 @@ gboolean revert_editable_dialog (GtkWindow* owner, GeeCollection* photos) {
 	gint _tmp37_ = 0;
 	GtkMessageDialog* _tmp38_ = NULL;
 	GtkResponseType _tmp39_ = 0;
-#line 1405 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1421 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (GTK_IS_WINDOW (owner), FALSE);
-#line 1405 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1421 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (GEE_IS_COLLECTION (photos), FALSE);
-#line 1406 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1422 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	count = 0;
-#line 12812 "Dialogs.c"
+#line 12940 "Dialogs.c"
 	{
 		GeeIterator* _photo_it = NULL;
 		GeeCollection* _tmp0_ = NULL;
 		GeeIterator* _tmp1_ = NULL;
-#line 1407 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1423 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp0_ = photos;
-#line 1407 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1423 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp1_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 1407 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1423 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_photo_it = _tmp1_;
-#line 1407 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1423 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		while (TRUE) {
-#line 12825 "Dialogs.c"
+#line 12953 "Dialogs.c"
 			GeeIterator* _tmp2_ = NULL;
 			gboolean _tmp3_ = FALSE;
 			Photo* photo = NULL;
@@ -12844,171 +12972,171 @@ gboolean revert_editable_dialog (GtkWindow* owner, GeeCollection* photos) {
 			gpointer _tmp5_ = NULL;
 			Photo* _tmp6_ = NULL;
 			gboolean _tmp7_ = FALSE;
-#line 1407 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1423 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp2_ = _photo_it;
-#line 1407 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1423 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp3_ = gee_iterator_next (_tmp2_);
-#line 1407 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1423 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			if (!_tmp3_) {
-#line 1407 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1423 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				break;
-#line 12841 "Dialogs.c"
+#line 12969 "Dialogs.c"
 			}
-#line 1407 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1423 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp4_ = _photo_it;
-#line 1407 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1423 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp5_ = gee_iterator_get (_tmp4_);
-#line 1407 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1423 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			photo = (Photo*) _tmp5_;
-#line 1408 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1424 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp6_ = photo;
-#line 1408 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1424 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp7_ = photo_has_editable (_tmp6_);
-#line 1408 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1424 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			if (_tmp7_) {
-#line 12855 "Dialogs.c"
+#line 12983 "Dialogs.c"
 				gint _tmp8_ = 0;
-#line 1409 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1425 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp8_ = count;
-#line 1409 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1425 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				count = _tmp8_ + 1;
-#line 12861 "Dialogs.c"
+#line 12989 "Dialogs.c"
 			}
-#line 1407 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1423 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_object_unref0 (photo);
-#line 12865 "Dialogs.c"
+#line 12993 "Dialogs.c"
 		}
-#line 1407 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1423 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (_photo_it);
-#line 12869 "Dialogs.c"
+#line 12997 "Dialogs.c"
 	}
-#line 1412 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1428 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp9_ = count;
-#line 1412 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1428 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp9_ == 0) {
-#line 1413 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1429 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		result = FALSE;
-#line 1413 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1429 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		return result;
-#line 12879 "Dialogs.c"
+#line 13007 "Dialogs.c"
 	}
-#line 1415 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1431 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp11_ = count;
-#line 1415 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1431 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp11_ == 1) {
-#line 12885 "Dialogs.c"
+#line 13013 "Dialogs.c"
 		const gchar* _tmp12_ = NULL;
-#line 1415 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1431 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp12_ = _ ("Revert External Edit?");
-#line 1415 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1431 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp10_ = _tmp12_;
-#line 12891 "Dialogs.c"
+#line 13019 "Dialogs.c"
 	} else {
 		const gchar* _tmp13_ = NULL;
-#line 1415 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1431 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp13_ = _ ("Revert External Edits?");
-#line 1415 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1431 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp10_ = _tmp13_;
-#line 12898 "Dialogs.c"
+#line 13026 "Dialogs.c"
 	}
-#line 1415 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1431 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp14_ = g_strdup (_tmp10_);
-#line 1415 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1431 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	headline = _tmp14_;
-#line 1416 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1432 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp15_ = count;
-#line 1416 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp16_ = ngettext ("This will destroy all changes made to the external file.  Continue?", "This will destroy all changes made to %d external files.  Continue?", (gulong) _tmp15_);
-#line 1416 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1432 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp16_ = ngettext ("This will destroy all changes made to the external file. Continue?", "This will destroy all changes made to %d external files. Continue?", (gulong) _tmp15_);
+#line 1432 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp17_ = count;
-#line 1416 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1432 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp18_ = g_strdup_printf (_tmp16_, _tmp17_);
-#line 1416 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1432 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	msg = _tmp18_;
-#line 1421 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1437 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp20_ = count;
-#line 1421 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1437 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp20_ == 1) {
-#line 12918 "Dialogs.c"
+#line 13046 "Dialogs.c"
 		const gchar* _tmp21_ = NULL;
-#line 1421 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1437 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp21_ = _ ("Re_vert External Edit");
-#line 1421 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1437 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp19_ = _tmp21_;
-#line 12924 "Dialogs.c"
+#line 13052 "Dialogs.c"
 	} else {
 		const gchar* _tmp22_ = NULL;
-#line 1421 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1437 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp22_ = _ ("Re_vert External Edits");
-#line 1421 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1437 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp19_ = _tmp22_;
-#line 12931 "Dialogs.c"
+#line 13059 "Dialogs.c"
 	}
-#line 1421 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1437 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp23_ = g_strdup (_tmp19_);
-#line 1421 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1437 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	action = _tmp23_;
-#line 1423 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1439 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp24_ = owner;
-#line 1423 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1439 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp25_ = msg;
-#line 1423 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1439 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp26_ = (GtkMessageDialog*) gtk_message_dialog_new (_tmp24_, GTK_DIALOG_MODAL, GTK_MESSAGE_WARNING, GTK_BUTTONS_NONE, "%s", _tmp25_);
-#line 1423 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1439 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_object_ref_sink (_tmp26_);
-#line 1423 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1439 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	dialog = _tmp26_;
-#line 1425 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1441 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp27_ = dialog;
-#line 1425 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1441 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp28_ = _ ("_Cancel");
-#line 1425 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1441 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_dialog_add_button (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, gtk_dialog_get_type (), GtkDialog), _tmp28_, (gint) GTK_RESPONSE_CANCEL);
-#line 1426 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1442 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp29_ = dialog;
-#line 1426 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1442 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp30_ = action;
-#line 1426 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1442 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_dialog_add_button (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, gtk_dialog_get_type (), GtkDialog), _tmp30_, (gint) GTK_RESPONSE_YES);
-#line 1428 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1444 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp31_ = dialog;
-#line 1428 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1444 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp32_ = headline;
-#line 1428 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1444 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp33_ = msg;
-#line 1428 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1444 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp34_ = build_alert_body_text (_tmp32_, _tmp33_, TRUE);
-#line 1428 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1444 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp35_ = _tmp34_;
-#line 1428 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1444 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_message_dialog_set_markup (_tmp31_, _tmp35_);
-#line 1428 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1444 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (_tmp35_);
-#line 1430 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1446 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp36_ = dialog;
-#line 1430 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1446 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp37_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, gtk_dialog_get_type (), GtkDialog));
-#line 1430 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1446 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_result_ = (GtkResponseType) _tmp37_;
-#line 1432 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1448 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp38_ = dialog;
-#line 1432 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1448 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, gtk_widget_get_type (), GtkWidget));
-#line 1434 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1450 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp39_ = _result_;
-#line 1434 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1450 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	result = _tmp39_ == GTK_RESPONSE_YES;
-#line 1434 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1450 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (dialog);
-#line 1434 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1450 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (action);
-#line 1434 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1450 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (msg);
-#line 1434 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1450 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (headline);
-#line 1434 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1450 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 12997 "Dialogs.c"
+#line 13125 "Dialogs.c"
 }
 
 
@@ -13036,110 +13164,110 @@ gboolean remove_offline_dialog (GtkWindow* owner, gint count) {
 	gint _tmp18_ = 0;
 	GtkMessageDialog* _tmp19_ = NULL;
 	GtkResponseType _tmp20_ = 0;
-#line 1437 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1453 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (GTK_IS_WINDOW (owner), FALSE);
-#line 1438 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1454 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = count;
-#line 1438 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1454 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp0_ == 0) {
-#line 1439 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1455 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		result = FALSE;
-#line 1439 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1455 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		return result;
-#line 13035 "Dialogs.c"
+#line 13163 "Dialogs.c"
 	}
-#line 1441 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1457 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = count;
-#line 1441 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp2_ = ngettext ("This will remove the photo from the library.  Continue?", "This will remove %d photos from the library.  Continue?", (gulong) _tmp1_);
-#line 1441 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1457 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp2_ = ngettext ("This will remove the photo from the library. Continue?", "This will remove %d photos from the library. Continue?", (gulong) _tmp1_);
+#line 1457 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = count;
-#line 1441 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1457 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp4_ = g_strdup_printf (_tmp2_, _tmp3_);
-#line 1441 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1457 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	msg = _tmp4_;
-#line 1446 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1462 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp5_ = owner;
-#line 1446 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1462 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp6_ = msg;
-#line 1446 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1462 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp7_ = (GtkMessageDialog*) gtk_message_dialog_new (_tmp5_, GTK_DIALOG_MODAL, GTK_MESSAGE_WARNING, GTK_BUTTONS_NONE, "%s", _tmp6_);
-#line 1446 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1462 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_object_ref_sink (_tmp7_);
-#line 1446 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1462 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	dialog = _tmp7_;
-#line 1448 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1464 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp8_ = dialog;
-#line 1448 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1464 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp9_ = _ ("_Cancel");
-#line 1448 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1464 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_dialog_add_button (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_dialog_get_type (), GtkDialog), _tmp9_, (gint) GTK_RESPONSE_CANCEL);
-#line 1449 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1465 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp10_ = dialog;
-#line 1449 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1465 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp11_ = _ ("_Remove");
-#line 1449 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1465 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_dialog_add_button (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_dialog_get_type (), GtkDialog), _tmp11_, (gint) GTK_RESPONSE_OK);
-#line 1450 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1466 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp13_ = count;
-#line 1450 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1466 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp13_ == 1) {
-#line 13073 "Dialogs.c"
+#line 13201 "Dialogs.c"
 		const gchar* _tmp14_ = NULL;
-#line 1450 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1466 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp14_ = _ ("Remove Photo From Library");
-#line 1450 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1466 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp12_ = _tmp14_;
-#line 13079 "Dialogs.c"
+#line 13207 "Dialogs.c"
 	} else {
 		const gchar* _tmp15_ = NULL;
-#line 1450 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1466 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp15_ = _ ("Remove Photos From Library");
-#line 1450 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1466 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp12_ = _tmp15_;
-#line 13086 "Dialogs.c"
+#line 13214 "Dialogs.c"
 	}
-#line 1450 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1466 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp16_ = dialog;
-#line 1450 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1466 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_window_set_title (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, gtk_window_get_type (), GtkWindow), _tmp12_);
-#line 1452 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1468 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp17_ = dialog;
-#line 1452 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1468 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp18_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_dialog_get_type (), GtkDialog));
-#line 1452 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1468 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_result_ = (GtkResponseType) _tmp18_;
-#line 1454 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1470 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp19_ = dialog;
-#line 1454 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1470 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, gtk_widget_get_type (), GtkWidget));
-#line 1456 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1472 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp20_ = _result_;
-#line 1456 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1472 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	result = _tmp20_ == GTK_RESPONSE_OK;
-#line 1456 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1472 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (dialog);
-#line 1456 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1472 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (msg);
-#line 1456 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1472 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 13112 "Dialogs.c"
+#line 13240 "Dialogs.c"
 }
 
 
 static void _progress_dialog_on_cancel_gtk_button_clicked (GtkButton* _sender, gpointer self) {
-#line 1489 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1505 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	progress_dialog_on_cancel ((ProgressDialog*) self);
-#line 13119 "Dialogs.c"
+#line 13247 "Dialogs.c"
 }
 
 
 static gboolean _progress_dialog_on_window_closed_gtk_widget_delete_event (GtkWidget* _sender, GdkEventAny* event, gpointer self) {
 	gboolean result;
 	result = progress_dialog_on_window_closed ((ProgressDialog*) self);
-#line 1490 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1506 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 13128 "Dialogs.c"
+#line 13256 "Dialogs.c"
 }
 
 
@@ -13172,201 +13300,201 @@ ProgressDialog* progress_dialog_construct (GType object_type, GtkWindow* owner,
 	GtkAlignment* alignment = NULL;
 	GtkAlignment* _tmp25_ = NULL;
 	gulong _tmp26_ = 0UL;
-#line 1471 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1487 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail ((owner == NULL) || GTK_IS_WINDOW (owner), NULL);
-#line 1471 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1487 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (text != NULL, NULL);
-#line 1471 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1487 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail ((cancellable == NULL) || G_IS_CANCELLABLE (cancellable), NULL);
-#line 1471 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1487 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self = (ProgressDialog*) g_object_new (object_type, NULL);
-#line 1472 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1488 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = cancellable;
-#line 1472 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1488 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 1472 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1488 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->cancellable);
-#line 1472 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1488 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->cancellable = _tmp1_;
-#line 1474 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1490 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = text;
-#line 1474 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1490 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_window_set_title (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), _tmp2_);
-#line 1475 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1491 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_window_set_resizable (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), FALSE);
-#line 1476 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1492 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = owner;
-#line 1476 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1492 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp3_ != NULL) {
-#line 13187 "Dialogs.c"
+#line 13315 "Dialogs.c"
 		GtkWindow* _tmp4_ = NULL;
-#line 1477 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1493 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp4_ = owner;
-#line 1477 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1493 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_window_set_transient_for (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), _tmp4_);
-#line 13193 "Dialogs.c"
+#line 13321 "Dialogs.c"
 	}
-#line 1478 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1494 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_window_set_modal (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), TRUE);
-#line 1479 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1495 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_window_set_type_hint (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), GDK_WINDOW_TYPE_HINT_DIALOG);
-#line 1481 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1497 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp5_ = self->priv->progress_bar;
-#line 1481 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1497 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_widget_get_type (), GtkWidget), 300, -1);
-#line 1482 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1498 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp6_ = self->priv->progress_bar;
-#line 1482 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1498 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_progress_bar_set_show_text (_tmp6_, TRUE);
-#line 1484 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1500 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp7_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
-#line 1484 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1500 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_object_ref_sink (_tmp7_);
-#line 1484 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1500 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	vbox_bar = _tmp7_;
-#line 1485 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1501 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp8_ = vbox_bar;
-#line 1485 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1501 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp9_ = self->priv->progress_bar;
-#line 1485 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1501 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_box_pack_start (_tmp8_, G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_widget_get_type (), GtkWidget), TRUE, FALSE, (guint) 0);
-#line 1487 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1503 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp10_ = cancellable;
-#line 1487 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1503 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp10_ != NULL) {
-#line 13223 "Dialogs.c"
+#line 13351 "Dialogs.c"
 		GtkButton* _tmp11_ = NULL;
 		GtkButton* _tmp12_ = NULL;
-#line 1488 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1504 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp11_ = (GtkButton*) gtk_button_new_with_mnemonic (RESOURCES_CANCEL_LABEL);
-#line 1488 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1504 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		g_object_ref_sink (_tmp11_);
-#line 1488 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1504 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (self->priv->cancel_button);
-#line 1488 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1504 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		self->priv->cancel_button = _tmp11_;
-#line 1489 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1505 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp12_ = self->priv->cancel_button;
-#line 1489 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1505 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		g_signal_connect_object (_tmp12_, "clicked", (GCallback) _progress_dialog_on_cancel_gtk_button_clicked, self, 0);
-#line 1490 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1506 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), "delete-event", (GCallback) _progress_dialog_on_window_closed_gtk_widget_delete_event, self, 0);
-#line 13240 "Dialogs.c"
+#line 13368 "Dialogs.c"
 	}
-#line 1493 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1509 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp13_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 8);
-#line 1493 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1509 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_object_ref_sink (_tmp13_);
-#line 1493 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1509 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	hbox = _tmp13_;
-#line 1494 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1510 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp14_ = hbox;
-#line 1494 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1510 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp15_ = vbox_bar;
-#line 1494 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1510 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_box_pack_start (_tmp14_, G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, gtk_widget_get_type (), GtkWidget), TRUE, FALSE, (guint) 0);
-#line 1495 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1511 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp16_ = self->priv->cancel_button;
-#line 1495 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1511 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp16_ != NULL) {
-#line 13258 "Dialogs.c"
+#line 13386 "Dialogs.c"
 		GtkBox* _tmp17_ = NULL;
 		GtkButton* _tmp18_ = NULL;
-#line 1496 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1512 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp17_ = hbox;
-#line 1496 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1512 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp18_ = self->priv->cancel_button;
-#line 1496 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1512 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_box_pack_end (_tmp17_, G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
-#line 13267 "Dialogs.c"
+#line 13395 "Dialogs.c"
 	}
-#line 1498 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1514 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp19_ = (GtkLabel*) gtk_label_new ("");
-#line 1498 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1514 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_object_ref_sink (_tmp19_);
-#line 1498 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1514 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	primary_text_label = _tmp19_;
-#line 1499 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1515 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp20_ = text;
-#line 1499 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1515 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp21_ = g_strdup_printf ("<span weight=\"bold\">%s</span>", _tmp20_);
-#line 1499 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1515 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp22_ = _tmp21_;
-#line 1499 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1515 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_label_set_markup (primary_text_label, _tmp22_);
-#line 1499 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1515 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (_tmp22_);
-#line 1500 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1516 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_misc_set_alignment (G_TYPE_CHECK_INSTANCE_CAST (primary_text_label, gtk_misc_get_type (), GtkMisc), (gfloat) 0, 0.5f);
-#line 1502 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1518 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp23_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
-#line 1502 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1518 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_object_ref_sink (_tmp23_);
-#line 1502 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1518 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	vbox = _tmp23_;
-#line 1503 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1519 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_box_pack_start (vbox, G_TYPE_CHECK_INSTANCE_CAST (primary_text_label, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
-#line 1504 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1520 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp24_ = hbox;
-#line 1504 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1520 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_box_pack_start (vbox, G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, gtk_widget_get_type (), GtkWidget), TRUE, FALSE, (guint) 0);
-#line 1506 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1522 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp25_ = (GtkAlignment*) gtk_alignment_new (0.5f, 0.5f, 1.0f, 1.0f);
-#line 1506 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1522 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_object_ref_sink (_tmp25_);
-#line 1506 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1522 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	alignment = _tmp25_;
-#line 1507 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1523 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_alignment_set_padding (alignment, (guint) 12, (guint) 12, (guint) 12, (guint) 12);
-#line 1508 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1524 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (alignment, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (vbox, gtk_widget_get_type (), GtkWidget));
-#line 1510 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1526 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (alignment, gtk_widget_get_type (), GtkWidget));
-#line 1512 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1528 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp26_ = now_ms ();
-#line 1512 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1528 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->time_started = _tmp26_;
-#line 1471 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1487 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (alignment);
-#line 1471 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1487 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (vbox);
-#line 1471 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1487 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (primary_text_label);
-#line 1471 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1487 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (hbox);
-#line 1471 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1487 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (vbox_bar);
-#line 1471 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1487 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return self;
-#line 13327 "Dialogs.c"
+#line 13455 "Dialogs.c"
 }
 
 
 ProgressDialog* progress_dialog_new (GtkWindow* owner, const gchar* text, GCancellable* cancellable) {
-#line 1471 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1487 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return progress_dialog_construct (TYPE_PROGRESS_DIALOG, owner, text, cancellable);
-#line 13334 "Dialogs.c"
+#line 13462 "Dialogs.c"
 }
 
 
 static void progress_dialog_real_realize (GtkWidget* base) {
 	ProgressDialog * self;
 	GCancellable* _tmp0_ = NULL;
-#line 1515 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1531 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PROGRESS_DIALOG, ProgressDialog);
-#line 1516 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1532 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	GTK_WIDGET_CLASS (progress_dialog_parent_class)->realize (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), gtk_widget_get_type (), GtkWidget));
-#line 1519 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1535 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = self->priv->cancellable;
-#line 1519 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1535 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp0_ == NULL) {
-#line 13349 "Dialogs.c"
+#line 13477 "Dialogs.c"
 		GdkWindow* _tmp1_ = NULL;
-#line 1520 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1536 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp1_ = gtk_widget_get_window (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 1520 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1536 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gdk_window_set_functions (_tmp1_, GDK_FUNC_MOVE);
-#line 13355 "Dialogs.c"
+#line 13483 "Dialogs.c"
 	}
 }
 
@@ -13374,44 +13502,44 @@ static void progress_dialog_real_realize (GtkWidget* base) {
 void progress_dialog_update_display_every (ProgressDialog* self, gint update_every) {
 	gint _tmp0_ = 0;
 	gint _tmp1_ = 0;
-#line 1523 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1539 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_PROGRESS_DIALOG (self));
-#line 1524 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1540 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = update_every;
-#line 1524 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1540 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_vala_assert (_tmp0_ >= 1, "update_every >= 1");
-#line 1526 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1542 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = update_every;
-#line 1526 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1542 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->update_every = _tmp1_;
-#line 13373 "Dialogs.c"
+#line 13501 "Dialogs.c"
 }
 
 
 void progress_dialog_set_minimum_on_screen_time_msec (ProgressDialog* self, gint minimum_on_screen_time_msec) {
 	gint _tmp0_ = 0;
-#line 1529 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1545 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_PROGRESS_DIALOG (self));
-#line 1530 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1546 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = minimum_on_screen_time_msec;
-#line 1530 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1546 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->minimum_on_screen_time_msec = _tmp0_;
-#line 13385 "Dialogs.c"
+#line 13513 "Dialogs.c"
 }
 
 
 void progress_dialog_set_fraction (ProgressDialog* self, gint current, gint total) {
 	gint _tmp0_ = 0;
 	gint _tmp1_ = 0;
-#line 1533 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1549 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_PROGRESS_DIALOG (self));
-#line 1534 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1550 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = current;
-#line 1534 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1550 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = total;
-#line 1534 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1550 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	progress_dialog_set_percentage (self, ((gdouble) _tmp0_) / ((gdouble) _tmp1_));
-#line 13400 "Dialogs.c"
+#line 13528 "Dialogs.c"
 }
 
 
@@ -13426,58 +13554,58 @@ void progress_dialog_set_percentage (ProgressDialog* self, gdouble pct) {
 	gdouble _tmp7_ = 0.0;
 	gchar* _tmp8_ = NULL;
 	gchar* _tmp9_ = NULL;
-#line 1537 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1553 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_PROGRESS_DIALOG (self));
-#line 1538 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1554 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = pct;
-#line 1538 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1554 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = CLAMP (_tmp0_, 0.0, 1.0);
-#line 1538 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1554 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	pct = _tmp1_;
-#line 1540 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1556 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = pct;
-#line 1540 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1556 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	progress_dialog_maybe_show_all (self, _tmp2_);
-#line 1542 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1558 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = self->priv->progress_bar;
-#line 1542 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1558 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp4_ = pct;
-#line 1542 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1558 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_progress_bar_set_fraction (_tmp3_, _tmp4_);
-#line 1543 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1559 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp5_ = self->priv->progress_bar;
-#line 1543 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1559 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp6_ = _ ("%d%%");
-#line 1543 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1559 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp7_ = pct;
-#line 1543 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1559 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp8_ = g_strdup_printf (_tmp6_, (gint) (_tmp7_ * 100.0));
-#line 1543 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1559 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp9_ = _tmp8_;
-#line 1543 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1559 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_progress_bar_set_text (_tmp5_, _tmp9_);
-#line 1543 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1559 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (_tmp9_);
-#line 13447 "Dialogs.c"
+#line 13575 "Dialogs.c"
 }
 
 
 void progress_dialog_set_status (ProgressDialog* self, const gchar* text) {
 	GtkProgressBar* _tmp0_ = NULL;
 	const gchar* _tmp1_ = NULL;
-#line 1551 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1567 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_PROGRESS_DIALOG (self));
-#line 1551 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1567 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (text != NULL);
-#line 1552 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1568 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = self->priv->progress_bar;
-#line 1552 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1568 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = text;
-#line 1552 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1568 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_progress_bar_set_text (_tmp0_, _tmp1_);
-#line 1558 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1574 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 13466 "Dialogs.c"
+#line 13594 "Dialogs.c"
 }
 
 
@@ -13489,131 +13617,131 @@ gboolean progress_dialog_monitor (ProgressDialog* self, guint64 count, guint64 t
 	GCancellable* _tmp9_ = NULL;
 	gboolean keep_going = FALSE;
 	gboolean _tmp12_ = FALSE;
-#line 1562 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1578 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (IS_PROGRESS_DIALOG (self), FALSE);
-#line 1563 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1579 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = self->priv->last_count;
-#line 1563 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1579 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp1_ == G_MAXUINT64) {
-#line 1563 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1579 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp0_ = TRUE;
-#line 13486 "Dialogs.c"
+#line 13614 "Dialogs.c"
 	} else {
 		guint64 _tmp2_ = 0ULL;
 		guint64 _tmp3_ = 0ULL;
 		gint _tmp4_ = 0;
-#line 1563 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1579 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp2_ = count;
-#line 1563 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1579 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp3_ = self->priv->last_count;
-#line 1563 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1579 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp4_ = self->priv->update_every;
-#line 1563 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1579 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp0_ = (_tmp2_ - _tmp3_) >= ((guint64) _tmp4_);
-#line 13499 "Dialogs.c"
+#line 13627 "Dialogs.c"
 	}
-#line 1563 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1579 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp0_) {
-#line 13503 "Dialogs.c"
+#line 13631 "Dialogs.c"
 		guint64 _tmp5_ = 0ULL;
 		guint64 _tmp6_ = 0ULL;
 		guint64 _tmp7_ = 0ULL;
-#line 1564 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1580 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp5_ = count;
-#line 1564 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1580 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp6_ = total;
-#line 1564 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1580 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		progress_dialog_set_percentage (self, ((gdouble) _tmp5_) / ((gdouble) _tmp6_));
-#line 1565 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1581 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp7_ = count;
-#line 1565 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1581 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		self->priv->last_count = _tmp7_;
-#line 13517 "Dialogs.c"
+#line 13645 "Dialogs.c"
 	}
-#line 1568 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1584 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp9_ = self->priv->cancellable;
-#line 1568 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1584 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp9_ != NULL) {
-#line 13523 "Dialogs.c"
+#line 13651 "Dialogs.c"
 		GCancellable* _tmp10_ = NULL;
 		gboolean _tmp11_ = FALSE;
-#line 1568 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1584 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp10_ = self->priv->cancellable;
-#line 1568 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1584 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp11_ = g_cancellable_is_cancelled (_tmp10_);
-#line 1568 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1584 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp8_ = !_tmp11_;
-#line 13532 "Dialogs.c"
+#line 13660 "Dialogs.c"
 	} else {
-#line 1568 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1584 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp8_ = TRUE;
-#line 13536 "Dialogs.c"
+#line 13664 "Dialogs.c"
 	}
-#line 1568 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1584 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	keep_going = _tmp8_;
-#line 1576 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1592 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp12_ = do_event_loop;
-#line 1576 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1592 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp12_) {
-#line 1577 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1593 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		spin_event_loop ();
-#line 13546 "Dialogs.c"
+#line 13674 "Dialogs.c"
 	}
-#line 1579 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1595 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	result = keep_going;
-#line 1579 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1595 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 13552 "Dialogs.c"
+#line 13680 "Dialogs.c"
 }
 
 
 void progress_dialog_close (ProgressDialog* self) {
-#line 1582 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1598 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_PROGRESS_DIALOG (self));
-#line 1587 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1603 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 1588 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1604 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 13563 "Dialogs.c"
+#line 13691 "Dialogs.c"
 }
 
 
 static gboolean progress_dialog_on_window_closed (ProgressDialog* self) {
 	gboolean result = FALSE;
-#line 1591 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1607 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (IS_PROGRESS_DIALOG (self), FALSE);
-#line 1592 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1608 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	progress_dialog_on_cancel (self);
-#line 1593 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1609 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	result = FALSE;
-#line 1593 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1609 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 13577 "Dialogs.c"
+#line 13705 "Dialogs.c"
 }
 
 
 static void progress_dialog_on_cancel (ProgressDialog* self) {
 	GCancellable* _tmp0_ = NULL;
 	GtkButton* _tmp2_ = NULL;
-#line 1597 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1613 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_PROGRESS_DIALOG (self));
-#line 1598 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1614 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = self->priv->cancellable;
-#line 1598 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1614 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp0_ != NULL) {
-#line 13590 "Dialogs.c"
+#line 13718 "Dialogs.c"
 		GCancellable* _tmp1_ = NULL;
-#line 1599 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1615 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp1_ = self->priv->cancellable;
-#line 1599 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1615 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		g_cancellable_cancel (_tmp1_);
-#line 13596 "Dialogs.c"
+#line 13724 "Dialogs.c"
 	}
-#line 1601 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1617 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = self->priv->cancel_button;
-#line 1601 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1617 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 13602 "Dialogs.c"
+#line 13730 "Dialogs.c"
 }
 
 
@@ -13621,35 +13749,35 @@ static void progress_dialog_maybe_show_all (ProgressDialog* self, gdouble pct) {
 	gboolean _tmp0_ = FALSE;
 	gboolean _tmp1_ = FALSE;
 	gboolean _tmp2_ = FALSE;
-#line 1604 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1620 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_PROGRESS_DIALOG (self));
-#line 1607 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1623 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = gtk_widget_get_visible (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 1607 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1623 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = _tmp1_;
-#line 1607 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1623 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (!_tmp2_) {
-#line 13618 "Dialogs.c"
+#line 13746 "Dialogs.c"
 		gulong _tmp3_ = 0UL;
 		gulong _tmp4_ = 0UL;
 		gint _tmp5_ = 0;
-#line 1607 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1623 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp3_ = now_ms ();
-#line 1607 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1623 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp4_ = self->priv->time_started;
-#line 1607 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1623 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp5_ = self->priv->minimum_on_screen_time_msec;
-#line 1607 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1623 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp0_ = (_tmp3_ - _tmp4_) > ((gulong) _tmp5_);
-#line 13630 "Dialogs.c"
+#line 13758 "Dialogs.c"
 	} else {
-#line 1607 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1623 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp0_ = FALSE;
-#line 13634 "Dialogs.c"
+#line 13762 "Dialogs.c"
 	}
-#line 1607 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1623 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp0_) {
-#line 13638 "Dialogs.c"
+#line 13766 "Dialogs.c"
 		gdouble pps = 0.0;
 		gdouble _tmp6_ = 0.0;
 		gint _tmp7_ = 0;
@@ -13657,80 +13785,80 @@ static void progress_dialog_maybe_show_all (ProgressDialog* self, gdouble pct) {
 		gdouble _tmp8_ = 0.0;
 		gdouble _tmp9_ = 0.0;
 		gint _tmp10_ = 0;
-#line 1609 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1625 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp6_ = pct;
-#line 1609 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1625 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp7_ = self->priv->minimum_on_screen_time_msec;
-#line 1609 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1625 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		pps = (_tmp6_ * 100.0) / _tmp7_;
-#line 1611 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1627 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp8_ = pps;
-#line 1611 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1627 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		ttc = 100.0 / _tmp8_;
-#line 1614 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1630 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp9_ = ttc;
-#line 1614 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1630 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp10_ = self->priv->minimum_on_screen_time_msec;
-#line 1614 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1630 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (_tmp9_ > ((gdouble) _tmp10_)) {
-#line 1619 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1635 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 1620 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1636 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			spin_event_loop ();
-#line 13666 "Dialogs.c"
+#line 13794 "Dialogs.c"
 		}
 	}
 }
 
 
 static void progress_dialog_class_init (ProgressDialogClass * klass) {
-#line 1459 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1475 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	progress_dialog_parent_class = g_type_class_peek_parent (klass);
-#line 1459 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1475 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_type_class_add_private (klass, sizeof (ProgressDialogPrivate));
-#line 1459 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1475 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	((GtkWidgetClass *) klass)->realize = progress_dialog_real_realize;
-#line 1459 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1475 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	G_OBJECT_CLASS (klass)->finalize = progress_dialog_finalize;
-#line 13681 "Dialogs.c"
+#line 13809 "Dialogs.c"
 }
 
 
 static void progress_dialog_instance_init (ProgressDialog * self) {
 	GtkProgressBar* _tmp0_ = NULL;
-#line 1459 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1475 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv = PROGRESS_DIALOG_GET_PRIVATE (self);
-#line 1460 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1476 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = (GtkProgressBar*) gtk_progress_bar_new ();
-#line 1460 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1476 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_object_ref_sink (_tmp0_);
-#line 1460 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1476 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->progress_bar = _tmp0_;
-#line 1461 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1477 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->cancel_button = NULL;
-#line 1463 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1479 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->last_count = G_MAXUINT64;
-#line 1464 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1480 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->update_every = 1;
-#line 1465 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1481 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->minimum_on_screen_time_msec = 500;
-#line 13703 "Dialogs.c"
+#line 13831 "Dialogs.c"
 }
 
 
 static void progress_dialog_finalize (GObject* obj) {
 	ProgressDialog * self;
-#line 1459 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1475 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PROGRESS_DIALOG, ProgressDialog);
-#line 1460 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1476 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->progress_bar);
-#line 1461 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1477 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->cancel_button);
-#line 1462 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1478 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->cancellable);
-#line 1459 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1475 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	G_OBJECT_CLASS (progress_dialog_parent_class)->finalize (obj);
-#line 13719 "Dialogs.c"
+#line 13847 "Dialogs.c"
 }
 
 
@@ -13759,53 +13887,53 @@ static GType adjust_date_time_dialog_time_system_get_type (void) {
 
 
 static void _adjust_date_time_dialog_on_time_changed_gtk_calendar_day_selected (GtkCalendar* _sender, gpointer self) {
-#line 1672 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1688 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	adjust_date_time_dialog_on_time_changed ((AdjustDateTimeDialog*) self);
-#line 13750 "Dialogs.c"
+#line 13878 "Dialogs.c"
 }
 
 
 static void _adjust_date_time_dialog_on_time_changed_gtk_calendar_month_changed (GtkCalendar* _sender, gpointer self) {
-#line 1673 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1689 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	adjust_date_time_dialog_on_time_changed ((AdjustDateTimeDialog*) self);
-#line 13757 "Dialogs.c"
+#line 13885 "Dialogs.c"
 }
 
 
 static void _adjust_date_time_dialog_on_time_changed_gtk_calendar_next_year (GtkCalendar* _sender, gpointer self) {
-#line 1674 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1690 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	adjust_date_time_dialog_on_time_changed ((AdjustDateTimeDialog*) self);
-#line 13764 "Dialogs.c"
+#line 13892 "Dialogs.c"
 }
 
 
 static void _adjust_date_time_dialog_on_time_changed_gtk_calendar_prev_year (GtkCalendar* _sender, gpointer self) {
-#line 1675 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1691 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	adjust_date_time_dialog_on_time_changed ((AdjustDateTimeDialog*) self);
-#line 13771 "Dialogs.c"
+#line 13899 "Dialogs.c"
 }
 
 
 static gboolean _adjust_date_time_dialog_on_spin_button_output_gtk_spin_button_output (GtkSpinButton* _sender, gpointer self) {
 	gboolean result;
 	result = adjust_date_time_dialog_on_spin_button_output ((AdjustDateTimeDialog*) self, _sender);
-#line 1682 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1698 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 13780 "Dialogs.c"
+#line 13908 "Dialogs.c"
 }
 
 
 static void _adjust_date_time_dialog_on_time_system_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
-#line 1700 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1716 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	adjust_date_time_dialog_on_time_system_changed ((AdjustDateTimeDialog*) self);
-#line 13787 "Dialogs.c"
+#line 13915 "Dialogs.c"
 }
 
 
 static void _adjust_date_time_dialog_on_time_changed_gtk_toggle_button_toggled (GtkToggleButton* _sender, gpointer self) {
-#line 1722 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1738 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	adjust_date_time_dialog_on_time_changed ((AdjustDateTimeDialog*) self);
-#line 13794 "Dialogs.c"
+#line 13922 "Dialogs.c"
 }
 
 
@@ -13820,7 +13948,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 13809 "Dialogs.c"
+#line 13937 "Dialogs.c"
 }
 
 
@@ -13956,792 +14084,792 @@ AdjustDateTimeDialog* adjust_date_time_dialog_construct (GType object_type, Date
 	ConfigFacade* _tmp157_ = NULL;
 	gboolean _tmp158_ = FALSE;
 	GError * _inner_error_ = NULL;
-#line 1655 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1671 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (IS_DATEABLE (source), NULL);
-#line 1657 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1673 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = source;
-#line 1657 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1673 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_vala_assert (_tmp0_ != NULL, "source != null");
-#line 1660 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1676 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = gtk_settings_get_default ();
-#line 1660 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1676 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_object_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, G_TYPE_OBJECT, GObject), "gtk-dialogs-use-header", &use_header, NULL);
-#line 1661 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1677 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = use_header;
-#line 1661 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1677 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp3_) {
-#line 1661 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1677 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp2_ = 1;
-#line 13961 "Dialogs.c"
+#line 14089 "Dialogs.c"
 	} else {
-#line 1661 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1677 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp2_ = 0;
-#line 13965 "Dialogs.c"
+#line 14093 "Dialogs.c"
 	}
-#line 1661 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1677 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self = (AdjustDateTimeDialog*) g_object_new (object_type, "use-header-bar", _tmp2_, NULL);
-#line 1663 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1679 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_window_set_modal (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), TRUE);
-#line 1664 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1680 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_window_set_resizable (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), FALSE);
-#line 1665 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1681 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp4_ = app_window_get_instance ();
-#line 1665 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1681 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp5_ = _tmp4_;
-#line 1665 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1681 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_window_set_transient_for (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_window_get_type (), GtkWindow));
-#line 1665 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1681 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (_tmp5_);
-#line 1667 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1683 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_dialog_add_buttons (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), RESOURCES_CANCEL_LABEL, GTK_RESPONSE_CANCEL, RESOURCES_OK_LABEL, GTK_RESPONSE_OK, NULL);
-#line 1669 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1685 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_window_set_title (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), RESOURCES_ADJUST_DATE_TIME_LABEL);
-#line 1671 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1687 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp6_ = (GtkCalendar*) gtk_calendar_new ();
-#line 1671 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1687 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_object_ref_sink (_tmp6_);
-#line 1671 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1687 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->calendar);
-#line 1671 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1687 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->calendar = _tmp6_;
-#line 1672 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1688 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp7_ = self->priv->calendar;
-#line 1672 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1688 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_signal_connect_object (_tmp7_, "day-selected", (GCallback) _adjust_date_time_dialog_on_time_changed_gtk_calendar_day_selected, self, 0);
-#line 1673 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1689 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp8_ = self->priv->calendar;
-#line 1673 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1689 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_signal_connect_object (_tmp8_, "month-changed", (GCallback) _adjust_date_time_dialog_on_time_changed_gtk_calendar_month_changed, self, 0);
-#line 1674 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1690 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp9_ = self->priv->calendar;
-#line 1674 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1690 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_signal_connect_object (_tmp9_, "next-year", (GCallback) _adjust_date_time_dialog_on_time_changed_gtk_calendar_next_year, self, 0);
-#line 1675 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1691 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp10_ = self->priv->calendar;
-#line 1675 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1691 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_signal_connect_object (_tmp10_, "prev-year", (GCallback) _adjust_date_time_dialog_on_time_changed_gtk_calendar_prev_year, self, 0);
-#line 1677 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1693 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp11_ = config_facade_get_instance ();
-#line 1677 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1693 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp12_ = _tmp11_;
-#line 1677 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1693 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp13_ = configuration_facade_get_use_24_hour_time (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 1677 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1693 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp14_ = _tmp13_;
-#line 1677 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1693 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (_tmp12_);
-#line 1677 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1693 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp14_) {
-#line 14021 "Dialogs.c"
+#line 14149 "Dialogs.c"
 		GtkSpinButton* _tmp15_ = NULL;
-#line 1678 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1694 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp15_ = (GtkSpinButton*) gtk_spin_button_new_with_range ((gdouble) 0, (gdouble) 23, (gdouble) 1);
-#line 1678 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1694 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		g_object_ref_sink (_tmp15_);
-#line 1678 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1694 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (self->priv->hour);
-#line 1678 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1694 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		self->priv->hour = _tmp15_;
-#line 14031 "Dialogs.c"
+#line 14159 "Dialogs.c"
 	} else {
 		GtkSpinButton* _tmp16_ = NULL;
-#line 1680 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1696 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp16_ = (GtkSpinButton*) gtk_spin_button_new_with_range ((gdouble) 1, (gdouble) 12, (gdouble) 1);
-#line 1680 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1696 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		g_object_ref_sink (_tmp16_);
-#line 1680 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1696 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (self->priv->hour);
-#line 1680 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1696 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		self->priv->hour = _tmp16_;
-#line 14042 "Dialogs.c"
+#line 14170 "Dialogs.c"
 	}
-#line 1682 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1698 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp17_ = self->priv->hour;
-#line 1682 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1698 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_signal_connect_object (_tmp17_, "output", (GCallback) _adjust_date_time_dialog_on_spin_button_output_gtk_spin_button_output, self, 0);
-#line 1683 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1699 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp18_ = self->priv->hour;
-#line 1683 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1699 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_entry_set_width_chars (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_entry_get_type (), GtkEntry), 2);
-#line 1684 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1700 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp19_ = self->priv->hour;
-#line 1684 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1700 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_entry_set_max_width_chars (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, gtk_entry_get_type (), GtkEntry), 2);
-#line 1686 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1702 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp20_ = (GtkSpinButton*) gtk_spin_button_new_with_range ((gdouble) 0, (gdouble) 59, (gdouble) 1);
-#line 1686 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1702 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_object_ref_sink (_tmp20_);
-#line 1686 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1702 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->minute);
-#line 1686 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1702 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->minute = _tmp20_;
-#line 1687 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1703 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp21_ = self->priv->minute;
-#line 1687 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1703 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_entry_set_width_chars (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, gtk_entry_get_type (), GtkEntry), 2);
-#line 1688 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1704 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp22_ = self->priv->minute;
-#line 1688 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1704 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_entry_set_max_width_chars (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, gtk_entry_get_type (), GtkEntry), 2);
-#line 1689 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1705 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp23_ = self->priv->minute;
-#line 1689 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1705 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_signal_connect_object (_tmp23_, "output", (GCallback) _adjust_date_time_dialog_on_spin_button_output_gtk_spin_button_output, self, 0);
-#line 1691 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1707 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp24_ = (GtkSpinButton*) gtk_spin_button_new_with_range ((gdouble) 0, (gdouble) 59, (gdouble) 1);
-#line 1691 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1707 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_object_ref_sink (_tmp24_);
-#line 1691 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1707 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->second);
-#line 1691 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1707 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->second = _tmp24_;
-#line 1692 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1708 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp25_ = self->priv->second;
-#line 1692 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1708 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_entry_set_width_chars (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, gtk_entry_get_type (), GtkEntry), 2);
-#line 1693 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1709 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp26_ = self->priv->second;
-#line 1693 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1709 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_entry_set_max_width_chars (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, gtk_entry_get_type (), GtkEntry), 2);
-#line 1694 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1710 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp27_ = self->priv->second;
-#line 1694 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1710 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_signal_connect_object (_tmp27_, "output", (GCallback) _adjust_date_time_dialog_on_spin_button_output_gtk_spin_button_output, self, 0);
-#line 1696 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1712 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp28_ = (GtkComboBoxText*) gtk_combo_box_text_new ();
-#line 1696 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1712 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_object_ref_sink (_tmp28_);
-#line 1696 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1712 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->system);
-#line 1696 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1712 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->system = _tmp28_;
-#line 1697 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1713 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp29_ = self->priv->system;
-#line 1697 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1713 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp30_ = _ ("AM");
-#line 1697 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1713 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_combo_box_text_append_text (_tmp29_, _tmp30_);
-#line 1698 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1714 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp31_ = self->priv->system;
-#line 1698 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1714 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp32_ = _ ("PM");
-#line 1698 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1714 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_combo_box_text_append_text (_tmp31_, _tmp32_);
-#line 1699 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1715 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp33_ = self->priv->system;
-#line 1699 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1715 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp34_ = _ ("24 Hr");
-#line 1699 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1715 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_combo_box_text_append_text (_tmp33_, _tmp34_);
-#line 1700 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1716 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp35_ = self->priv->system;
-#line 1700 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1716 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _adjust_date_time_dialog_on_time_system_changed_gtk_combo_box_changed, self, 0);
-#line 1702 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1718 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp36_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 3);
-#line 1702 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1718 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_object_ref_sink (_tmp36_);
-#line 1702 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1718 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	clock = _tmp36_;
-#line 1704 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1720 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp37_ = clock;
-#line 1704 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1720 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp38_ = self->priv->hour;
-#line 1704 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1720 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_box_pack_start (_tmp37_, G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
-#line 1705 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1721 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp39_ = clock;
-#line 1705 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1721 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp40_ = (GtkLabel*) gtk_label_new (":");
-#line 1705 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1721 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_object_ref_sink (_tmp40_);
-#line 1705 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1721 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp41_ = _tmp40_;
-#line 1705 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1721 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_box_pack_start (_tmp39_, G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
-#line 1705 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1721 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (_tmp41_);
-#line 1706 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1722 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp42_ = clock;
-#line 1706 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1722 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp43_ = self->priv->minute;
-#line 1706 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1722 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_box_pack_start (_tmp42_, G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
-#line 1707 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1723 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp44_ = clock;
-#line 1707 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1723 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp45_ = (GtkLabel*) gtk_label_new (":");
-#line 1707 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1723 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_object_ref_sink (_tmp45_);
-#line 1707 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1723 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp46_ = _tmp45_;
-#line 1707 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1723 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_box_pack_start (_tmp44_, G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
-#line 1707 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1723 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (_tmp46_);
-#line 1708 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1724 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp47_ = clock;
-#line 1708 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1724 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp48_ = self->priv->second;
-#line 1708 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1724 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_box_pack_start (_tmp47_, G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
-#line 1709 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1725 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp49_ = clock;
-#line 1709 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1725 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp50_ = self->priv->system;
-#line 1709 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1725 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_box_pack_start (_tmp49_, G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
-#line 1711 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1727 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_dialog_set_default_response (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), (gint) GTK_RESPONSE_OK);
-#line 1713 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1729 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp51_ = _ ("_Shift photos/videos by the same amount");
-#line 1713 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1729 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp52_ = (GtkRadioButton*) gtk_radio_button_new_with_mnemonic (NULL, _tmp51_);
-#line 1713 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1729 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_object_ref_sink (_tmp52_);
-#line 1713 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1729 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->relativity_radio_button);
-#line 1713 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1729 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->relativity_radio_button = _tmp52_;
-#line 1715 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1731 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp53_ = self->priv->relativity_radio_button;
-#line 1715 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1731 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp54_ = config_facade_get_instance ();
-#line 1715 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1731 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp55_ = _tmp54_;
-#line 1715 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1731 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp56_ = configuration_facade_get_keep_relativity (G_TYPE_CHECK_INSTANCE_CAST (_tmp55_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 1715 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1731 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp53_, gtk_toggle_button_get_type (), GtkToggleButton), _tmp56_);
-#line 1715 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1731 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (_tmp55_);
-#line 1716 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1732 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp58_ = display_options;
-#line 1716 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1732 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp58_) {
-#line 14208 "Dialogs.c"
+#line 14336 "Dialogs.c"
 		gint _tmp59_ = 0;
-#line 1716 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1732 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp59_ = photo_count;
-#line 1716 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1732 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp57_ = _tmp59_ > 1;
-#line 14214 "Dialogs.c"
+#line 14342 "Dialogs.c"
 	} else {
-#line 1716 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1732 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp57_ = FALSE;
-#line 14218 "Dialogs.c"
+#line 14346 "Dialogs.c"
 	}
-#line 1716 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1732 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp60_ = self->priv->relativity_radio_button;
-#line 1716 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1732 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp60_, gtk_widget_get_type (), GtkWidget), _tmp57_);
-#line 1718 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1734 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp61_ = self->priv->relativity_radio_button;
-#line 1718 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1734 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp62_ = gtk_radio_button_get_group (_tmp61_);
-#line 1718 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1734 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp63_ = _ ("Set _all photos/videos to this time");
-#line 1718 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1734 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp64_ = (GtkRadioButton*) gtk_radio_button_new_with_mnemonic (_tmp62_, _tmp63_);
-#line 1718 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1734 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_object_ref_sink (_tmp64_);
-#line 1718 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1734 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->batch_radio_button);
-#line 1718 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1734 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->batch_radio_button = _tmp64_;
-#line 1720 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1736 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp65_ = self->priv->batch_radio_button;
-#line 1720 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1736 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp66_ = config_facade_get_instance ();
-#line 1720 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1736 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp67_ = _tmp66_;
-#line 1720 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1736 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp68_ = configuration_facade_get_keep_relativity (G_TYPE_CHECK_INSTANCE_CAST (_tmp67_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 1720 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1736 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp65_, gtk_toggle_button_get_type (), GtkToggleButton), !_tmp68_);
-#line 1720 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1736 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (_tmp67_);
-#line 1721 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1737 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp70_ = display_options;
-#line 1721 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1737 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp70_) {
-#line 14254 "Dialogs.c"
+#line 14382 "Dialogs.c"
 		gint _tmp71_ = 0;
-#line 1721 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1737 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp71_ = photo_count;
-#line 1721 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1737 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp69_ = _tmp71_ > 1;
-#line 14260 "Dialogs.c"
+#line 14388 "Dialogs.c"
 	} else {
-#line 1721 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1737 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp69_ = FALSE;
-#line 14264 "Dialogs.c"
+#line 14392 "Dialogs.c"
 	}
-#line 1721 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1737 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp72_ = self->priv->batch_radio_button;
-#line 1721 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1737 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp72_, gtk_widget_get_type (), GtkWidget), _tmp69_);
-#line 1722 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1738 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp73_ = self->priv->batch_radio_button;
-#line 1722 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1738 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp73_, gtk_toggle_button_get_type (), GtkToggleButton), "toggled", (GCallback) _adjust_date_time_dialog_on_time_changed_gtk_toggle_button_toggled, self, 0);
-#line 1724 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1740 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp74_ = contains_video;
-#line 1724 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1740 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp74_) {
-#line 14278 "Dialogs.c"
+#line 14406 "Dialogs.c"
 		const gchar* _tmp75_ = NULL;
 		gint _tmp76_ = 0;
 		GtkCheckButton* _tmp79_ = NULL;
-#line 1725 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1741 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp76_ = photo_count;
-#line 1725 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1741 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (_tmp76_ == 1) {
-#line 14286 "Dialogs.c"
+#line 14414 "Dialogs.c"
 			const gchar* _tmp77_ = NULL;
-#line 1726 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1742 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp77_ = _ ("_Modify original photo file");
-#line 1726 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1742 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp75_ = _tmp77_;
-#line 14292 "Dialogs.c"
+#line 14420 "Dialogs.c"
 		} else {
 			const gchar* _tmp78_ = NULL;
-#line 1726 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1742 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp78_ = _ ("_Modify original photo files");
-#line 1726 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1742 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp75_ = _tmp78_;
-#line 14299 "Dialogs.c"
+#line 14427 "Dialogs.c"
 		}
-#line 1725 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1741 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp79_ = (GtkCheckButton*) gtk_check_button_new_with_mnemonic (_tmp75_);
-#line 1725 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1741 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		g_object_ref_sink (_tmp79_);
-#line 1725 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1741 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (self->priv->modify_originals_check_button);
-#line 1725 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1741 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		self->priv->modify_originals_check_button = _tmp79_;
-#line 14309 "Dialogs.c"
+#line 14437 "Dialogs.c"
 	} else {
 		const gchar* _tmp80_ = NULL;
 		gint _tmp81_ = 0;
 		GtkCheckButton* _tmp84_ = NULL;
-#line 1728 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1744 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp81_ = photo_count;
-#line 1728 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1744 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (_tmp81_ == 1) {
-#line 14318 "Dialogs.c"
+#line 14446 "Dialogs.c"
 			const gchar* _tmp82_ = NULL;
-#line 1729 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1745 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp82_ = _ ("_Modify original file");
-#line 1729 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1745 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp80_ = _tmp82_;
-#line 14324 "Dialogs.c"
+#line 14452 "Dialogs.c"
 		} else {
 			const gchar* _tmp83_ = NULL;
-#line 1729 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1745 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp83_ = _ ("_Modify original files");
-#line 1729 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1745 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp80_ = _tmp83_;
-#line 14331 "Dialogs.c"
+#line 14459 "Dialogs.c"
 		}
-#line 1728 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1744 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp84_ = (GtkCheckButton*) gtk_check_button_new_with_mnemonic (_tmp80_);
-#line 1728 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1744 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		g_object_ref_sink (_tmp84_);
-#line 1728 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1744 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (self->priv->modify_originals_check_button);
-#line 1728 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1744 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		self->priv->modify_originals_check_button = _tmp84_;
-#line 14341 "Dialogs.c"
+#line 14469 "Dialogs.c"
 	}
-#line 1732 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1748 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp86_ = config_facade_get_instance ();
-#line 1732 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1748 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp87_ = _tmp86_;
-#line 1732 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1748 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp88_ = configuration_facade_get_commit_metadata_to_masters (G_TYPE_CHECK_INSTANCE_CAST (_tmp87_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 1732 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1748 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp89_ = _tmp88_;
-#line 1732 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1748 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (_tmp87_);
-#line 1732 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1748 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp89_) {
-#line 14355 "Dialogs.c"
+#line 14483 "Dialogs.c"
 		gboolean _tmp90_ = FALSE;
-#line 1733 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1749 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp90_ = display_options;
-#line 1733 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1749 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp85_ = _tmp90_;
-#line 14361 "Dialogs.c"
+#line 14489 "Dialogs.c"
 	} else {
-#line 1732 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1748 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp85_ = FALSE;
-#line 14365 "Dialogs.c"
+#line 14493 "Dialogs.c"
 	}
-#line 1732 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1748 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp91_ = self->priv->modify_originals_check_button;
-#line 1732 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1748 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp91_, gtk_toggle_button_get_type (), GtkToggleButton), _tmp85_);
-#line 1734 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1750 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp93_ = only_video;
-#line 1734 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1750 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (!_tmp93_) {
-#line 14375 "Dialogs.c"
+#line 14503 "Dialogs.c"
 		gboolean _tmp94_ = FALSE;
 		ConfigFacade* _tmp95_ = NULL;
 		ConfigFacade* _tmp96_ = NULL;
 		gboolean _tmp97_ = FALSE;
 		gboolean _tmp98_ = FALSE;
-#line 1735 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1751 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp95_ = config_facade_get_instance ();
-#line 1735 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1751 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp96_ = _tmp95_;
-#line 1735 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1751 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp97_ = configuration_facade_get_commit_metadata_to_masters (G_TYPE_CHECK_INSTANCE_CAST (_tmp96_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 1735 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1751 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp98_ = !_tmp97_;
-#line 1735 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1751 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (_tmp96_);
-#line 1735 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1751 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (_tmp98_) {
-#line 14393 "Dialogs.c"
+#line 14521 "Dialogs.c"
 			gboolean _tmp99_ = FALSE;
-#line 1735 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1751 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp99_ = display_options;
-#line 1735 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1751 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp94_ = _tmp99_;
-#line 14399 "Dialogs.c"
+#line 14527 "Dialogs.c"
 		} else {
-#line 1735 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1751 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp94_ = FALSE;
-#line 14403 "Dialogs.c"
+#line 14531 "Dialogs.c"
 		}
-#line 1735 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1751 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp92_ = _tmp94_;
-#line 14407 "Dialogs.c"
+#line 14535 "Dialogs.c"
 	} else {
-#line 1734 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1750 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp92_ = FALSE;
-#line 14411 "Dialogs.c"
+#line 14539 "Dialogs.c"
 	}
-#line 1734 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1750 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp100_ = self->priv->modify_originals_check_button;
-#line 1734 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1750 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp100_, gtk_widget_get_type (), GtkWidget), _tmp92_);
-#line 1737 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1753 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp101_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
-#line 1737 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1753 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_object_ref_sink (_tmp101_);
-#line 1737 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1753 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	time_content = _tmp101_;
-#line 1739 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1755 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp102_ = time_content;
-#line 1739 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1755 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp103_ = self->priv->calendar;
-#line 1739 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1755 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_box_pack_start (_tmp102_, G_TYPE_CHECK_INSTANCE_CAST (_tmp103_, gtk_widget_get_type (), GtkWidget), TRUE, FALSE, (guint) 0);
-#line 1740 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1756 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp104_ = time_content;
-#line 1740 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1756 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp105_ = clock;
-#line 1740 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1756 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_box_pack_start (_tmp104_, G_TYPE_CHECK_INSTANCE_CAST (_tmp105_, gtk_widget_get_type (), GtkWidget), TRUE, FALSE, (guint) 0);
-#line 1742 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1758 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp106_ = display_options;
-#line 1742 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1758 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp106_) {
-#line 14439 "Dialogs.c"
+#line 14567 "Dialogs.c"
 		GtkBox* _tmp107_ = NULL;
 		GtkRadioButton* _tmp108_ = NULL;
 		GtkBox* _tmp109_ = NULL;
 		GtkRadioButton* _tmp110_ = NULL;
 		GtkBox* _tmp111_ = NULL;
 		GtkCheckButton* _tmp112_ = NULL;
-#line 1743 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1759 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp107_ = time_content;
-#line 1743 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1759 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp108_ = self->priv->relativity_radio_button;
-#line 1743 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1759 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_box_pack_start (_tmp107_, G_TYPE_CHECK_INSTANCE_CAST (_tmp108_, gtk_widget_get_type (), GtkWidget), TRUE, FALSE, (guint) 0);
-#line 1744 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1760 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp109_ = time_content;
-#line 1744 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1760 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp110_ = self->priv->batch_radio_button;
-#line 1744 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1760 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_box_pack_start (_tmp109_, G_TYPE_CHECK_INSTANCE_CAST (_tmp110_, gtk_widget_get_type (), GtkWidget), TRUE, FALSE, (guint) 0);
-#line 1745 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1761 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp111_ = time_content;
-#line 1745 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1761 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp112_ = self->priv->modify_originals_check_button;
-#line 1745 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1761 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_box_pack_start (_tmp111_, G_TYPE_CHECK_INSTANCE_CAST (_tmp112_, gtk_widget_get_type (), GtkWidget), TRUE, FALSE, (guint) 0);
-#line 14464 "Dialogs.c"
+#line 14592 "Dialogs.c"
 	}
-#line 1748 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1764 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	preview = NULL;
-#line 14468 "Dialogs.c"
+#line 14596 "Dialogs.c"
 	{
 		GdkPixbuf* _tmp113_ = NULL;
 		Dateable* _tmp114_ = NULL;
 		GdkPixbuf* _tmp115_ = NULL;
 		GdkPixbuf* _tmp116_ = NULL;
-#line 1752 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1768 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp114_ = source;
-#line 1752 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1768 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp115_ = thumbnail_source_get_thumbnail (G_TYPE_CHECK_INSTANCE_CAST (_tmp114_, TYPE_THUMBNAIL_SOURCE, ThumbnailSource), ADJUST_DATE_TIME_DIALOG_CALENDAR_THUMBNAIL_SCALE, &_inner_error_);
-#line 1752 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1768 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp113_ = _tmp115_;
-#line 1752 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1768 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 14482 "Dialogs.c"
-			goto __catch412_g_error;
+#line 14610 "Dialogs.c"
+			goto __catch425_g_error;
 		}
-#line 1752 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1768 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp116_ = _tmp113_;
-#line 1752 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1768 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp113_ = NULL;
-#line 1752 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1768 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (preview);
-#line 1752 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1768 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		preview = _tmp116_;
-#line 1749 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1765 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (_tmp113_);
-#line 14495 "Dialogs.c"
+#line 14623 "Dialogs.c"
 	}
-	goto __finally412;
-	__catch412_g_error:
+	goto __finally425;
+	__catch425_g_error:
 	{
 		GError* err = NULL;
 		Dateable* _tmp117_ = NULL;
 		gchar* _tmp118_ = NULL;
 		gchar* _tmp119_ = NULL;
-#line 1749 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1765 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		err = _inner_error_;
-#line 1749 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1765 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_inner_error_ = NULL;
-#line 1754 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1770 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp117_ = source;
-#line 1754 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1770 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp118_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp117_, TYPE_DATA_OBJECT, DataObject));
-#line 1754 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1770 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp119_ = _tmp118_;
-#line 1754 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		g_warning ("Dialogs.vala:1754: Unable to fetch preview for %s", _tmp119_);
-#line 1754 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1770 "/home/jens/Source/shotwell/src/Dialogs.vala"
+		g_warning ("Dialogs.vala:1770: Unable to fetch preview for %s", _tmp119_);
+#line 1770 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (_tmp119_);
-#line 1749 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1765 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_error_free0 (err);
-#line 14520 "Dialogs.c"
+#line 14648 "Dialogs.c"
 	}
-	__finally412:
-#line 1749 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	__finally425:
+#line 1765 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1749 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1765 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (preview);
-#line 1749 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1765 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (time_content);
-#line 1749 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1765 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (clock);
-#line 1749 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1765 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1749 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1765 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		g_clear_error (&_inner_error_);
-#line 1749 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1765 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		return NULL;
-#line 14537 "Dialogs.c"
+#line 14665 "Dialogs.c"
 	}
-#line 1757 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1773 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp120_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
-#line 1757 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1773 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_object_ref_sink (_tmp120_);
-#line 1757 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1773 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	image_content = _tmp120_;
-#line 1758 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1774 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp121_ = image_content;
-#line 1758 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1774 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_set_valign (G_TYPE_CHECK_INSTANCE_CAST (_tmp121_, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_START);
-#line 1759 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1775 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp122_ = image_content;
-#line 1759 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1775 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_box_set_homogeneous (_tmp122_, TRUE);
-#line 1760 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1776 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp124_ = preview;
-#line 1760 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1776 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp124_ != NULL) {
-#line 14557 "Dialogs.c"
+#line 14685 "Dialogs.c"
 		GdkPixbuf* _tmp125_ = NULL;
 		GtkImage* _tmp126_ = NULL;
-#line 1760 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1776 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp125_ = preview;
-#line 1760 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1776 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp126_ = (GtkImage*) gtk_image_new_from_pixbuf (_tmp125_);
-#line 1760 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1776 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		g_object_ref_sink (_tmp126_);
-#line 1760 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1776 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (_tmp123_);
-#line 1760 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1776 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp123_ = _tmp126_;
-#line 14570 "Dialogs.c"
+#line 14698 "Dialogs.c"
 	} else {
 		GtkImage* _tmp127_ = NULL;
-#line 1760 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1776 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp127_ = (GtkImage*) gtk_image_new ();
-#line 1760 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1776 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		g_object_ref_sink (_tmp127_);
-#line 1760 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1776 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (_tmp123_);
-#line 1760 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1776 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp123_ = _tmp127_;
-#line 14581 "Dialogs.c"
+#line 14709 "Dialogs.c"
 	}
-#line 1760 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1776 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp128_ = _g_object_ref0 (_tmp123_);
-#line 1760 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1776 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	image = _tmp128_;
-#line 1761 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1777 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp129_ = (GtkLabel*) gtk_label_new (NULL);
-#line 1761 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1777 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_object_ref_sink (_tmp129_);
-#line 1761 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1777 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->original_time_label);
-#line 1761 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1777 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->original_time_label = _tmp129_;
-#line 1762 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1778 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp130_ = image_content;
-#line 1762 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1778 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp131_ = image;
-#line 1762 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1778 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_box_pack_start (_tmp130_, G_TYPE_CHECK_INSTANCE_CAST (_tmp131_, gtk_widget_get_type (), GtkWidget), TRUE, FALSE, (guint) 0);
-#line 1763 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1779 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp132_ = image_content;
-#line 1763 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1779 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp133_ = self->priv->original_time_label;
-#line 1763 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1779 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_box_pack_start (_tmp132_, G_TYPE_CHECK_INSTANCE_CAST (_tmp133_, gtk_widget_get_type (), GtkWidget), TRUE, FALSE, (guint) 0);
-#line 1765 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1781 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp134_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 10);
-#line 1765 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1781 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_object_ref_sink (_tmp134_);
-#line 1765 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1781 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	hbox = _tmp134_;
-#line 1766 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1782 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp135_ = hbox;
-#line 1766 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1782 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_container_set_border_width (G_TYPE_CHECK_INSTANCE_CAST (_tmp135_, gtk_container_get_type (), GtkContainer), (guint) 3);
-#line 1767 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1783 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp136_ = hbox;
-#line 1767 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1783 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp137_ = image_content;
-#line 1767 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1783 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_box_pack_start (_tmp136_, G_TYPE_CHECK_INSTANCE_CAST (_tmp137_, gtk_widget_get_type (), GtkWidget), TRUE, FALSE, (guint) 0);
-#line 1768 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1784 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp138_ = hbox;
-#line 1768 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1784 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp139_ = time_content;
-#line 1768 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1784 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_box_pack_start (_tmp138_, G_TYPE_CHECK_INSTANCE_CAST (_tmp139_, gtk_widget_get_type (), GtkWidget), TRUE, FALSE, (guint) 0);
-#line 1770 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1786 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp140_ = (GtkAlignment*) gtk_alignment_new (0.5f, 0.5f, (gfloat) 0, (gfloat) 0);
-#line 1770 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1786 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_object_ref_sink (_tmp140_);
-#line 1770 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1786 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	hbox_alignment = _tmp140_;
-#line 1771 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1787 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp141_ = hbox_alignment;
-#line 1771 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1787 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp142_ = hbox;
-#line 1771 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1787 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp141_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp142_, gtk_widget_get_type (), GtkWidget));
-#line 1773 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1789 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp143_ = (GtkBox*) gtk_dialog_get_content_area (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
-#line 1773 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1789 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp144_ = hbox_alignment;
-#line 1773 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1789 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_box_pack_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp143_, gtk_box_get_type (), GtkBox), G_TYPE_CHECK_INSTANCE_CAST (_tmp144_, gtk_widget_get_type (), GtkWidget), TRUE, FALSE, (guint) 0);
-#line 1775 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1791 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp145_ = (GtkLabel*) gtk_label_new ("");
-#line 1775 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1791 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_object_ref_sink (_tmp145_);
-#line 1775 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1791 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->notification);
-#line 1775 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1791 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->notification = _tmp145_;
-#line 1776 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1792 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp146_ = self->priv->notification;
-#line 1776 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1792 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_label_set_line_wrap (_tmp146_, TRUE);
-#line 1777 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1793 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp147_ = self->priv->notification;
-#line 1777 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1793 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_label_set_justify (_tmp147_, GTK_JUSTIFY_CENTER);
-#line 1779 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1795 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp148_ = (GtkBox*) gtk_dialog_get_content_area (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
-#line 1779 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1795 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp149_ = self->priv->notification;
-#line 1779 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1795 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_box_pack_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp148_, gtk_box_get_type (), GtkBox), G_TYPE_CHECK_INSTANCE_CAST (_tmp149_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0);
-#line 1781 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1797 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp150_ = source;
-#line 1781 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1797 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp151_ = dateable_get_exposure_time (_tmp150_);
-#line 1781 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1797 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->original_time = _tmp151_;
-#line 1783 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1799 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp152_ = self->priv->original_time;
-#line 1783 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1799 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp152_ == ((time_t) 0)) {
-#line 14679 "Dialogs.c"
+#line 14807 "Dialogs.c"
 		time_t _tmp153_ = 0;
-#line 1784 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1800 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp153_ = time (NULL);
-#line 1784 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1800 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		self->priv->original_time = _tmp153_;
-#line 1785 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1801 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		self->priv->no_original_time = TRUE;
-#line 14687 "Dialogs.c"
+#line 14815 "Dialogs.c"
 	}
-#line 1788 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1804 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp154_ = self->priv->original_time;
-#line 1788 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1804 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_time_local (_tmp154_, &_tmp155_);
-#line 1788 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1804 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	adjust_date_time_dialog_set_time (self, &_tmp155_);
-#line 1789 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1805 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp156_ = config_facade_get_instance ();
-#line 1789 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1805 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp157_ = _tmp156_;
-#line 1789 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1805 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp158_ = configuration_facade_get_use_24_hour_time (G_TYPE_CHECK_INSTANCE_CAST (_tmp157_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 1789 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1805 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	adjust_date_time_dialog_set_original_time_label (self, _tmp158_);
-#line 1789 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1805 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (_tmp157_);
-#line 1655 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1671 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (hbox_alignment);
-#line 1655 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1671 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (hbox);
-#line 1655 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1671 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (image);
-#line 1655 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1671 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (_tmp123_);
-#line 1655 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1671 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (image_content);
-#line 1655 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1671 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (preview);
-#line 1655 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1671 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (time_content);
-#line 1655 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1671 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (clock);
-#line 1655 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1671 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return self;
-#line 14723 "Dialogs.c"
+#line 14851 "Dialogs.c"
 }
 
 
 AdjustDateTimeDialog* adjust_date_time_dialog_new (Dateable* source, gint photo_count, gboolean display_options, gboolean contains_video, gboolean only_video) {
-#line 1655 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1671 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return adjust_date_time_dialog_construct (TYPE_ADJUST_DATE_TIME_DIALOG, source, photo_count, display_options, contains_video, only_video);
-#line 14730 "Dialogs.c"
+#line 14858 "Dialogs.c"
 }
 
 
@@ -14766,60 +14894,60 @@ static void adjust_date_time_dialog_set_time (AdjustDateTimeDialog* self, struct
 	gint _tmp31_ = 0;
 	GtkComboBoxText* _tmp32_ = NULL;
 	gint _tmp33_ = 0;
-#line 1792 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1808 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_ADJUST_DATE_TIME_DIALOG (self));
-#line 1792 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1808 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (time != NULL);
-#line 1793 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1809 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = self->priv->calendar;
-#line 1793 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1809 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = *time;
-#line 1793 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1809 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = _tmp1_.tm_mon;
-#line 1793 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1809 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = *time;
-#line 1793 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1809 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp4_ = _tmp3_.tm_year;
-#line 1793 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1809 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_calendar_select_month (_tmp0_, (guint) _tmp2_, (guint) (_tmp4_ + ADJUST_DATE_TIME_DIALOG_YEAR_OFFSET));
-#line 1794 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1810 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp5_ = self->priv->calendar;
-#line 1794 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1810 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp6_ = *time;
-#line 1794 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1810 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp7_ = _tmp6_.tm_mday;
-#line 1794 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1810 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_calendar_select_day (_tmp5_, (guint) _tmp7_);
-#line 1796 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1812 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp8_ = config_facade_get_instance ();
-#line 1796 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1812 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp9_ = _tmp8_;
-#line 1796 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1812 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp10_ = configuration_facade_get_use_24_hour_time (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 1796 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1812 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp11_ = _tmp10_;
-#line 1796 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1812 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (_tmp9_);
-#line 1796 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1812 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp11_) {
-#line 14791 "Dialogs.c"
+#line 14919 "Dialogs.c"
 		GtkComboBoxText* _tmp12_ = NULL;
 		GtkSpinButton* _tmp13_ = NULL;
 		struct tm _tmp14_ = {0};
 		gint _tmp15_ = 0;
-#line 1797 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1813 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp12_ = self->priv->system;
-#line 1797 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1813 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_combo_box_get_type (), GtkComboBox), (gint) ADJUST_DATE_TIME_DIALOG_TIME_SYSTEM_24HR);
-#line 1798 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1814 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp13_ = self->priv->hour;
-#line 1798 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1814 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp14_ = *time;
-#line 1798 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1814 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp15_ = _tmp14_.tm_hour;
-#line 1798 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1814 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_spin_button_set_value (_tmp13_, (gdouble) _tmp15_);
-#line 14808 "Dialogs.c"
+#line 14936 "Dialogs.c"
 	} else {
 		gint AMPM_hour = 0;
 		struct tm _tmp16_ = {0};
@@ -14831,74 +14959,74 @@ static void adjust_date_time_dialog_set_time (AdjustDateTimeDialog* self, struct
 		struct tm _tmp23_ = {0};
 		gint _tmp24_ = 0;
 		GtkComboBoxText* _tmp25_ = NULL;
-#line 1800 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1816 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp16_ = *time;
-#line 1800 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1816 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp17_ = _tmp16_.tm_hour;
-#line 1800 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1816 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		AMPM_hour = _tmp17_ % 12;
-#line 1801 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1817 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp19_ = AMPM_hour;
-#line 1801 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1817 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (_tmp19_ == 0) {
-#line 1801 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1817 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp18_ = 12;
-#line 14832 "Dialogs.c"
+#line 14960 "Dialogs.c"
 		} else {
 			gint _tmp20_ = 0;
-#line 1801 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1817 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp20_ = AMPM_hour;
-#line 1801 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1817 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp18_ = _tmp20_;
-#line 14839 "Dialogs.c"
+#line 14967 "Dialogs.c"
 		}
-#line 1801 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1817 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp21_ = self->priv->hour;
-#line 1801 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1817 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_spin_button_set_value (_tmp21_, (gdouble) _tmp18_);
-#line 1802 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1818 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp23_ = *time;
-#line 1802 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1818 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp24_ = _tmp23_.tm_hour;
-#line 1802 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1818 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (_tmp24_ >= 12) {
-#line 1802 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1818 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp22_ = ADJUST_DATE_TIME_DIALOG_TIME_SYSTEM_PM;
-#line 14853 "Dialogs.c"
+#line 14981 "Dialogs.c"
 		} else {
-#line 1802 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1818 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp22_ = ADJUST_DATE_TIME_DIALOG_TIME_SYSTEM_AM;
-#line 14857 "Dialogs.c"
+#line 14985 "Dialogs.c"
 		}
-#line 1802 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1818 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp25_ = self->priv->system;
-#line 1802 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1818 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, gtk_combo_box_get_type (), GtkComboBox), (gint) _tmp22_);
-#line 14863 "Dialogs.c"
+#line 14991 "Dialogs.c"
 	}
-#line 1805 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1821 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp26_ = self->priv->minute;
-#line 1805 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1821 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp27_ = *time;
-#line 1805 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1821 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp28_ = _tmp27_.tm_min;
-#line 1805 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1821 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_spin_button_set_value (_tmp26_, (gdouble) _tmp28_);
-#line 1806 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1822 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp29_ = self->priv->second;
-#line 1806 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1822 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp30_ = *time;
-#line 1806 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1822 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp31_ = _tmp30_.tm_sec;
-#line 1806 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1822 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_spin_button_set_value (_tmp29_, (gdouble) _tmp31_);
-#line 1808 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1824 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp32_ = self->priv->system;
-#line 1808 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1824 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp33_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, gtk_combo_box_get_type (), GtkComboBox));
-#line 1808 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1824 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->previous_time_system = (AdjustDateTimeDialogTimeSystem) _tmp33_;
-#line 14887 "Dialogs.c"
+#line 15015 "Dialogs.c"
 }
 
 
@@ -14944,7 +15072,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 14933 "Dialogs.c"
+#line 15061 "Dialogs.c"
 }
 
 
@@ -14960,58 +15088,58 @@ static void adjust_date_time_dialog_set_original_time_label (AdjustDateTimeDialo
 	gchar* _tmp10_ = NULL;
 	gchar* _tmp11_ = NULL;
 	gchar* _tmp12_ = NULL;
-#line 1811 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1827 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_ADJUST_DATE_TIME_DIALOG (self));
-#line 1812 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1828 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = self->priv->no_original_time;
-#line 1812 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1828 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp0_) {
-#line 1813 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1829 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		return;
-#line 14957 "Dialogs.c"
+#line 15085 "Dialogs.c"
 	}
-#line 1816 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1832 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = use_24_hr_format;
-#line 1816 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1832 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp2_) {
-#line 14963 "Dialogs.c"
+#line 15091 "Dialogs.c"
 		const gchar* _tmp3_ = NULL;
-#line 1816 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1832 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp3_ = _ ("%m/%d/%Y, %H:%M:%S");
-#line 1816 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1832 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp1_ = _tmp3_;
-#line 14969 "Dialogs.c"
+#line 15097 "Dialogs.c"
 	} else {
 		const gchar* _tmp4_ = NULL;
-#line 1817 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1833 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp4_ = _ ("%m/%d/%Y, %I:%M:%S %p");
-#line 1817 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1833 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp1_ = _tmp4_;
-#line 14976 "Dialogs.c"
+#line 15104 "Dialogs.c"
 	}
-#line 1815 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1831 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp5_ = self->priv->original_time_label;
-#line 1815 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1831 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp6_ = _ ("Original: ");
-#line 1815 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1831 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp7_ = self->priv->original_time;
-#line 1815 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1831 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_time_local (_tmp7_, &_tmp8_);
-#line 1815 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1831 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp9_ = g_time_format (&_tmp8_, _tmp1_);
-#line 1815 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1831 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp10_ = _tmp9_;
-#line 1815 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1831 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp11_ = g_strconcat (_tmp6_, _tmp10_, NULL);
-#line 1815 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1831 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp12_ = _tmp11_;
-#line 1815 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1831 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_label_set_text (_tmp5_, _tmp12_);
-#line 1815 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1831 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (_tmp12_);
-#line 1815 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1831 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (_tmp10_);
-#line 15000 "Dialogs.c"
+#line 15128 "Dialogs.c"
 }
 
 
@@ -15040,105 +15168,105 @@ static time_t adjust_date_time_dialog_get_time (AdjustDateTimeDialog* self) {
 	guint _tmp18_ = 0U;
 	guint _tmp19_ = 0U;
 	time_t _tmp20_ = 0;
-#line 1820 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1836 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (IS_ADJUST_DATE_TIME_DIALOG (self), 0);
-#line 1821 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1837 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	memset (&time, 0, sizeof (struct tm));
-#line 1823 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1839 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = self->priv->second;
-#line 1823 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1839 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = gtk_spin_button_get_value (_tmp0_);
-#line 1823 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1839 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	time.tm_sec = (gint) _tmp1_;
-#line 1824 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1840 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = self->priv->minute;
-#line 1824 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1840 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = gtk_spin_button_get_value (_tmp2_);
-#line 1824 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1840 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	time.tm_min = (gint) _tmp3_;
-#line 1827 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1843 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp4_ = self->priv->hour;
-#line 1827 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1843 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp5_ = gtk_spin_button_get_value (_tmp4_);
-#line 1827 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1843 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	hour = (gint) _tmp5_;
-#line 1828 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1844 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp8_ = hour;
-#line 1828 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1844 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp8_ == 12) {
-#line 15055 "Dialogs.c"
+#line 15183 "Dialogs.c"
 		GtkComboBoxText* _tmp9_ = NULL;
 		gint _tmp10_ = 0;
-#line 1828 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1844 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp9_ = self->priv->system;
-#line 1828 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1844 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp10_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_combo_box_get_type (), GtkComboBox));
-#line 1828 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1844 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp7_ = _tmp10_ != ((gint) ADJUST_DATE_TIME_DIALOG_TIME_SYSTEM_24HR);
-#line 15064 "Dialogs.c"
+#line 15192 "Dialogs.c"
 	} else {
-#line 1828 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1844 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp7_ = FALSE;
-#line 15068 "Dialogs.c"
+#line 15196 "Dialogs.c"
 	}
-#line 1828 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1844 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp7_) {
-#line 1828 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1844 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp6_ = 0;
-#line 15074 "Dialogs.c"
+#line 15202 "Dialogs.c"
 	} else {
 		gint _tmp11_ = 0;
-#line 1828 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1844 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp11_ = hour;
-#line 1828 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1844 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp6_ = _tmp11_;
-#line 15081 "Dialogs.c"
+#line 15209 "Dialogs.c"
 	}
-#line 1828 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1844 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	time.tm_hour = _tmp6_;
-#line 1829 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1845 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp13_ = self->priv->system;
-#line 1829 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1845 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp14_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, gtk_combo_box_get_type (), GtkComboBox));
-#line 1829 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1845 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp14_ == ((gint) ADJUST_DATE_TIME_DIALOG_TIME_SYSTEM_PM)) {
-#line 1829 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1845 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp12_ = 12;
-#line 15093 "Dialogs.c"
+#line 15221 "Dialogs.c"
 	} else {
-#line 1829 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1845 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp12_ = 0;
-#line 15097 "Dialogs.c"
+#line 15225 "Dialogs.c"
 	}
-#line 1829 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1845 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp15_ = time.tm_hour;
-#line 1829 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1845 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	time.tm_hour = _tmp15_ + _tmp12_;
-#line 1832 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1848 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp16_ = self->priv->calendar;
-#line 1832 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1848 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_calendar_get_date (_tmp16_, &_tmp17_, &_tmp18_, &_tmp19_);
-#line 1832 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1848 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	year = _tmp17_;
-#line 1832 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1848 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	month = _tmp18_;
-#line 1832 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1848 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	day = _tmp19_;
-#line 1833 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1849 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	time.tm_year = ((gint) year) - ADJUST_DATE_TIME_DIALOG_YEAR_OFFSET;
-#line 1834 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1850 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	time.tm_mon = (gint) month;
-#line 1835 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1851 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	time.tm_mday = (gint) day;
-#line 1837 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1853 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	time.tm_isdst = -1;
-#line 1839 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1855 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp20_ = mktime (&time);
-#line 1839 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1855 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	result = _tmp20_;
-#line 1839 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1855 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 15127 "Dialogs.c"
+#line 15255 "Dialogs.c"
 }
 
 
@@ -15149,17 +15277,17 @@ gboolean adjust_date_time_dialog_execute (AdjustDateTimeDialog* self, gint64* ti
 	gboolean result = FALSE;
 	gboolean response = FALSE;
 	gint _tmp0_ = 0;
-#line 1842 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1858 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (IS_ADJUST_DATE_TIME_DIALOG (self), FALSE);
-#line 1844 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1860 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 1846 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1862 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	response = FALSE;
-#line 1848 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1864 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
-#line 1848 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1864 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp0_ == ((gint) GTK_RESPONSE_OK)) {
-#line 15148 "Dialogs.c"
+#line 15276 "Dialogs.c"
 		gboolean _tmp1_ = FALSE;
 		GtkRadioButton* _tmp5_ = NULL;
 		gboolean _tmp6_ = FALSE;
@@ -15171,125 +15299,125 @@ gboolean adjust_date_time_dialog_execute (AdjustDateTimeDialog* self, gint64* ti
 		GtkCheckButton* _tmp15_ = NULL;
 		gboolean _tmp16_ = FALSE;
 		gboolean _tmp17_ = FALSE;
-#line 1849 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1865 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp1_ = self->priv->no_original_time;
-#line 1849 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1865 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (_tmp1_) {
-#line 15164 "Dialogs.c"
+#line 15292 "Dialogs.c"
 			time_t _tmp2_ = 0;
-#line 1850 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1866 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp2_ = adjust_date_time_dialog_get_time (self);
-#line 1850 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1866 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_vala_time_shift = (gint64) _tmp2_;
-#line 15170 "Dialogs.c"
+#line 15298 "Dialogs.c"
 		} else {
 			time_t _tmp3_ = 0;
 			time_t _tmp4_ = 0;
-#line 1852 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1868 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp3_ = adjust_date_time_dialog_get_time (self);
-#line 1852 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1868 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp4_ = self->priv->original_time;
-#line 1852 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1868 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_vala_time_shift = (gint64) (_tmp3_ - _tmp4_);
-#line 15180 "Dialogs.c"
+#line 15308 "Dialogs.c"
 		}
-#line 1854 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1870 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp5_ = self->priv->relativity_radio_button;
-#line 1854 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1870 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp6_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_toggle_button_get_type (), GtkToggleButton));
-#line 1854 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1870 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_vala_keep_relativity = _tmp6_;
-#line 1856 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1872 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp7_ = self->priv->relativity_radio_button;
-#line 1856 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1872 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp8_ = gtk_widget_get_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_widget_get_type (), GtkWidget));
-#line 1856 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1872 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp9_ = _tmp8_;
-#line 1856 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1872 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (_tmp9_) {
-#line 15196 "Dialogs.c"
+#line 15324 "Dialogs.c"
 			ConfigFacade* _tmp10_ = NULL;
 			ConfigFacade* _tmp11_ = NULL;
 			gboolean _tmp12_ = FALSE;
-#line 1857 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1873 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp10_ = config_facade_get_instance ();
-#line 1857 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1873 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp11_ = _tmp10_;
-#line 1857 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1873 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp12_ = _vala_keep_relativity;
-#line 1857 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1873 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			configuration_facade_set_keep_relativity (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp12_);
-#line 1857 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1873 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_object_unref0 (_tmp11_);
-#line 15210 "Dialogs.c"
+#line 15338 "Dialogs.c"
 		}
-#line 1859 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1875 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp13_ = self->priv->modify_originals_check_button;
-#line 1859 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1875 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp14_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, gtk_toggle_button_get_type (), GtkToggleButton));
-#line 1859 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1875 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_vala_modify_originals = _tmp14_;
-#line 1861 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1877 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp15_ = self->priv->modify_originals_check_button;
-#line 1861 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1877 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp16_ = gtk_widget_get_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, gtk_widget_get_type (), GtkWidget));
-#line 1861 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1877 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp17_ = _tmp16_;
-#line 1861 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1877 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (_tmp17_) {
-#line 15226 "Dialogs.c"
+#line 15354 "Dialogs.c"
 			ConfigFacade* _tmp18_ = NULL;
 			ConfigFacade* _tmp19_ = NULL;
 			gboolean _tmp20_ = FALSE;
-#line 1862 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1878 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp18_ = config_facade_get_instance ();
-#line 1862 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1878 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp19_ = _tmp18_;
-#line 1862 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1878 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp20_ = _vala_modify_originals;
-#line 1862 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1878 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			configuration_facade_set_modify_originals (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp20_);
-#line 1862 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1878 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_object_unref0 (_tmp19_);
-#line 15240 "Dialogs.c"
+#line 15368 "Dialogs.c"
 		}
-#line 1864 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1880 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		response = TRUE;
-#line 15244 "Dialogs.c"
+#line 15372 "Dialogs.c"
 	} else {
-#line 1866 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1882 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_vala_time_shift = (gint64) 0;
-#line 1867 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1883 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_vala_keep_relativity = TRUE;
-#line 1868 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1884 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_vala_modify_originals = FALSE;
-#line 15252 "Dialogs.c"
+#line 15380 "Dialogs.c"
 	}
-#line 1871 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1887 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 1873 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1889 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	result = response;
-#line 1873 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1889 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (time_shift) {
-#line 1873 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1889 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		*time_shift = _vala_time_shift;
-#line 15262 "Dialogs.c"
+#line 15390 "Dialogs.c"
 	}
-#line 1873 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1889 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (keep_relativity) {
-#line 1873 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1889 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		*keep_relativity = _vala_keep_relativity;
-#line 15268 "Dialogs.c"
+#line 15396 "Dialogs.c"
 	}
-#line 1873 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1889 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (modify_originals) {
-#line 1873 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1889 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		*modify_originals = _vala_modify_originals;
-#line 15274 "Dialogs.c"
+#line 15402 "Dialogs.c"
 	}
-#line 1873 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1889 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 15278 "Dialogs.c"
+#line 15406 "Dialogs.c"
 }
 
 
@@ -15300,31 +15428,31 @@ static gboolean adjust_date_time_dialog_on_spin_button_output (AdjustDateTimeDia
 	gdouble _tmp2_ = 0.0;
 	gchar* _tmp3_ = NULL;
 	gchar* _tmp4_ = NULL;
-#line 1876 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1892 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (IS_ADJUST_DATE_TIME_DIALOG (self), FALSE);
-#line 1876 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1892 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (GTK_IS_SPIN_BUTTON (button), FALSE);
-#line 1877 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1893 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = button;
-#line 1877 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1893 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = button;
-#line 1877 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1893 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = gtk_spin_button_get_value (_tmp1_);
-#line 1877 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1893 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = g_strdup_printf ("%02d", (gint) _tmp2_);
-#line 1877 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1893 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp4_ = _tmp3_;
-#line 1877 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1893 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_entry_set_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_entry_get_type (), GtkEntry), _tmp4_);
-#line 1877 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1893 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (_tmp4_);
-#line 1879 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1895 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	adjust_date_time_dialog_on_time_changed (self);
-#line 1881 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1897 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	result = TRUE;
-#line 1881 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1897 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 15313 "Dialogs.c"
+#line 15441 "Dialogs.c"
 }
 
 
@@ -15337,81 +15465,81 @@ static void adjust_date_time_dialog_on_time_changed (AdjustDateTimeDialog* self)
 	gboolean _tmp4_ = FALSE;
 	gboolean _tmp5_ = FALSE;
 	gint64 _tmp6_ = 0LL;
-#line 1884 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1900 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_ADJUST_DATE_TIME_DIALOG (self));
-#line 1885 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1901 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = adjust_date_time_dialog_get_time (self);
-#line 1885 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1901 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = self->priv->original_time;
-#line 1885 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1901 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	time_shift = ((gint64) _tmp0_) - ((gint64) _tmp1_);
-#line 1887 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1903 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = self->priv->system;
-#line 1887 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1903 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_combo_box_get_type (), GtkComboBox));
-#line 1887 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1903 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->previous_time_system = (AdjustDateTimeDialogTimeSystem) _tmp3_;
-#line 1889 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1905 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp6_ = time_shift;
-#line 1889 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1905 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp6_ == ((gint64) 0)) {
-#line 1889 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1905 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp5_ = TRUE;
-#line 15346 "Dialogs.c"
+#line 15474 "Dialogs.c"
 	} else {
 		gboolean _tmp7_ = FALSE;
-#line 1889 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1905 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp7_ = self->priv->no_original_time;
-#line 1889 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1905 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp5_ = _tmp7_;
-#line 15353 "Dialogs.c"
+#line 15481 "Dialogs.c"
 	}
-#line 1889 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1905 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp5_) {
-#line 1889 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1905 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp4_ = TRUE;
-#line 15359 "Dialogs.c"
+#line 15487 "Dialogs.c"
 	} else {
 		gboolean _tmp8_ = FALSE;
 		GtkRadioButton* _tmp9_ = NULL;
 		gboolean _tmp10_ = FALSE;
-#line 1889 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1905 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp9_ = self->priv->batch_radio_button;
-#line 1889 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1905 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp10_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_toggle_button_get_type (), GtkToggleButton));
-#line 1889 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1905 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (_tmp10_) {
-#line 15370 "Dialogs.c"
+#line 15498 "Dialogs.c"
 			GtkRadioButton* _tmp11_ = NULL;
 			gboolean _tmp12_ = FALSE;
 			gboolean _tmp13_ = FALSE;
-#line 1890 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1906 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp11_ = self->priv->batch_radio_button;
-#line 1890 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1906 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp12_ = gtk_widget_get_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_widget_get_type (), GtkWidget));
-#line 1890 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1906 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp13_ = _tmp12_;
-#line 1890 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1906 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp8_ = _tmp13_;
-#line 15382 "Dialogs.c"
+#line 15510 "Dialogs.c"
 		} else {
-#line 1889 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1905 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp8_ = FALSE;
-#line 15386 "Dialogs.c"
+#line 15514 "Dialogs.c"
 		}
-#line 1889 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1905 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp4_ = _tmp8_;
-#line 15390 "Dialogs.c"
+#line 15518 "Dialogs.c"
 	}
-#line 1889 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1905 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp4_) {
-#line 15394 "Dialogs.c"
+#line 15522 "Dialogs.c"
 		GtkLabel* _tmp14_ = NULL;
-#line 1891 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1907 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp14_ = self->priv->notification;
-#line 1891 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1907 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_widget_get_type (), GtkWidget));
-#line 15400 "Dialogs.c"
+#line 15528 "Dialogs.c"
 	} else {
 		gboolean forward = FALSE;
 		gint64 _tmp15_ = 0LL;
@@ -15448,108 +15576,108 @@ static void adjust_date_time_dialog_on_time_changed (AdjustDateTimeDialog* self)
 		gchar* _tmp43_ = NULL;
 		gchar* _tmp44_ = NULL;
 		GtkLabel* _tmp45_ = NULL;
-#line 1893 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1909 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp15_ = time_shift;
-#line 1893 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1909 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		forward = _tmp15_ > ((gint64) 0);
-#line 1896 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1912 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp16_ = time_shift;
-#line 1896 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1912 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp17_ = llabs (_tmp16_);
-#line 1896 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1912 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		time_shift = _tmp17_;
-#line 1898 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1914 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp18_ = time_shift;
-#line 1898 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1914 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		days = (gint) (_tmp18_ / ADJUST_DATE_TIME_DIALOG_SECONDS_IN_DAY);
-#line 1899 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1915 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp19_ = time_shift;
-#line 1899 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1915 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		time_shift = _tmp19_ % ADJUST_DATE_TIME_DIALOG_SECONDS_IN_DAY;
-#line 1900 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1916 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp20_ = time_shift;
-#line 1900 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1916 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		hours = (gint) (_tmp20_ / ADJUST_DATE_TIME_DIALOG_SECONDS_IN_HOUR);
-#line 1901 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1917 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp21_ = time_shift;
-#line 1901 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1917 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		time_shift = _tmp21_ % ADJUST_DATE_TIME_DIALOG_SECONDS_IN_HOUR;
-#line 1902 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1918 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp22_ = time_shift;
-#line 1902 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1918 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		minutes = (gint) (_tmp22_ / ADJUST_DATE_TIME_DIALOG_SECONDS_IN_MINUTE);
-#line 1903 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1919 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp23_ = time_shift;
-#line 1903 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1919 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		seconds = (gint) (_tmp23_ % ADJUST_DATE_TIME_DIALOG_SECONDS_IN_MINUTE);
-#line 1905 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1921 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp25_ = forward;
-#line 1905 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1921 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (_tmp25_) {
-#line 15475 "Dialogs.c"
+#line 15603 "Dialogs.c"
 			const gchar* _tmp26_ = NULL;
-#line 1906 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1922 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp26_ = _ ("Exposure time will be shifted forward by\n" \
 "%d %s, %d %s, %d %s, and %d %s.");
-#line 1906 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1922 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp24_ = _tmp26_;
-#line 15481 "Dialogs.c"
+#line 15609 "Dialogs.c"
 		} else {
 			const gchar* _tmp27_ = NULL;
-#line 1907 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1923 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp27_ = _ ("Exposure time will be shifted backward by\n" \
 "%d %s, %d %s, %d %s, and %d %s.");
-#line 1907 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1923 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp24_ = _tmp27_;
-#line 15488 "Dialogs.c"
+#line 15616 "Dialogs.c"
 		}
-#line 1905 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1921 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp28_ = g_strdup (_tmp24_);
-#line 1905 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1921 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		shift_status = _tmp28_;
-#line 1909 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1925 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp29_ = self->priv->notification;
-#line 1909 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1925 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp30_ = shift_status;
-#line 1909 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1925 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp31_ = days;
-#line 1909 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1925 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp32_ = days;
-#line 1909 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1925 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp33_ = ngettext ("day", "days", (gulong) _tmp32_);
-#line 1909 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1925 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp34_ = hours;
-#line 1909 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1925 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp35_ = hours;
-#line 1909 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1925 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp36_ = ngettext ("hour", "hours", (gulong) _tmp35_);
-#line 1909 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1925 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp37_ = minutes;
-#line 1909 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1925 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp38_ = minutes;
-#line 1909 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1925 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp39_ = ngettext ("minute", "minutes", (gulong) _tmp38_);
-#line 1909 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1925 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp40_ = seconds;
-#line 1909 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1925 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp41_ = seconds;
-#line 1909 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1925 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp42_ = ngettext ("second", "seconds", (gulong) _tmp41_);
-#line 1909 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1925 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp43_ = g_strdup_printf (_tmp30_, _tmp31_, _tmp33_, _tmp34_, _tmp36_, _tmp37_, _tmp39_, _tmp40_, _tmp42_);
-#line 1909 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1925 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp44_ = _tmp43_;
-#line 1909 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1925 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_label_set_text (_tmp29_, _tmp44_);
-#line 1909 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1925 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (_tmp44_);
-#line 1914 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1930 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp45_ = self->priv->notification;
-#line 1914 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1930 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_widget_show (G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, gtk_widget_get_type (), GtkWidget));
-#line 1889 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1905 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (shift_status);
-#line 15536 "Dialogs.c"
+#line 15664 "Dialogs.c"
 	}
 }
 
@@ -15564,39 +15692,39 @@ static void adjust_date_time_dialog_on_time_system_changed (AdjustDateTimeDialog
 	gint _tmp6_ = 0;
 	GtkComboBoxText* _tmp7_ = NULL;
 	gint _tmp8_ = 0;
-#line 1918 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1934 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_ADJUST_DATE_TIME_DIALOG (self));
-#line 1919 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1935 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = self->priv->previous_time_system;
-#line 1919 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1935 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = self->priv->system;
-#line 1919 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1935 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_combo_box_get_type (), GtkComboBox));
-#line 1919 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1935 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp0_ == _tmp2_) {
-#line 1920 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1936 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		return;
-#line 15563 "Dialogs.c"
+#line 15691 "Dialogs.c"
 	}
-#line 1922 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1938 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = config_facade_get_instance ();
-#line 1922 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1938 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp4_ = _tmp3_;
-#line 1922 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1938 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp5_ = self->priv->system;
-#line 1922 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1938 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp6_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_combo_box_get_type (), GtkComboBox));
-#line 1922 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1938 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	configuration_facade_set_use_24_hour_time (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp6_ == ((gint) ADJUST_DATE_TIME_DIALOG_TIME_SYSTEM_24HR));
-#line 1922 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1938 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (_tmp4_);
-#line 1924 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1940 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp7_ = self->priv->system;
-#line 1924 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1940 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp8_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_combo_box_get_type (), GtkComboBox));
-#line 1924 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1940 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp8_ == ((gint) ADJUST_DATE_TIME_DIALOG_TIME_SYSTEM_24HR)) {
-#line 15583 "Dialogs.c"
+#line 15711 "Dialogs.c"
 		gint _tmp9_ = 0;
 		GtkSpinButton* _tmp10_ = NULL;
 		gdouble _tmp11_ = 0.0;
@@ -15607,57 +15735,57 @@ static void adjust_date_time_dialog_on_time_system_changed (AdjustDateTimeDialog
 		GtkSpinButton* _tmp17_ = NULL;
 		GtkSpinButton* _tmp18_ = NULL;
 		gint _tmp19_ = 0;
-#line 1925 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1941 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp10_ = self->priv->hour;
-#line 1925 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1941 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp11_ = gtk_spin_button_get_value (_tmp10_);
-#line 1925 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1941 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (_tmp11_ == 12.0) {
-#line 1925 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1941 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp9_ = 0;
-#line 15602 "Dialogs.c"
+#line 15730 "Dialogs.c"
 		} else {
 			GtkSpinButton* _tmp12_ = NULL;
 			gdouble _tmp13_ = 0.0;
-#line 1925 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1941 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp12_ = self->priv->hour;
-#line 1925 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1941 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp13_ = gtk_spin_button_get_value (_tmp12_);
-#line 1925 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1941 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp9_ = (gint) _tmp13_;
-#line 15612 "Dialogs.c"
+#line 15740 "Dialogs.c"
 		}
-#line 1925 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1941 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		time = _tmp9_;
-#line 1926 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1942 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp15_ = self->priv->previous_time_system;
-#line 1926 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1942 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (_tmp15_ == ADJUST_DATE_TIME_DIALOG_TIME_SYSTEM_PM) {
-#line 1926 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1942 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp14_ = 12;
-#line 15622 "Dialogs.c"
+#line 15750 "Dialogs.c"
 		} else {
-#line 1926 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1942 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp14_ = 0;
-#line 15626 "Dialogs.c"
+#line 15754 "Dialogs.c"
 		}
-#line 1926 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1942 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp16_ = time;
-#line 1926 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1942 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		time = _tmp16_ + _tmp14_;
-#line 1928 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1944 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp17_ = self->priv->hour;
-#line 1928 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1944 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_spin_button_set_range (_tmp17_, (gdouble) 0, (gdouble) 23);
-#line 1929 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1945 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		adjust_date_time_dialog_set_original_time_label (self, TRUE);
-#line 1931 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1947 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp18_ = self->priv->hour;
-#line 1931 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1947 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp19_ = time;
-#line 1931 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1947 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_spin_button_set_value (_tmp18_, (gdouble) _tmp19_);
-#line 15644 "Dialogs.c"
+#line 15772 "Dialogs.c"
 	} else {
 		gint AMPM_hour = 0;
 		GtkSpinButton* _tmp20_ = NULL;
@@ -15666,92 +15794,92 @@ static void adjust_date_time_dialog_on_time_system_changed (AdjustDateTimeDialog
 		gint _tmp23_ = 0;
 		gint _tmp24_ = 0;
 		GtkSpinButton* _tmp26_ = NULL;
-#line 1933 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1949 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp20_ = self->priv->hour;
-#line 1933 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1949 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp21_ = gtk_spin_button_get_value (_tmp20_);
-#line 1933 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1949 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		AMPM_hour = ((gint) _tmp21_) % 12;
-#line 1935 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1951 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp22_ = self->priv->hour;
-#line 1935 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1951 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_spin_button_set_range (_tmp22_, (gdouble) 1, (gdouble) 12);
-#line 1936 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1952 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		adjust_date_time_dialog_set_original_time_label (self, FALSE);
-#line 1938 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1954 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp24_ = AMPM_hour;
-#line 1938 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1954 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (_tmp24_ == 0) {
-#line 1938 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1954 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp23_ = 12;
-#line 15671 "Dialogs.c"
+#line 15799 "Dialogs.c"
 		} else {
 			gint _tmp25_ = 0;
-#line 1938 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1954 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp25_ = AMPM_hour;
-#line 1938 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1954 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp23_ = _tmp25_;
-#line 15678 "Dialogs.c"
+#line 15806 "Dialogs.c"
 		}
-#line 1938 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1954 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp26_ = self->priv->hour;
-#line 1938 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1954 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_spin_button_set_value (_tmp26_, (gdouble) _tmp23_);
-#line 15684 "Dialogs.c"
+#line 15812 "Dialogs.c"
 	}
-#line 1941 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1957 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	adjust_date_time_dialog_on_time_changed (self);
-#line 15688 "Dialogs.c"
+#line 15816 "Dialogs.c"
 }
 
 
 static void adjust_date_time_dialog_class_init (AdjustDateTimeDialogClass * klass) {
-#line 1626 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1642 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	adjust_date_time_dialog_parent_class = g_type_class_peek_parent (klass);
-#line 1626 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1642 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_type_class_add_private (klass, sizeof (AdjustDateTimeDialogPrivate));
-#line 1626 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1642 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	G_OBJECT_CLASS (klass)->finalize = adjust_date_time_dialog_finalize;
-#line 15699 "Dialogs.c"
+#line 15827 "Dialogs.c"
 }
 
 
 static void adjust_date_time_dialog_instance_init (AdjustDateTimeDialog * self) {
-#line 1626 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1642 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv = ADJUST_DATE_TIME_DIALOG_GET_PRIVATE (self);
-#line 1631 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1647 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->no_original_time = FALSE;
-#line 15708 "Dialogs.c"
+#line 15836 "Dialogs.c"
 }
 
 
 static void adjust_date_time_dialog_finalize (GObject* obj) {
 	AdjustDateTimeDialog * self;
-#line 1626 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1642 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_ADJUST_DATE_TIME_DIALOG, AdjustDateTimeDialog);
-#line 1636 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1652 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->original_time_label);
-#line 1637 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1653 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->calendar);
-#line 1638 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1654 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->hour);
-#line 1639 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1655 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->minute);
-#line 1640 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1656 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->second);
-#line 1641 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1657 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->system);
-#line 1642 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1658 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->relativity_radio_button);
-#line 1643 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1659 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->batch_radio_button);
-#line 1644 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1660 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->modify_originals_check_button);
-#line 1645 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1661 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->notification);
-#line 1626 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1642 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	G_OBJECT_CLASS (adjust_date_time_dialog_parent_class)->finalize (obj);
-#line 15738 "Dialogs.c"
+#line 15866 "Dialogs.c"
 }
 
 
@@ -15783,31 +15911,31 @@ void multiple_object_error_dialog (GeeArrayList* objects, const gchar* message,
 	GtkMessageDialog* _tmp34_ = NULL;
 	GtkMessageDialog* _tmp35_ = NULL;
 	const gchar* _tmp36_ = NULL;
-#line 1946 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1962 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (GEE_IS_ARRAY_LIST (objects));
-#line 1946 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1962 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (message != NULL);
-#line 1946 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1962 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (title != NULL);
-#line 1948 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1964 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = message;
-#line 1948 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1964 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = g_strconcat (_tmp0_, "\n", NULL);
-#line 1948 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1964 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	dialog_message = _tmp1_;
-#line 15782 "Dialogs.c"
+#line 15910 "Dialogs.c"
 	{
 		gint i = 0;
-#line 1951 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1967 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		i = 0;
-#line 15787 "Dialogs.c"
+#line 15915 "Dialogs.c"
 		{
 			gboolean _tmp2_ = FALSE;
-#line 1951 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1967 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp2_ = TRUE;
-#line 1951 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1967 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			while (TRUE) {
-#line 15794 "Dialogs.c"
+#line 15922 "Dialogs.c"
 				gboolean _tmp4_ = FALSE;
 				gint _tmp5_ = 0;
 				const gchar* _tmp10_ = NULL;
@@ -15820,96 +15948,96 @@ void multiple_object_error_dialog (GeeArrayList* objects, const gchar* message,
 				gchar* _tmp17_ = NULL;
 				gchar* _tmp18_ = NULL;
 				gchar* _tmp19_ = NULL;
-#line 1951 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1967 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				if (!_tmp2_) {
-#line 15809 "Dialogs.c"
+#line 15937 "Dialogs.c"
 					gint _tmp3_ = 0;
-#line 1951 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1967 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp3_ = i;
-#line 1951 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1967 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					i = _tmp3_ + 1;
-#line 15815 "Dialogs.c"
+#line 15943 "Dialogs.c"
 				}
-#line 1951 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1967 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp2_ = FALSE;
-#line 1951 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1967 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp5_ = i;
-#line 1951 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1967 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				if (_tmp5_ < MAX_OBJECTS_DISPLAYED) {
-#line 15823 "Dialogs.c"
+#line 15951 "Dialogs.c"
 					GeeArrayList* _tmp6_ = NULL;
 					gint _tmp7_ = 0;
 					gint _tmp8_ = 0;
 					gint _tmp9_ = 0;
-#line 1951 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1967 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp6_ = objects;
-#line 1951 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1967 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp7_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 1951 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1967 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp8_ = _tmp7_;
-#line 1951 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1967 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp9_ = i;
-#line 1951 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1967 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp4_ = _tmp8_ > _tmp9_;
-#line 15838 "Dialogs.c"
+#line 15966 "Dialogs.c"
 				} else {
-#line 1951 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1967 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp4_ = FALSE;
-#line 15842 "Dialogs.c"
+#line 15970 "Dialogs.c"
 				}
-#line 1951 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1967 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				if (!_tmp4_) {
-#line 1951 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1967 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					break;
-#line 15848 "Dialogs.c"
+#line 15976 "Dialogs.c"
 				}
-#line 1952 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1968 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp10_ = dialog_message;
-#line 1952 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1968 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp11_ = objects;
-#line 1952 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1968 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp12_ = i;
-#line 1952 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1968 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp13_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp12_);
-#line 1952 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1968 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp14_ = (DataObject*) _tmp13_;
-#line 1952 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1968 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp15_ = data_object_to_string (_tmp14_);
-#line 1952 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1968 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp16_ = _tmp15_;
-#line 1952 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1968 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp17_ = g_strconcat ("\n", _tmp16_, NULL);
-#line 1952 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1968 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp18_ = _tmp17_;
-#line 1952 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1968 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp19_ = g_strconcat (_tmp10_, _tmp18_, NULL);
-#line 1952 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1968 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_free0 (dialog_message);
-#line 1952 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1968 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				dialog_message = _tmp19_;
-#line 1952 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1968 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_free0 (_tmp18_);
-#line 1952 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1968 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_free0 (_tmp16_);
-#line 1952 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1968 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_object_unref0 (_tmp14_);
-#line 15880 "Dialogs.c"
+#line 16008 "Dialogs.c"
 			}
 		}
 	}
-#line 1954 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1970 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp20_ = objects;
-#line 1954 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1970 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp21_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 1954 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1970 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp22_ = _tmp21_;
-#line 1954 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1970 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	remainder = _tmp22_ - MAX_OBJECTS_DISPLAYED;
-#line 1955 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1971 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp23_ = remainder;
-#line 1955 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1971 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp23_ > 0) {
-#line 15896 "Dialogs.c"
+#line 16024 "Dialogs.c"
 		const gchar* _tmp24_ = NULL;
 		gint _tmp25_ = 0;
 		const gchar* _tmp26_ = NULL;
@@ -15917,57 +16045,57 @@ void multiple_object_error_dialog (GeeArrayList* objects, const gchar* message,
 		gchar* _tmp28_ = NULL;
 		gchar* _tmp29_ = NULL;
 		gchar* _tmp30_ = NULL;
-#line 1956 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1972 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp24_ = dialog_message;
-#line 1956 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1972 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp25_ = remainder;
-#line 1956 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1972 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp26_ = ngettext ("\n\nAnd %d other.", "\n\nAnd %d others.", (gulong) _tmp25_);
-#line 1956 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1972 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp27_ = remainder;
-#line 1956 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1972 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp28_ = g_strdup_printf (_tmp26_, _tmp27_);
-#line 1956 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1972 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp29_ = _tmp28_;
-#line 1956 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1972 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp30_ = g_strconcat (_tmp24_, _tmp29_, NULL);
-#line 1956 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1972 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (dialog_message);
-#line 1956 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1972 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		dialog_message = _tmp30_;
-#line 1956 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1972 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (_tmp29_);
-#line 15924 "Dialogs.c"
+#line 16052 "Dialogs.c"
 	}
-#line 1960 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1976 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp31_ = app_window_get_instance ();
-#line 1960 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1976 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp32_ = _tmp31_;
-#line 1960 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1976 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp33_ = dialog_message;
-#line 1960 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1976 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp34_ = (GtkMessageDialog*) gtk_message_dialog_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, gtk_window_get_type (), GtkWindow), GTK_DIALOG_MODAL, GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, "%s", _tmp33_);
-#line 1960 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1976 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_object_ref_sink (_tmp34_);
-#line 1960 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1976 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp35_ = _tmp34_;
-#line 1960 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1976 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (_tmp32_);
-#line 1960 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1976 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	dialog = _tmp35_;
-#line 1963 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1979 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp36_ = title;
-#line 1963 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1979 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_window_set_title (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_window_get_type (), GtkWindow), _tmp36_);
-#line 1965 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1981 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_dialog_get_type (), GtkDialog));
-#line 1966 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1982 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_widget_get_type (), GtkWidget));
-#line 1946 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1962 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (dialog);
-#line 1946 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1962 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (dialog_message);
-#line 15954 "Dialogs.c"
+#line 16082 "Dialogs.c"
 }
 
 
@@ -15980,40 +16108,40 @@ TagsDialog* tags_dialog_construct (GType object_type, const gchar* title, const
 	HierarchicalTagIndex* _tmp4_ = NULL;
 	GeeCollection* _tmp5_ = NULL;
 	GeeCollection* _tmp6_ = NULL;
-#line 1970 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1986 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (title != NULL, NULL);
-#line 1970 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1986 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (label != NULL, NULL);
-#line 1971 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1987 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = title;
-#line 1971 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1987 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = label;
-#line 1971 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1987 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = initial_text;
-#line 1971 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1987 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = hierarchical_tag_index_get_global_index ();
-#line 1971 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1987 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp4_ = _tmp3_;
-#line 1971 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1987 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp5_ = hierarchical_tag_index_get_all_tags (_tmp4_);
-#line 1971 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1987 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp6_ = _tmp5_;
-#line 1971 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1987 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self = (TagsDialog*) text_entry_dialog_mediator_construct (object_type, _tmp0_, _tmp1_, _tmp2_, _tmp6_, ",");
-#line 1971 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1987 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (_tmp6_);
-#line 1971 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1987 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_hierarchical_tag_index_unref0 (_tmp4_);
-#line 1970 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1986 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return self;
-#line 15993 "Dialogs.c"
+#line 16121 "Dialogs.c"
 }
 
 
 static void tags_dialog_class_init (TagsDialogClass * klass) {
-#line 1969 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1985 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	tags_dialog_parent_class = g_type_class_peek_parent (klass);
-#line 16000 "Dialogs.c"
+#line 16128 "Dialogs.c"
 }
 
 
@@ -16039,28 +16167,28 @@ AddTagsDialog* add_tags_dialog_construct (GType object_type) {
 	const gchar* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
 	const gchar* _tmp2_ = NULL;
-#line 1978 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1994 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = g_dpgettext2 (NULL, "Dialog Title", RESOURCES_ADD_TAGS_TITLE);
-#line 1978 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1994 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 1978 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1994 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	title = _tmp1_;
-#line 1980 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1996 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = _ ("Tags (separated by commas):");
-#line 1980 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1996 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self = (AddTagsDialog*) tags_dialog_construct (object_type, title, _tmp2_, NULL);
-#line 1977 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1993 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (title);
-#line 1977 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1993 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return self;
-#line 16040 "Dialogs.c"
+#line 16168 "Dialogs.c"
 }
 
 
 AddTagsDialog* add_tags_dialog_new (void) {
-#line 1977 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1993 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return add_tags_dialog_construct (TYPE_ADD_TAGS_DIALOG);
-#line 16047 "Dialogs.c"
+#line 16175 "Dialogs.c"
 }
 
 
@@ -16080,70 +16208,70 @@ gchar** add_tags_dialog_execute (AddTagsDialog* self, int* result_length1) {
 	gint _tmp9__length1 = 0;
 	gchar** _tmp10_ = NULL;
 	gint _tmp10__length1 = 0;
-#line 1983 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1999 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (IS_ADD_TAGS_DIALOG (self), NULL);
-#line 1984 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2000 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = _text_entry_dialog_mediator_execute (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_TEXT_ENTRY_DIALOG_MEDIATOR, TextEntryDialogMediator));
-#line 1984 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2000 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	text = _tmp0_;
-#line 1985 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2001 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = text;
-#line 1985 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2001 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp1_ == NULL) {
-#line 16077 "Dialogs.c"
+#line 16205 "Dialogs.c"
 		gchar** _tmp2_ = NULL;
 		gint _tmp2__length1 = 0;
-#line 1986 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2002 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp2_ = NULL;
-#line 1986 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2002 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp2__length1 = 0;
-#line 1986 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2002 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (result_length1) {
-#line 1986 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2002 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			*result_length1 = _tmp2__length1;
-#line 16088 "Dialogs.c"
+#line 16216 "Dialogs.c"
 		}
-#line 1986 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2002 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		result = _tmp2_;
-#line 1986 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2002 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (text);
-#line 1986 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2002 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		return result;
-#line 16096 "Dialogs.c"
+#line 16224 "Dialogs.c"
 	}
-#line 1990 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2006 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = text;
-#line 1990 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2006 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp5_ = _tmp4_ = g_strsplit (_tmp3_, ",", 0);
-#line 1990 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2006 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp6_ = _tmp5_;
-#line 1990 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2006 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp6__length1 = _vala_array_length (_tmp4_);
-#line 1990 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2006 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp8_ = tag_prep_tag_names (_tmp6_, _vala_array_length (_tmp4_), &_tmp7_);
-#line 1990 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2006 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp9_ = _tmp8_;
-#line 1990 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2006 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp9__length1 = _tmp7_;
-#line 1990 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2006 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp6_ = (_vala_array_free (_tmp6_, _tmp6__length1, (GDestroyNotify) g_free), NULL);
-#line 1990 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2006 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp10_ = _tmp9_;
-#line 1990 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2006 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp10__length1 = _tmp9__length1;
-#line 1990 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2006 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (result_length1) {
-#line 1990 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2006 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		*result_length1 = _tmp10__length1;
-#line 16122 "Dialogs.c"
+#line 16250 "Dialogs.c"
 	}
-#line 1990 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2006 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	result = _tmp10_;
-#line 1990 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2006 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (text);
-#line 1990 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2006 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 16130 "Dialogs.c"
+#line 16258 "Dialogs.c"
 }
 
 
@@ -16166,64 +16294,64 @@ static gboolean add_tags_dialog_real_on_modify_validate (TextEntryDialogMediator
 	gint _names_size_ = 0;
 	gchar** _tmp9_ = NULL;
 	gint _tmp9__length1 = 0;
-#line 1993 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2009 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_ADD_TAGS_DIALOG, AddTagsDialog);
-#line 1993 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2009 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (text != NULL, FALSE);
-#line 1994 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2010 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = text;
-#line 1994 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2010 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = string_contains (_tmp0_, TAG_PATH_SEPARATOR_STRING);
-#line 1994 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2010 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp1_) {
-#line 1995 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2011 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		result = FALSE;
-#line 1995 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2011 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		return result;
-#line 16167 "Dialogs.c"
+#line 16295 "Dialogs.c"
 	}
-#line 1999 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2015 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = text;
-#line 1999 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2015 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp4_ = _tmp3_ = g_strsplit (_tmp2_, ",", 0);
-#line 1999 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2015 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp5_ = _tmp4_;
-#line 1999 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2015 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp5__length1 = _vala_array_length (_tmp3_);
-#line 1999 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2015 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp7_ = tag_prep_tag_names (_tmp5_, _vala_array_length (_tmp3_), &_tmp6_);
-#line 1999 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2015 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp8_ = _tmp7_;
-#line 1999 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2015 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp8__length1 = _tmp6_;
-#line 1999 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2015 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp5_ = (_vala_array_free (_tmp5_, _tmp5__length1, (GDestroyNotify) g_free), NULL);
-#line 1999 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2015 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	names = _tmp8_;
-#line 1999 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2015 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	names_length1 = _tmp8__length1;
-#line 1999 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2015 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_names_size_ = names_length1;
-#line 2001 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2017 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp9_ = names;
-#line 2001 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2017 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp9__length1 = names_length1;
-#line 2001 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2017 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	result = _tmp9__length1 > 0;
-#line 2001 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2017 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	names = (_vala_array_free (names, names_length1, (GDestroyNotify) g_free), NULL);
-#line 2001 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2017 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 16201 "Dialogs.c"
+#line 16329 "Dialogs.c"
 }
 
 
 static void add_tags_dialog_class_init (AddTagsDialogClass * klass) {
-#line 1976 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1992 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	add_tags_dialog_parent_class = g_type_class_peek_parent (klass);
-#line 1976 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 1992 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	((TextEntryDialogMediatorClass *) klass)->on_modify_validate = add_tags_dialog_real_on_modify_validate;
-#line 16210 "Dialogs.c"
+#line 16338 "Dialogs.c"
 }
 
 
@@ -16249,30 +16377,30 @@ ModifyTagsDialog* modify_tags_dialog_construct (GType object_type, MediaSource*
 	MediaSource* _tmp1_ = NULL;
 	gchar* _tmp2_ = NULL;
 	gchar* _tmp3_ = NULL;
-#line 2006 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2022 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (IS_MEDIA_SOURCE (source), NULL);
-#line 2007 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2023 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = _ ("Tags (separated by commas):");
-#line 2007 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2023 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = source;
-#line 2007 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2023 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = modify_tags_dialog_get_initial_text (_tmp1_);
-#line 2007 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2023 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = _tmp2_;
-#line 2007 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2023 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self = (ModifyTagsDialog*) tags_dialog_construct (object_type, RESOURCES_MODIFY_TAGS_LABEL, _tmp0_, _tmp3_);
-#line 2007 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2023 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (_tmp3_);
-#line 2006 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2022 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return self;
-#line 16252 "Dialogs.c"
+#line 16380 "Dialogs.c"
 }
 
 
 ModifyTagsDialog* modify_tags_dialog_new (MediaSource* source) {
-#line 2006 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2022 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return modify_tags_dialog_construct (TYPE_MODIFY_TAGS_DIALOG, source);
-#line 16259 "Dialogs.c"
+#line 16387 "Dialogs.c"
 }
 
 
@@ -16289,52 +16417,52 @@ static gchar* modify_tags_dialog_get_initial_text (MediaSource* source) {
 	GeeSortedSet* tag_basenames = NULL;
 	GeeTreeSet* _tmp6_ = NULL;
 	gchar* text = NULL;
-#line 2011 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2027 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (IS_MEDIA_SOURCE (source), NULL);
-#line 2012 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2028 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = tag_global;
-#line 2012 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2028 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = source;
-#line 2012 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2028 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = tag_source_collection_fetch_for_source (_tmp0_, _tmp1_);
-#line 2012 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2028 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	source_tags = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 2013 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2029 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = source_tags;
-#line 2013 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2029 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp3_ == NULL) {
-#line 2014 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2030 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		result = NULL;
-#line 2014 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2030 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (source_tags);
-#line 2014 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2030 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		return result;
-#line 16296 "Dialogs.c"
+#line 16424 "Dialogs.c"
 	}
-#line 2016 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2032 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp4_ = source_tags;
-#line 2016 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2032 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp5_ = tag_get_terminal_tags (_tmp4_);
-#line 2016 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2032 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	terminal_tags = _tmp5_;
-#line 2018 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2034 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp6_ = gee_tree_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, NULL, NULL, NULL);
-#line 2018 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2034 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	tag_basenames = G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_SORTED_SET, GeeSortedSet);
-#line 16308 "Dialogs.c"
+#line 16436 "Dialogs.c"
 	{
 		GeeIterator* _tag_it = NULL;
 		GeeCollection* _tmp7_ = NULL;
 		GeeIterator* _tmp8_ = NULL;
-#line 2019 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2035 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp7_ = terminal_tags;
-#line 2019 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2035 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp8_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 2019 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2035 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tag_it = _tmp8_;
-#line 2019 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2035 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		while (TRUE) {
-#line 16321 "Dialogs.c"
+#line 16449 "Dialogs.c"
 			GeeIterator* _tmp9_ = NULL;
 			gboolean _tmp10_ = FALSE;
 			Tag* tag = NULL;
@@ -16346,64 +16474,64 @@ static gchar* modify_tags_dialog_get_initial_text (MediaSource* source) {
 			gchar* _tmp16_ = NULL;
 			gchar* _tmp17_ = NULL;
 			gchar* _tmp18_ = NULL;
-#line 2019 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2035 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp9_ = _tag_it;
-#line 2019 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2035 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp10_ = gee_iterator_next (_tmp9_);
-#line 2019 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2035 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			if (!_tmp10_) {
-#line 2019 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2035 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				break;
-#line 16341 "Dialogs.c"
+#line 16469 "Dialogs.c"
 			}
-#line 2019 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2035 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp11_ = _tag_it;
-#line 2019 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2035 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp12_ = gee_iterator_get (_tmp11_);
-#line 2019 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2035 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			tag = (Tag*) _tmp12_;
-#line 2020 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2036 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp13_ = tag_basenames;
-#line 2020 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2036 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp14_ = tag;
-#line 2020 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2036 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp15_ = tag_get_path (_tmp14_);
-#line 2020 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2036 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp16_ = _tmp15_;
-#line 2020 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2036 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp17_ = hierarchical_tag_utilities_get_basename (_tmp16_);
-#line 2020 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2036 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp18_ = _tmp17_;
-#line 2020 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2036 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_COLLECTION, GeeCollection), _tmp18_);
-#line 2020 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2036 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_free0 (_tmp18_);
-#line 2020 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2036 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_free0 (_tmp16_);
-#line 2019 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2035 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_object_unref0 (tag);
-#line 16369 "Dialogs.c"
+#line 16497 "Dialogs.c"
 		}
-#line 2019 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2035 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (_tag_it);
-#line 16373 "Dialogs.c"
+#line 16501 "Dialogs.c"
 	}
-#line 2022 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2038 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	text = NULL;
-#line 16377 "Dialogs.c"
+#line 16505 "Dialogs.c"
 	{
 		GeeIterator* _name_it = NULL;
 		GeeSortedSet* _tmp19_ = NULL;
 		GeeIterator* _tmp20_ = NULL;
-#line 2023 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2039 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp19_ = tag_basenames;
-#line 2023 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2039 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp20_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 2023 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2039 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_name_it = _tmp20_;
-#line 2023 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2039 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		while (TRUE) {
-#line 16390 "Dialogs.c"
+#line 16518 "Dialogs.c"
 			GeeIterator* _tmp21_ = NULL;
 			gboolean _tmp22_ = FALSE;
 			gchar* name = NULL;
@@ -16413,77 +16541,77 @@ static gchar* modify_tags_dialog_get_initial_text (MediaSource* source) {
 			const gchar* _tmp29_ = NULL;
 			const gchar* _tmp30_ = NULL;
 			gchar* _tmp31_ = NULL;
-#line 2023 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2039 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp21_ = _name_it;
-#line 2023 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2039 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp22_ = gee_iterator_next (_tmp21_);
-#line 2023 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2039 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			if (!_tmp22_) {
-#line 2023 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2039 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				break;
-#line 16408 "Dialogs.c"
+#line 16536 "Dialogs.c"
 			}
-#line 2023 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2039 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp23_ = _name_it;
-#line 2023 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2039 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp24_ = gee_iterator_get (_tmp23_);
-#line 2023 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2039 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			name = (gchar*) _tmp24_;
-#line 2024 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2040 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp25_ = text;
-#line 2024 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2040 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			if (_tmp25_ == NULL) {
-#line 16420 "Dialogs.c"
+#line 16548 "Dialogs.c"
 				gchar* _tmp26_ = NULL;
-#line 2025 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2041 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp26_ = g_strdup ("");
-#line 2025 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2041 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_free0 (text);
-#line 2025 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2041 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				text = _tmp26_;
-#line 16428 "Dialogs.c"
+#line 16556 "Dialogs.c"
 			} else {
 				const gchar* _tmp27_ = NULL;
 				gchar* _tmp28_ = NULL;
-#line 2027 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2043 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp27_ = text;
-#line 2027 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2043 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp28_ = g_strconcat (_tmp27_, ", ", NULL);
-#line 2027 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2043 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_free0 (text);
-#line 2027 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2043 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				text = _tmp28_;
-#line 16440 "Dialogs.c"
+#line 16568 "Dialogs.c"
 			}
-#line 2029 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2045 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp29_ = text;
-#line 2029 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2045 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp30_ = name;
-#line 2029 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2045 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp31_ = g_strconcat (_tmp29_, _tmp30_, NULL);
-#line 2029 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2045 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_free0 (text);
-#line 2029 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2045 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			text = _tmp31_;
-#line 2023 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2039 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_free0 (name);
-#line 16454 "Dialogs.c"
+#line 16582 "Dialogs.c"
 		}
-#line 2023 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2039 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (_name_it);
-#line 16458 "Dialogs.c"
+#line 16586 "Dialogs.c"
 	}
-#line 2032 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2048 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	result = text;
-#line 2032 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2048 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (tag_basenames);
-#line 2032 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2048 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (terminal_tags);
-#line 2032 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2048 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (source_tags);
-#line 2032 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2048 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 16470 "Dialogs.c"
+#line 16598 "Dialogs.c"
 }
 
 
@@ -16516,140 +16644,140 @@ GeeArrayList* modify_tags_dialog_execute (ModifyTagsDialog* self) {
 	gchar** _tmp16_ = NULL;
 	gchar** _tmp17_ = NULL;
 	gint _tmp17__length1 = 0;
-#line 2035 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2051 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (IS_MODIFY_TAGS_DIALOG (self), NULL);
-#line 2036 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2052 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = _text_entry_dialog_mediator_execute (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_TEXT_ENTRY_DIALOG_MEDIATOR, TextEntryDialogMediator));
-#line 2036 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2052 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	text = _tmp0_;
-#line 2037 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2053 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = text;
-#line 2037 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2053 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp1_ == NULL) {
-#line 2038 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2054 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		result = NULL;
-#line 2038 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2054 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (text);
-#line 2038 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2054 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		return result;
-#line 16519 "Dialogs.c"
+#line 16647 "Dialogs.c"
 	}
-#line 2040 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2056 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = gee_array_list_new (TYPE_TAG, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
-#line 2040 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2056 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	new_tags = _tmp2_;
-#line 2043 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2059 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = text;
-#line 2043 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2059 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp4_ = is_string_empty (_tmp3_);
-#line 2043 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2059 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp4_) {
-#line 2044 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2060 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		result = new_tags;
-#line 2044 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2060 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (text);
-#line 2044 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2060 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		return result;
-#line 16537 "Dialogs.c"
+#line 16665 "Dialogs.c"
 	}
-#line 2047 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2063 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp5_ = text;
-#line 2047 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2063 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp7_ = _tmp6_ = g_strsplit (_tmp5_, ",", 0);
-#line 2047 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2063 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp8_ = _tmp7_;
-#line 2047 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2063 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp8__length1 = _vala_array_length (_tmp6_);
-#line 2047 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2063 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp10_ = tag_prep_tag_names (_tmp8_, _vala_array_length (_tmp6_), &_tmp9_);
-#line 2047 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2063 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp11_ = _tmp10_;
-#line 2047 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2063 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp11__length1 = _tmp9_;
-#line 2047 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2063 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp8_ = (_vala_array_free (_tmp8_, _tmp8__length1, (GDestroyNotify) g_free), NULL);
-#line 2047 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2063 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	tag_names = _tmp11_;
-#line 2047 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2063 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	tag_names_length1 = _tmp11__length1;
-#line 2047 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2063 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tag_names_size_ = tag_names_length1;
-#line 2049 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2065 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp12_ = hierarchical_tag_index_get_global_index ();
-#line 2049 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2065 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp13_ = _tmp12_;
-#line 2049 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2065 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp14_ = tag_names;
-#line 2049 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2065 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp14__length1 = tag_names_length1;
-#line 2049 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2065 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp16_ = hierarchical_tag_index_get_paths_for_names_array (_tmp13_, _tmp14_, _tmp14__length1, &_tmp15_);
-#line 2049 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2065 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	tag_names = (_vala_array_free (tag_names, tag_names_length1, (GDestroyNotify) g_free), NULL);
-#line 2049 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2065 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	tag_names = _tmp16_;
-#line 2049 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2065 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	tag_names_length1 = _tmp15_;
-#line 2049 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2065 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tag_names_size_ = tag_names_length1;
-#line 2049 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2065 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_hierarchical_tag_index_unref0 (_tmp13_);
-#line 2051 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2067 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp17_ = tag_names;
-#line 2051 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2067 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp17__length1 = tag_names_length1;
-#line 16585 "Dialogs.c"
+#line 16713 "Dialogs.c"
 	{
 		gchar** name_collection = NULL;
 		gint name_collection_length1 = 0;
 		gint _name_collection_size_ = 0;
 		gint name_it = 0;
-#line 2051 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2067 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		name_collection = _tmp17_;
-#line 2051 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2067 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		name_collection_length1 = _tmp17__length1;
-#line 2051 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2067 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		for (name_it = 0; name_it < _tmp17__length1; name_it = name_it + 1) {
-#line 16597 "Dialogs.c"
+#line 16725 "Dialogs.c"
 			gchar* _tmp18_ = NULL;
 			gchar* name = NULL;
-#line 2051 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2067 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp18_ = g_strdup (name_collection[name_it]);
-#line 2051 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2067 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			name = _tmp18_;
-#line 16604 "Dialogs.c"
+#line 16732 "Dialogs.c"
 			{
 				GeeArrayList* _tmp19_ = NULL;
 				const gchar* _tmp20_ = NULL;
 				Tag* _tmp21_ = NULL;
 				Tag* _tmp22_ = NULL;
-#line 2052 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2068 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp19_ = new_tags;
-#line 2052 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2068 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp20_ = name;
-#line 2052 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2068 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp21_ = tag_for_path (_tmp20_);
-#line 2052 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2068 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp22_ = _tmp21_;
-#line 2052 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2068 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp22_);
-#line 2052 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2068 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_object_unref0 (_tmp22_);
-#line 2051 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2067 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_free0 (name);
-#line 16624 "Dialogs.c"
+#line 16752 "Dialogs.c"
 			}
 		}
 	}
-#line 2054 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2070 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	result = new_tags;
-#line 2054 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2070 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	tag_names = (_vala_array_free (tag_names, tag_names_length1, (GDestroyNotify) g_free), NULL);
-#line 2054 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2070 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (text);
-#line 2054 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2070 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 16636 "Dialogs.c"
+#line 16764 "Dialogs.c"
 }
 
 
@@ -16658,28 +16786,28 @@ static gboolean modify_tags_dialog_real_on_modify_validate (TextEntryDialogMedia
 	gboolean result = FALSE;
 	const gchar* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
-#line 2057 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2073 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_MODIFY_TAGS_DIALOG, ModifyTagsDialog);
-#line 2057 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2073 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (text != NULL, FALSE);
-#line 2058 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2074 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = text;
-#line 2058 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2074 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = string_contains (_tmp0_, TAG_PATH_SEPARATOR_STRING);
-#line 2058 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2074 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	result = !_tmp1_;
-#line 2058 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2074 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 16657 "Dialogs.c"
+#line 16785 "Dialogs.c"
 }
 
 
 static void modify_tags_dialog_class_init (ModifyTagsDialogClass * klass) {
-#line 2005 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2021 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	modify_tags_dialog_parent_class = g_type_class_peek_parent (klass);
-#line 2005 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2021 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	((TextEntryDialogMediatorClass *) klass)->on_modify_validate = modify_tags_dialog_real_on_modify_validate;
-#line 16666 "Dialogs.c"
+#line 16794 "Dialogs.c"
 }
 
 
@@ -16700,31 +16828,31 @@ GType modify_tags_dialog_get_type (void) {
 
 
 gchar* welcome_service_entry_get_service_name (WelcomeServiceEntry* self) {
-#line 2064 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2080 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (IS_WELCOME_SERVICE_ENTRY (self), NULL);
-#line 2064 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2080 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return WELCOME_SERVICE_ENTRY_GET_INTERFACE (self)->get_service_name (self);
-#line 16691 "Dialogs.c"
+#line 16819 "Dialogs.c"
 }
 
 
 void welcome_service_entry_execute (WelcomeServiceEntry* self) {
-#line 2066 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2082 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_WELCOME_SERVICE_ENTRY (self));
-#line 2066 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2082 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	WELCOME_SERVICE_ENTRY_GET_INTERFACE (self)->execute (self);
-#line 16700 "Dialogs.c"
+#line 16828 "Dialogs.c"
 }
 
 
 static void welcome_service_entry_base_init (WelcomeServiceEntryIface * iface) {
-#line 2063 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2079 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	static gboolean initialized = FALSE;
-#line 2063 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2079 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (!initialized) {
-#line 2063 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2079 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		initialized = TRUE;
-#line 16711 "Dialogs.c"
+#line 16839 "Dialogs.c"
 	}
 }
 
@@ -16834,243 +16962,243 @@ WelcomeDialog* welcome_dialog_construct (GType object_type, GtkWindow* owner) {
 	GtkBox* _tmp87_ = NULL;
 	GtkWidget* _tmp88_ = NULL;
 	SpitDataImportsWelcomeImportMetaHost* _tmp89_ = NULL;
-#line 2083 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2099 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (GTK_IS_WINDOW (owner), NULL);
-#line 2083 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2099 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self = (WelcomeDialog*) g_object_new (object_type, NULL);
-#line 2084 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2100 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = spit_data_imports_welcome_import_meta_host_new (self);
-#line 2084 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2100 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->import_meta_host);
-#line 2084 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2100 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->import_meta_host = _tmp0_;
-#line 2085 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2101 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = welcome_dialog_is_system_pictures_import_possible ();
-#line 2085 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2101 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	show_system_pictures_import = _tmp1_;
-#line 2086 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2102 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = gtk_dialog_add_button (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), RESOURCES_OK_LABEL, (gint) GTK_RESPONSE_OK);
-#line 2086 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2102 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = _g_object_ref0 (_tmp2_);
-#line 2086 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2102 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	ok_button = _tmp3_;
-#line 2087 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2103 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp4_ = _ ("Welcome!");
-#line 2087 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2103 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_window_set_title (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), _tmp4_);
-#line 2088 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2104 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_window_set_resizable (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), FALSE);
-#line 2089 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2105 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_window_set_type_hint (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), GDK_WINDOW_TYPE_HINT_DIALOG);
-#line 2090 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2106 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp5_ = owner;
-#line 2090 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2106 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_window_set_transient_for (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), _tmp5_);
-#line 2092 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2108 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp6_ = (GtkLabel*) gtk_label_new ("");
-#line 2092 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2108 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_object_ref_sink (_tmp6_);
-#line 2092 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2108 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	primary_text = _tmp6_;
-#line 2093 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2109 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp7_ = primary_text;
-#line 2093 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2109 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp8_ = _ ("Welcome to Shotwell!");
-#line 2093 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2109 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp9_ = g_strdup_printf ("<span size=\"large\" weight=\"bold\">%s</span>", _tmp8_);
-#line 2093 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2109 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp10_ = _tmp9_;
-#line 2093 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2109 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_label_set_markup (_tmp7_, _tmp10_);
-#line 2093 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2109 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (_tmp10_);
-#line 2095 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2111 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp11_ = primary_text;
-#line 2095 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2111 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_misc_set_alignment (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_misc_get_type (), GtkMisc), (gfloat) 0, 0.5f);
-#line 2096 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2112 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp12_ = (GtkLabel*) gtk_label_new ("");
-#line 2096 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2112 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_object_ref_sink (_tmp12_);
-#line 2096 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2112 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->secondary_text);
-#line 2096 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2112 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->secondary_text = _tmp12_;
-#line 2097 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2113 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp13_ = self->priv->secondary_text;
-#line 2097 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2113 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp14_ = _ ("To get started, import photos in any of these ways:");
-#line 2097 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2113 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp15_ = g_strdup_printf ("<span weight=\"normal\">%s</span>", _tmp14_);
-#line 2097 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2113 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp16_ = _tmp15_;
-#line 2097 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2113 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_label_set_markup (_tmp13_, _tmp16_);
-#line 2097 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2113 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (_tmp16_);
-#line 2099 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2115 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp17_ = self->priv->secondary_text;
-#line 2099 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2115 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_misc_set_alignment (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_misc_get_type (), GtkMisc), (gfloat) 0, 0.5f);
-#line 2100 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2116 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp18_ = (GtkImage*) gtk_image_new_from_icon_name ("shotwell", GTK_ICON_SIZE_DIALOG);
-#line 2100 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2116 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_object_ref_sink (_tmp18_);
-#line 2100 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2116 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	image = _tmp18_;
-#line 2102 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2118 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp19_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
-#line 2102 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2118 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_object_ref_sink (_tmp19_);
-#line 2102 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2118 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	header_text = _tmp19_;
-#line 2103 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2119 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp20_ = header_text;
-#line 2103 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2119 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp21_ = primary_text;
-#line 2103 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2119 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_box_pack_start (_tmp20_, G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 5);
-#line 2104 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2120 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp22_ = header_text;
-#line 2104 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2120 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp23_ = self->priv->secondary_text;
-#line 2104 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2120 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_box_pack_start (_tmp22_, G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
-#line 2106 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2122 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp24_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
-#line 2106 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2122 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_object_ref_sink (_tmp24_);
-#line 2106 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2122 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	header_content = _tmp24_;
-#line 2107 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2123 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp25_ = header_content;
-#line 2107 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2123 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp26_ = image;
-#line 2107 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2123 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_box_pack_start (_tmp25_, G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
-#line 2108 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2124 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp27_ = header_content;
-#line 2108 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2124 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp28_ = header_text;
-#line 2108 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2124 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_box_pack_start (_tmp27_, G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
-#line 2110 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2126 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp29_ = (GtkLabel*) gtk_label_new ("");
-#line 2110 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2126 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_object_ref_sink (_tmp29_);
-#line 2110 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2126 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	instructions = _tmp29_;
-#line 2111 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2127 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp30_ = g_strdup ("   ");
-#line 2111 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2127 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	indent_prefix = _tmp30_;
-#line 2113 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2129 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp32_ = gtk_widget_get_direction (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 2113 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2129 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp32_ == GTK_TEXT_DIR_RTL) {
-#line 2113 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2129 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp31_ = "◂";
-#line 16957 "Dialogs.c"
+#line 17085 "Dialogs.c"
 	} else {
-#line 2113 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2129 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp31_ = "▸";
-#line 16961 "Dialogs.c"
+#line 17089 "Dialogs.c"
 	}
-#line 2113 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2129 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp33_ = g_strdup (_tmp31_);
-#line 2113 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2129 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	arrow_glyph = _tmp33_;
-#line 2115 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2131 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp34_ = instructions;
-#line 2115 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2131 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp35_ = indent_prefix;
-#line 2115 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2131 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp36_ = g_strconcat (_tmp35_, "&#8226; %s\n", NULL);
-#line 2115 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2131 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp37_ = _tmp36_;
-#line 2115 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2131 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp38_ = indent_prefix;
-#line 2115 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2131 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp39_ = g_strconcat (_tmp38_, "&#8226; %s\n", NULL);
-#line 2115 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2131 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp40_ = _tmp39_;
-#line 2115 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2131 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp41_ = g_strconcat (_tmp37_, _tmp40_, NULL);
-#line 2115 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2131 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp42_ = _tmp41_;
-#line 2115 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2131 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp43_ = indent_prefix;
-#line 2115 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2131 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp44_ = g_strconcat (_tmp43_, "&#8226; %s", NULL);
-#line 2115 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2131 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp45_ = _tmp44_;
-#line 2115 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2131 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp46_ = g_strconcat (_tmp42_, _tmp45_, NULL);
-#line 2115 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2131 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp47_ = _tmp46_;
-#line 2115 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2131 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp48_ = _ ("Choose <span weight=\"bold\">File %s Import From Folder</span>");
-#line 2115 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2131 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp49_ = arrow_glyph;
-#line 2115 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2131 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp50_ = g_strdup_printf (_tmp48_, _tmp49_);
-#line 2115 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2131 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp51_ = _tmp50_;
-#line 2115 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2131 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp52_ = _ ("Drag and drop photos onto the Shotwell window");
-#line 2115 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2131 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp53_ = _ ("Connect a camera to your computer and import");
-#line 2115 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2131 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp54_ = g_strdup_printf (_tmp47_, _tmp51_, _tmp52_, _tmp53_);
-#line 2115 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2131 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp55_ = _tmp54_;
-#line 2115 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2131 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_label_set_markup (_tmp34_, _tmp55_);
-#line 2115 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2131 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (_tmp55_);
-#line 2115 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2131 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (_tmp51_);
-#line 2115 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2131 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (_tmp47_);
-#line 2115 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2131 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (_tmp45_);
-#line 2115 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2131 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (_tmp42_);
-#line 2115 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2131 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (_tmp40_);
-#line 2115 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2131 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (_tmp37_);
-#line 2120 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2136 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp56_ = instructions;
-#line 2120 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2136 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_misc_set_alignment (G_TYPE_CHECK_INSTANCE_CAST (_tmp56_, gtk_misc_get_type (), GtkMisc), (gfloat) 0, 0.5f);
-#line 2122 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2138 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp57_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 2);
-#line 2122 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2138 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_object_ref_sink (_tmp57_);
-#line 2122 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2138 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->import_action_checkbox_packer);
-#line 2122 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2138 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->import_action_checkbox_packer = _tmp57_;
-#line 2124 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2140 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp58_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 2);
-#line 2124 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2140 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_object_ref_sink (_tmp58_);
-#line 2124 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2140 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->external_import_action_checkbox_packer);
-#line 2124 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2140 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->external_import_action_checkbox_packer = _tmp58_;
-#line 2125 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2141 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp59_ = self->priv->import_action_checkbox_packer;
-#line 2125 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2141 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp60_ = self->priv->external_import_action_checkbox_packer;
-#line 2125 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2141 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp59_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp60_, gtk_widget_get_type (), GtkWidget));
-#line 2127 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2143 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp61_ = show_system_pictures_import;
-#line 2127 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2143 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp61_) {
-#line 17057 "Dialogs.c"
+#line 17185 "Dialogs.c"
 		const gchar* _tmp62_ = NULL;
 		GFile* _tmp63_ = NULL;
 		GFile* _tmp64_ = NULL;
@@ -17082,164 +17210,164 @@ WelcomeDialog* welcome_dialog_construct (GType object_type, GtkWindow* owner) {
 		GtkBox* _tmp70_ = NULL;
 		GtkCheckButton* _tmp71_ = NULL;
 		GtkCheckButton* _tmp72_ = NULL;
-#line 2128 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2144 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp62_ = _ ("_Import photos from your %s folder");
-#line 2128 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2144 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp63_ = app_dirs_get_import_dir ();
-#line 2128 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2144 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp64_ = _tmp63_;
-#line 2128 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2144 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp65_ = get_display_pathname (_tmp64_);
-#line 2128 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2144 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp66_ = _tmp65_;
-#line 2128 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2144 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp67_ = g_strdup_printf (_tmp62_, _tmp66_);
-#line 2128 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2144 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp68_ = _tmp67_;
-#line 2128 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2144 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp69_ = (GtkCheckButton*) gtk_check_button_new_with_mnemonic (_tmp68_);
-#line 2128 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2144 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		g_object_ref_sink (_tmp69_);
-#line 2128 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2144 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (self->priv->system_pictures_import_check);
-#line 2128 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2144 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		self->priv->system_pictures_import_check = _tmp69_;
-#line 2128 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2144 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (_tmp68_);
-#line 2128 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2144 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (_tmp66_);
-#line 2128 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2144 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (_tmp64_);
-#line 2131 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2147 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp70_ = self->priv->import_action_checkbox_packer;
-#line 2131 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2147 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp71_ = self->priv->system_pictures_import_check;
-#line 2131 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2147 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp70_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp71_, gtk_widget_get_type (), GtkWidget));
-#line 2132 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2148 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp72_ = self->priv->system_pictures_import_check;
-#line 2132 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2148 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp72_, gtk_toggle_button_get_type (), GtkToggleButton), TRUE);
-#line 17107 "Dialogs.c"
+#line 17235 "Dialogs.c"
 	}
-#line 2135 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2151 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp73_ = _ ("You can also import photos in any of these ways:");
-#line 2135 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2151 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp74_ = (GtkLabel*) gtk_label_new (_tmp73_);
-#line 2135 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2151 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_object_ref_sink (_tmp74_);
-#line 2135 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2151 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->instruction_header);
-#line 2135 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2151 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->instruction_header = _tmp74_;
-#line 2137 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2153 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp75_ = self->priv->instruction_header;
-#line 2137 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2153 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_misc_set_alignment (G_TYPE_CHECK_INSTANCE_CAST (_tmp75_, gtk_misc_get_type (), GtkMisc), 0.0f, 0.5f);
-#line 2138 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2154 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp76_ = self->priv->instruction_header;
-#line 2138 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2154 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_set_margin_top (G_TYPE_CHECK_INSTANCE_CAST (_tmp76_, gtk_widget_get_type (), GtkWidget), 20);
-#line 2140 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2156 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp77_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 16);
-#line 2140 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2156 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_object_ref_sink (_tmp77_);
-#line 2140 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2156 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	content = _tmp77_;
-#line 2141 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2157 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp78_ = header_content;
-#line 2141 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2157 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_box_pack_start (content, G_TYPE_CHECK_INSTANCE_CAST (_tmp78_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0);
-#line 2142 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2158 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp79_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 2);
-#line 2142 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2158 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_object_ref_sink (_tmp79_);
-#line 2142 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2158 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->import_content);
-#line 2142 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2158 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->import_content = _tmp79_;
-#line 2143 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2159 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp80_ = self->priv->import_content;
-#line 2143 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2159 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (content, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp80_, gtk_widget_get_type (), GtkWidget));
-#line 2144 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2160 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp81_ = instructions;
-#line 2144 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2160 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_box_pack_start (content, G_TYPE_CHECK_INSTANCE_CAST (_tmp81_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
-#line 2146 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	_tmp82_ = _ ("_Don't show this message again");
-#line 2146 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2162 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	_tmp82_ = _ ("_Don’t show this message again");
+#line 2162 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp83_ = (GtkCheckButton*) gtk_check_button_new_with_mnemonic (_tmp82_);
-#line 2146 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2162 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_object_ref_sink (_tmp83_);
-#line 2146 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2162 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->hide_button);
-#line 2146 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2162 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->hide_button = _tmp83_;
-#line 2147 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2163 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp84_ = self->priv->hide_button;
-#line 2147 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2163 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp84_, gtk_toggle_button_get_type (), GtkToggleButton), TRUE);
-#line 2148 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2164 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp85_ = self->priv->hide_button;
-#line 2148 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2164 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_box_pack_start (content, G_TYPE_CHECK_INSTANCE_CAST (_tmp85_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 6);
-#line 2150 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2166 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp86_ = (GtkAlignment*) gtk_alignment_new ((gfloat) 0, (gfloat) 0, (gfloat) 0, (gfloat) 0);
-#line 2150 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2166 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_object_ref_sink (_tmp86_);
-#line 2150 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2166 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	alignment = _tmp86_;
-#line 2151 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2167 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_alignment_set_padding (alignment, (guint) 12, (guint) 0, (guint) 12, (guint) 12);
-#line 2152 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2168 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (alignment, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (content, gtk_widget_get_type (), GtkWidget));
-#line 2154 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2170 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp87_ = (GtkBox*) gtk_dialog_get_content_area (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog));
-#line 2154 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2170 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_box_pack_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp87_, gtk_box_get_type (), GtkBox), G_TYPE_CHECK_INSTANCE_CAST (alignment, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
-#line 2156 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2172 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_window_set_has_resize_grip (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), FALSE);
-#line 2158 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2174 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp88_ = ok_button;
-#line 2158 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2174 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_grab_focus (_tmp88_);
-#line 2160 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2176 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	welcome_dialog_install_import_content (self);
-#line 2162 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2178 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp89_ = self->priv->import_meta_host;
-#line 2162 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2178 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	spit_data_imports_welcome_import_meta_host_start (_tmp89_);
-#line 2083 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2099 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (alignment);
-#line 2083 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2099 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (content);
-#line 2083 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2099 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (arrow_glyph);
-#line 2083 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2099 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (indent_prefix);
-#line 2083 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2099 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (instructions);
-#line 2083 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2099 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (header_content);
-#line 2083 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2099 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (header_text);
-#line 2083 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2099 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (image);
-#line 2083 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2099 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (primary_text);
-#line 2083 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2099 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (ok_button);
-#line 2083 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2099 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return self;
-#line 17219 "Dialogs.c"
+#line 17347 "Dialogs.c"
 }
 
 
 WelcomeDialog* welcome_dialog_new (GtkWindow* owner) {
-#line 2083 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2099 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return welcome_dialog_construct (TYPE_WELCOME_DIALOG, owner);
-#line 17226 "Dialogs.c"
+#line 17354 "Dialogs.c"
 }
 
 
@@ -17248,101 +17376,101 @@ static void welcome_dialog_install_import_content (WelcomeDialog* self) {
 	gboolean _tmp1_ = FALSE;
 	GtkCheckButton** _tmp2_ = NULL;
 	gint _tmp2__length1 = 0;
-#line 2165 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2181 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_WELCOME_DIALOG (self));
-#line 2167 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2183 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = self->priv->external_import_checks;
-#line 2167 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2183 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2__length1 = self->priv->external_import_checks_length1;
-#line 2167 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2183 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp2__length1 > 0) {
-#line 2167 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2183 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp1_ = TRUE;
-#line 17245 "Dialogs.c"
+#line 17373 "Dialogs.c"
 	} else {
 		GtkCheckButton* _tmp3_ = NULL;
-#line 2167 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2183 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp3_ = self->priv->system_pictures_import_check;
-#line 2167 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2183 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp1_ = _tmp3_ != NULL;
-#line 17252 "Dialogs.c"
+#line 17380 "Dialogs.c"
 	}
-#line 2167 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2183 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp1_) {
-#line 17256 "Dialogs.c"
+#line 17384 "Dialogs.c"
 		gboolean _tmp4_ = FALSE;
-#line 2168 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2184 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp4_ = self->priv->import_content_already_installed;
-#line 2168 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2184 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp0_ = _tmp4_ == FALSE;
-#line 17262 "Dialogs.c"
+#line 17390 "Dialogs.c"
 	} else {
-#line 2167 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2183 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp0_ = FALSE;
-#line 17266 "Dialogs.c"
+#line 17394 "Dialogs.c"
 	}
-#line 2166 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2182 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp0_) {
-#line 17270 "Dialogs.c"
+#line 17398 "Dialogs.c"
 		GtkLabel* _tmp5_ = NULL;
 		GtkBox* _tmp6_ = NULL;
 		GtkBox* _tmp7_ = NULL;
 		GtkBox* _tmp8_ = NULL;
 		GtkLabel* _tmp9_ = NULL;
-#line 2170 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2186 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp5_ = self->priv->secondary_text;
-#line 2170 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2186 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_label_set_markup (_tmp5_, "");
-#line 2171 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2187 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp6_ = self->priv->import_content;
-#line 2171 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2187 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp7_ = self->priv->import_action_checkbox_packer;
-#line 2171 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2187 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_widget_get_type (), GtkWidget));
-#line 2172 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2188 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp8_ = self->priv->import_content;
-#line 2172 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2188 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp9_ = self->priv->instruction_header;
-#line 2172 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2188 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_widget_get_type (), GtkWidget));
-#line 2173 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2189 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		self->priv->import_content_already_installed = TRUE;
-#line 17294 "Dialogs.c"
+#line 17422 "Dialogs.c"
 	}
 }
 
 
 static void _vala_array_add275 (WelcomeServiceEntry*** array, int* length, int* size, WelcomeServiceEntry* value) {
-#line 2179 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2195 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if ((*length) == (*size)) {
-#line 2179 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2195 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 2179 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2195 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		*array = g_renew (WelcomeServiceEntry*, *array, (*size) + 1);
-#line 17306 "Dialogs.c"
+#line 17434 "Dialogs.c"
 	}
-#line 2179 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2195 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	(*array)[(*length)++] = value;
-#line 2179 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2195 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	(*array)[*length] = NULL;
-#line 17312 "Dialogs.c"
+#line 17440 "Dialogs.c"
 }
 
 
 static void _vala_array_add276 (GtkCheckButton*** array, int* length, int* size, GtkCheckButton* value) {
-#line 2182 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2198 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if ((*length) == (*size)) {
-#line 2182 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2198 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 2182 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2198 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		*array = g_renew (GtkCheckButton*, *array, (*size) + 1);
-#line 17323 "Dialogs.c"
+#line 17451 "Dialogs.c"
 	}
-#line 2182 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2198 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	(*array)[(*length)++] = value;
-#line 2182 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2198 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	(*array)[*length] = NULL;
-#line 17329 "Dialogs.c"
+#line 17457 "Dialogs.c"
 }
 
 
@@ -17369,79 +17497,79 @@ void welcome_dialog_install_service_entry (WelcomeDialog* self, WelcomeServiceEn
 	gint _tmp16__length1 = 0;
 	GtkCheckButton* _tmp17_ = NULL;
 	GtkBox* _tmp18_ = NULL;
-#line 2177 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2193 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_WELCOME_DIALOG (self));
-#line 2177 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2193 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_WELCOME_SERVICE_ENTRY (entry));
-#line 2178 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2194 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = entry;
-#line 2178 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2194 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = welcome_service_entry_get_service_name (_tmp0_);
-#line 2178 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2194 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = _tmp1_;
-#line 2178 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2194 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = g_strdup_printf ("WelcomeDialog: Installing service entry for %s", _tmp2_);
-#line 2178 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2194 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp4_ = _tmp3_;
-#line 2178 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_debug ("Dialogs.vala:2178: %s", _tmp4_);
-#line 2178 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2194 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	g_debug ("Dialogs.vala:2194: %s", _tmp4_);
+#line 2194 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (_tmp4_);
-#line 2178 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2194 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (_tmp2_);
-#line 2179 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2195 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp5_ = self->priv->external_import_entries;
-#line 2179 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2195 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp5__length1 = self->priv->external_import_entries_length1;
-#line 2179 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2195 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp6_ = entry;
-#line 2179 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2195 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp7_ = _g_object_ref0 (_tmp6_);
-#line 2179 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2195 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_vala_array_add275 (&self->priv->external_import_entries, &self->priv->external_import_entries_length1, &self->priv->_external_import_entries_size_, _tmp7_);
-#line 2180 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2196 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp8_ = _ ("Import photos from your %s library");
-#line 2180 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2196 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp9_ = entry;
-#line 2180 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2196 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp10_ = welcome_service_entry_get_service_name (_tmp9_);
-#line 2180 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2196 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp11_ = _tmp10_;
-#line 2180 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2196 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp12_ = g_strdup_printf (_tmp8_, _tmp11_);
-#line 2180 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2196 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp13_ = _tmp12_;
-#line 2180 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2196 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp14_ = (GtkCheckButton*) gtk_check_button_new_with_label (_tmp13_);
-#line 2180 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2196 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_object_ref_sink (_tmp14_);
-#line 2180 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2196 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp15_ = _tmp14_;
-#line 2180 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2196 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (_tmp13_);
-#line 2180 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2196 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (_tmp11_);
-#line 2180 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2196 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	entry_check = _tmp15_;
-#line 2182 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2198 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp16_ = self->priv->external_import_checks;
-#line 2182 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2198 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp16__length1 = self->priv->external_import_checks_length1;
-#line 2182 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2198 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp17_ = _g_object_ref0 (entry_check);
-#line 2182 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2198 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_vala_array_add276 (&self->priv->external_import_checks, &self->priv->external_import_checks_length1, &self->priv->_external_import_checks_size_, _tmp17_);
-#line 2183 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2199 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (entry_check, gtk_toggle_button_get_type (), GtkToggleButton), TRUE);
-#line 2184 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2200 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp18_ = self->priv->external_import_action_checkbox_packer;
-#line 2184 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2200 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (entry_check, gtk_widget_get_type (), GtkWidget));
-#line 2185 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2201 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	welcome_dialog_install_import_content (self);
-#line 2177 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2193 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (entry_check);
-#line 17428 "Dialogs.c"
+#line 17556 "Dialogs.c"
 }
 
 
@@ -17452,66 +17580,66 @@ void welcome_dialog_install_service_entry (WelcomeDialog* self, WelcomeServiceEn
      */
 static void welcome_dialog_on_dismiss (WelcomeDialog* self, gint resp) {
 	gint _tmp0_ = 0;
-#line 2193 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2209 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_WELCOME_DIALOG (self));
-#line 2194 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2210 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = resp;
-#line 2194 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2210 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp0_ == ((gint) GTK_RESPONSE_OK)) {
-#line 2195 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2211 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		self->priv->ok_clicked = TRUE;
-#line 17447 "Dialogs.c"
+#line 17575 "Dialogs.c"
 	}
-#line 2197 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2213 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 2198 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2214 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_main_quit ();
-#line 17453 "Dialogs.c"
+#line 17581 "Dialogs.c"
 }
 
 
 static void _welcome_dialog_on_dismiss_gtk_dialog_response (GtkDialog* _sender, gint response_id, gpointer self) {
-#line 2204 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2220 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	welcome_dialog_on_dismiss ((WelcomeDialog*) self, response_id);
-#line 17460 "Dialogs.c"
+#line 17588 "Dialogs.c"
 }
 
 
 static void _vala_array_add277 (WelcomeServiceEntry*** array, int* length, int* size, WelcomeServiceEntry* value) {
-#line 2227 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2243 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if ((*length) == (*size)) {
-#line 2227 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2243 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 2227 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2243 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		*array = g_renew (WelcomeServiceEntry*, *array, (*size) + 1);
-#line 17471 "Dialogs.c"
+#line 17599 "Dialogs.c"
 	}
-#line 2227 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2243 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	(*array)[(*length)++] = value;
-#line 2227 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2243 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	(*array)[*length] = NULL;
-#line 17477 "Dialogs.c"
+#line 17605 "Dialogs.c"
 }
 
 
 static WelcomeServiceEntry** _vala_array_dup30 (WelcomeServiceEntry** self, int length) {
 	WelcomeServiceEntry** result;
 	int i;
-#line 2229 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2245 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	result = g_new0 (WelcomeServiceEntry*, length + 1);
-#line 2229 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2245 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	for (i = 0; i < length; i++) {
-#line 17488 "Dialogs.c"
+#line 17616 "Dialogs.c"
 		WelcomeServiceEntry* _tmp0_ = NULL;
-#line 2229 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2245 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp0_ = _g_object_ref0 (self[i]);
-#line 2229 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2245 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		result[i] = _tmp0_;
-#line 17494 "Dialogs.c"
+#line 17622 "Dialogs.c"
 	}
-#line 2229 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2245 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 17498 "Dialogs.c"
+#line 17626 "Dialogs.c"
 }
 
 
@@ -17535,62 +17663,62 @@ gboolean welcome_dialog_execute (WelcomeDialog* self, WelcomeServiceEntry*** sel
 	gint _tmp20__length1 = 0;
 	gboolean _tmp21_ = FALSE;
 	GtkCheckButton* _tmp22_ = NULL;
-#line 2201 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2217 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (IS_WELCOME_DIALOG (self), FALSE);
-#line 2204 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2220 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), "response", (GCallback) _welcome_dialog_on_dismiss_gtk_dialog_response, self, 0);
-#line 2205 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2221 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 2206 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2222 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_show (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 2211 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2227 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_main ();
-#line 2215 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2231 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_signal_parse_name ("response", gtk_dialog_get_type (), &_tmp0_, NULL, FALSE);
-#line 2215 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2231 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_dialog_get_type (), GtkDialog), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp0_, 0, NULL, (GCallback) _welcome_dialog_on_dismiss_gtk_dialog_response, self);
-#line 2217 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2233 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = self->priv->ok_clicked;
-#line 2217 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2233 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	ok = _tmp1_;
-#line 2218 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2234 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	show_dialog = TRUE;
-#line 2220 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2236 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = ok;
-#line 2220 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2236 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp2_) {
-#line 17546 "Dialogs.c"
+#line 17674 "Dialogs.c"
 		GtkCheckButton* _tmp3_ = NULL;
 		gboolean _tmp4_ = FALSE;
-#line 2221 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2237 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp3_ = self->priv->hide_button;
-#line 2221 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2237 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp4_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_toggle_button_get_type (), GtkToggleButton));
-#line 2221 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2237 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		show_dialog = !_tmp4_;
-#line 17555 "Dialogs.c"
+#line 17683 "Dialogs.c"
 	}
-#line 2224 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2240 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp5_ = g_new0 (WelcomeServiceEntry*, 0 + 1);
-#line 2224 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2240 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_result_ = _tmp5_;
-#line 2224 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2240 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_result__length1 = 0;
-#line 2224 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2240 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	__result__size_ = _result__length1;
-#line 17565 "Dialogs.c"
+#line 17693 "Dialogs.c"
 	{
 		gint i = 0;
-#line 2225 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2241 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		i = 0;
-#line 17570 "Dialogs.c"
+#line 17698 "Dialogs.c"
 		{
 			gboolean _tmp6_ = FALSE;
-#line 2225 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2241 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp6_ = TRUE;
-#line 2225 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2241 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			while (TRUE) {
-#line 17577 "Dialogs.c"
+#line 17705 "Dialogs.c"
 				gint _tmp8_ = 0;
 				WelcomeServiceEntry** _tmp9_ = NULL;
 				gint _tmp9__length1 = 0;
@@ -17599,43 +17727,43 @@ gboolean welcome_dialog_execute (WelcomeDialog* self, WelcomeServiceEntry*** sel
 				gint _tmp11_ = 0;
 				GtkCheckButton* _tmp12_ = NULL;
 				gboolean _tmp13_ = FALSE;
-#line 2225 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2241 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				if (!_tmp6_) {
-#line 17588 "Dialogs.c"
+#line 17716 "Dialogs.c"
 					gint _tmp7_ = 0;
-#line 2225 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2241 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp7_ = i;
-#line 2225 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2241 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					i = _tmp7_ + 1;
-#line 17594 "Dialogs.c"
+#line 17722 "Dialogs.c"
 				}
-#line 2225 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2241 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp6_ = FALSE;
-#line 2225 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2241 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp8_ = i;
-#line 2225 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2241 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp9_ = self->priv->external_import_entries;
-#line 2225 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2241 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp9__length1 = self->priv->external_import_entries_length1;
-#line 2225 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2241 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				if (!(_tmp8_ < _tmp9__length1)) {
-#line 2225 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2241 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					break;
-#line 17608 "Dialogs.c"
+#line 17736 "Dialogs.c"
 				}
-#line 2226 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2242 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp10_ = self->priv->external_import_checks;
-#line 2226 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2242 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp10__length1 = self->priv->external_import_checks_length1;
-#line 2226 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2242 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp11_ = i;
-#line 2226 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2242 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp12_ = _tmp10_[_tmp11_];
-#line 2226 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2242 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp13_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_toggle_button_get_type (), GtkToggleButton));
-#line 2226 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2242 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				if (_tmp13_ == TRUE) {
-#line 17622 "Dialogs.c"
+#line 17750 "Dialogs.c"
 					WelcomeServiceEntry** _tmp14_ = NULL;
 					gint _tmp14__length1 = 0;
 					WelcomeServiceEntry** _tmp15_ = NULL;
@@ -17643,93 +17771,93 @@ gboolean welcome_dialog_execute (WelcomeDialog* self, WelcomeServiceEntry*** sel
 					gint _tmp16_ = 0;
 					WelcomeServiceEntry* _tmp17_ = NULL;
 					WelcomeServiceEntry* _tmp18_ = NULL;
-#line 2227 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2243 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp14_ = _result_;
-#line 2227 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2243 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp14__length1 = _result__length1;
-#line 2227 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2243 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp15_ = self->priv->external_import_entries;
-#line 2227 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2243 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp15__length1 = self->priv->external_import_entries_length1;
-#line 2227 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2243 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp16_ = i;
-#line 2227 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2243 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp17_ = _tmp15_[_tmp16_];
-#line 2227 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2243 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp18_ = _g_object_ref0 (_tmp17_);
-#line 2227 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2243 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_vala_array_add277 (&_result_, &_result__length1, &__result__size_, _tmp18_);
-#line 17646 "Dialogs.c"
+#line 17774 "Dialogs.c"
 				}
 			}
 		}
 	}
-#line 2229 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2245 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp19_ = _result_;
-#line 2229 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2245 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp19__length1 = _result__length1;
-#line 2229 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2245 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp20_ = (_tmp19_ != NULL) ? _vala_array_dup30 (_tmp19_, _tmp19__length1) : ((gpointer) _tmp19_);
-#line 2229 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2245 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp20__length1 = _tmp19__length1;
-#line 2229 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2245 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_vala_selected_import_entries = (_vala_array_free (_vala_selected_import_entries, _vala_selected_import_entries_length1, (GDestroyNotify) g_object_unref), NULL);
-#line 2229 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2245 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_vala_selected_import_entries = _tmp20_;
-#line 2229 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2245 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_vala_selected_import_entries_length1 = _tmp20__length1;
-#line 2231 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2247 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp22_ = self->priv->system_pictures_import_check;
-#line 2231 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2247 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp22_ != NULL) {
-#line 17669 "Dialogs.c"
+#line 17797 "Dialogs.c"
 		GtkCheckButton* _tmp23_ = NULL;
 		gboolean _tmp24_ = FALSE;
-#line 2231 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2247 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp23_ = self->priv->system_pictures_import_check;
-#line 2231 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2247 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp24_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, gtk_toggle_button_get_type (), GtkToggleButton));
-#line 2231 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2247 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp21_ = _tmp24_;
-#line 17678 "Dialogs.c"
+#line 17806 "Dialogs.c"
 	} else {
-#line 2231 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2247 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp21_ = FALSE;
-#line 17682 "Dialogs.c"
+#line 17810 "Dialogs.c"
 	}
-#line 2230 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2246 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_vala_do_system_pictures_import = _tmp21_;
-#line 2233 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2249 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 2235 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2251 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	result = show_dialog;
-#line 2235 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2251 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_result_ = (_vala_array_free (_result_, _result__length1, (GDestroyNotify) g_object_unref), NULL);
-#line 2235 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2251 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (selected_import_entries) {
-#line 2235 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2251 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		*selected_import_entries = _vala_selected_import_entries;
-#line 17696 "Dialogs.c"
+#line 17824 "Dialogs.c"
 	} else {
-#line 2235 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2251 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_vala_selected_import_entries = (_vala_array_free (_vala_selected_import_entries, _vala_selected_import_entries_length1, (GDestroyNotify) g_object_unref), NULL);
-#line 17700 "Dialogs.c"
+#line 17828 "Dialogs.c"
 	}
-#line 2235 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2251 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (selected_import_entries_length1) {
-#line 2235 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2251 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		*selected_import_entries_length1 = _vala_selected_import_entries_length1;
-#line 17706 "Dialogs.c"
+#line 17834 "Dialogs.c"
 	}
-#line 2235 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2251 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (do_system_pictures_import) {
-#line 2235 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2251 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		*do_system_pictures_import = _vala_do_system_pictures_import;
-#line 17712 "Dialogs.c"
+#line 17840 "Dialogs.c"
 	}
-#line 2235 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2251 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 17716 "Dialogs.c"
+#line 17844 "Dialogs.c"
 }
 
 
@@ -17742,37 +17870,37 @@ static gboolean welcome_dialog_is_system_pictures_import_possible (void) {
 	GFile* _tmp3_ = NULL;
 	GFileType _tmp4_ = 0;
 	GError * _inner_error_ = NULL;
-#line 2239 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2255 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = app_dirs_get_import_dir ();
-#line 2239 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2255 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	system_pictures = _tmp0_;
-#line 2240 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2256 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = system_pictures;
-#line 2240 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2256 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = g_file_query_exists (_tmp1_, NULL);
-#line 2240 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2256 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (!_tmp2_) {
-#line 2241 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2257 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		result = FALSE;
-#line 2241 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2257 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (system_pictures);
-#line 2241 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2257 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		return result;
-#line 17745 "Dialogs.c"
+#line 17873 "Dialogs.c"
 	}
-#line 2243 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2259 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = system_pictures;
-#line 2243 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2259 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp4_ = g_file_query_file_type (_tmp3_, G_FILE_QUERY_INFO_NONE, NULL);
-#line 2243 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2259 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (!(_tmp4_ == G_FILE_TYPE_DIRECTORY)) {
-#line 2244 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2260 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		result = FALSE;
-#line 2244 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2260 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (system_pictures);
-#line 2244 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2260 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		return result;
-#line 17759 "Dialogs.c"
+#line 17887 "Dialogs.c"
 	}
 	{
 		GFileEnumerator* syspics_child_enum = NULL;
@@ -17784,152 +17912,152 @@ static gboolean welcome_dialog_is_system_pictures_import_possible (void) {
 		GFileInfo* _tmp10_ = NULL;
 		GFileInfo* _tmp11_ = NULL;
 		gboolean _tmp12_ = FALSE;
-#line 2247 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2263 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp5_ = system_pictures;
-#line 2247 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2263 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp6_ = g_file_enumerate_children (_tmp5_, "standard::*", G_FILE_QUERY_INFO_NONE, NULL, &_inner_error_);
-#line 2247 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2263 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		syspics_child_enum = _tmp6_;
-#line 2247 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2263 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 17779 "Dialogs.c"
-			goto __catch413_g_error;
+#line 17907 "Dialogs.c"
+			goto __catch426_g_error;
 		}
-#line 2249 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp8_ = syspics_child_enum;
-#line 2249 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp9_ = g_file_enumerator_next_file (_tmp8_, NULL, &_inner_error_);
-#line 2249 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp7_ = _tmp9_;
-#line 2249 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2249 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_object_unref0 (syspics_child_enum);
-#line 17792 "Dialogs.c"
-			goto __catch413_g_error;
+#line 17920 "Dialogs.c"
+			goto __catch426_g_error;
 		}
-#line 2249 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp10_ = _tmp7_;
-#line 2249 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp7_ = NULL;
-#line 2249 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp11_ = _tmp10_;
-#line 2249 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp12_ = _tmp11_ != NULL;
-#line 2249 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (_tmp11_);
-#line 2249 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		result = _tmp12_;
-#line 2249 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (_tmp7_);
-#line 2249 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (syspics_child_enum);
-#line 2249 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (system_pictures);
-#line 2249 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2265 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		return result;
-#line 17815 "Dialogs.c"
+#line 17943 "Dialogs.c"
 	}
-	goto __finally413;
-	__catch413_g_error:
+	goto __finally426;
+	__catch426_g_error:
 	{
 		GError* e = NULL;
-#line 2246 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2262 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		e = _inner_error_;
-#line 2246 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2262 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_inner_error_ = NULL;
-#line 2251 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2267 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		result = FALSE;
-#line 2251 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2267 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_error_free0 (e);
-#line 2251 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2267 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (system_pictures);
-#line 2251 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2267 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		return result;
-#line 17833 "Dialogs.c"
+#line 17961 "Dialogs.c"
 	}
-	__finally413:
-#line 2246 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	__finally426:
+#line 2262 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (system_pictures);
-#line 2246 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2262 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 2246 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2262 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_clear_error (&_inner_error_);
-#line 2246 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2262 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return FALSE;
-#line 17844 "Dialogs.c"
+#line 17972 "Dialogs.c"
 }
 
 
 static void welcome_dialog_class_init (WelcomeDialogClass * klass) {
-#line 2069 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2085 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	welcome_dialog_parent_class = g_type_class_peek_parent (klass);
-#line 2069 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2085 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_type_class_add_private (klass, sizeof (WelcomeDialogPrivate));
-#line 2069 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2085 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	G_OBJECT_CLASS (klass)->finalize = welcome_dialog_finalize;
-#line 17855 "Dialogs.c"
+#line 17983 "Dialogs.c"
 }
 
 
 static void welcome_dialog_instance_init (WelcomeDialog * self) {
 	GtkCheckButton** _tmp0_ = NULL;
 	WelcomeServiceEntry** _tmp1_ = NULL;
-#line 2069 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2085 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv = WELCOME_DIALOG_GET_PRIVATE (self);
-#line 2071 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2087 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->system_pictures_import_check = NULL;
-#line 2072 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2088 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = g_new0 (GtkCheckButton*, 0 + 1);
-#line 2072 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2088 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->external_import_checks = _tmp0_;
-#line 2072 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2088 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->external_import_checks_length1 = 0;
-#line 2072 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2088 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->_external_import_checks_size_ = self->priv->external_import_checks_length1;
-#line 2073 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2089 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = g_new0 (WelcomeServiceEntry*, 0 + 1);
-#line 2073 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2089 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->external_import_entries = _tmp1_;
-#line 2073 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2089 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->external_import_entries_length1 = 0;
-#line 2073 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2089 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->_external_import_entries_size_ = self->priv->external_import_entries_length1;
-#line 2080 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2096 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->import_content_already_installed = FALSE;
-#line 2081 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2097 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->ok_clicked = FALSE;
-#line 17886 "Dialogs.c"
+#line 18014 "Dialogs.c"
 }
 
 
 static void welcome_dialog_finalize (GObject* obj) {
 	WelcomeDialog * self;
-#line 2069 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2085 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_WELCOME_DIALOG, WelcomeDialog);
-#line 2070 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2086 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->hide_button);
-#line 2071 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2087 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->system_pictures_import_check);
-#line 2072 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2088 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->external_import_checks = (_vala_array_free (self->priv->external_import_checks, self->priv->external_import_checks_length1, (GDestroyNotify) g_object_unref), NULL);
-#line 2073 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2089 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->external_import_entries = (_vala_array_free (self->priv->external_import_entries, self->priv->external_import_entries_length1, (GDestroyNotify) g_object_unref), NULL);
-#line 2074 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2090 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->secondary_text);
-#line 2075 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2091 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->instruction_header);
-#line 2076 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2092 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->import_content);
-#line 2077 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2093 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->import_action_checkbox_packer);
-#line 2078 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2094 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->external_import_action_checkbox_packer);
-#line 2079 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2095 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->import_meta_host);
-#line 2069 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2085 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	G_OBJECT_CLASS (welcome_dialog_parent_class)->finalize (obj);
-#line 17916 "Dialogs.c"
+#line 18044 "Dialogs.c"
 }
 
 
@@ -17948,92 +18076,92 @@ GType welcome_dialog_get_type (void) {
 static gboolean _preferences_dialog_on_delete_gtk_widget_delete_event (GtkWidget* _sender, GdkEventAny* event, gpointer self) {
 	gboolean result;
 	result = preferences_dialog_on_delete ((PreferencesDialog*) self);
-#line 2300 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2316 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 17937 "Dialogs.c"
+#line 18065 "Dialogs.c"
 }
 
 
 static void _preferences_dialog_on_close_gtk_dialog_response (GtkDialog* _sender, gint response_id, gpointer self) {
-#line 2301 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2317 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	preferences_dialog_on_close ((PreferencesDialog*) self);
-#line 17944 "Dialogs.c"
+#line 18072 "Dialogs.c"
 }
 
 
 static void _preferences_dialog_on_value_changed_gtk_adjustment_value_changed (GtkAdjustment* _sender, gpointer self) {
-#line 2307 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2323 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	preferences_dialog_on_value_changed ((PreferencesDialog*) self);
-#line 17951 "Dialogs.c"
+#line 18079 "Dialogs.c"
 }
 
 
 static gboolean _preferences_dialog_on_bg_color_reset_gtk_widget_button_press_event (GtkWidget* _sender, GdkEventButton* event, gpointer self) {
 	gboolean result;
 	result = preferences_dialog_on_bg_color_reset ((PreferencesDialog*) self, event);
-#line 2310 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2326 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 17960 "Dialogs.c"
+#line 18088 "Dialogs.c"
 }
 
 
 static gboolean _preferences_dialog_on_local_pattern_help_gtk_label_activate_link (GtkLabel* _sender, const gchar* uri, gpointer self) {
 	gboolean result;
 	result = preferences_dialog_on_local_pattern_help ((PreferencesDialog*) self, uri);
-#line 2333 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2349 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 17969 "Dialogs.c"
+#line 18097 "Dialogs.c"
 }
 
 
 static void _preferences_dialog_on_dir_pattern_combo_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
-#line 2349 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2365 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	preferences_dialog_on_dir_pattern_combo_changed ((PreferencesDialog*) self);
-#line 17976 "Dialogs.c"
+#line 18104 "Dialogs.c"
 }
 
 
 static void _preferences_dialog_on_dir_pattern_entry_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self) {
-#line 2350 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2366 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	preferences_dialog_on_dir_pattern_entry_changed ((PreferencesDialog*) self);
-#line 17983 "Dialogs.c"
+#line 18111 "Dialogs.c"
 }
 
 
 static void _preferences_dialog_on_lowercase_toggled_gtk_toggle_button_toggled (GtkToggleButton* _sender, gpointer self) {
-#line 2355 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2371 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	preferences_dialog_on_lowercase_toggled ((PreferencesDialog*) self);
-#line 17990 "Dialogs.c"
+#line 18118 "Dialogs.c"
 }
 
 
 static void _preferences_dialog_on_photo_editor_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
-#line 2362 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2378 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	preferences_dialog_on_photo_editor_changed ((PreferencesDialog*) self);
-#line 17997 "Dialogs.c"
+#line 18125 "Dialogs.c"
 }
 
 
 static void _preferences_dialog_on_raw_editor_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
-#line 2363 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2379 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	preferences_dialog_on_raw_editor_changed ((PreferencesDialog*) self);
-#line 18004 "Dialogs.c"
+#line 18132 "Dialogs.c"
 }
 
 
 static void _preferences_dialog_on_default_raw_developer_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
-#line 2375 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2391 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	preferences_dialog_on_default_raw_developer_changed ((PreferencesDialog*) self);
-#line 18011 "Dialogs.c"
+#line 18139 "Dialogs.c"
 }
 
 
 static gboolean _preferences_dialog_map_event_gtk_widget_map_event (GtkWidget* _sender, GdkEventAny* event, gpointer self) {
 	gboolean result;
 	result = preferences_dialog_map_event ((PreferencesDialog*) self);
-#line 2377 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2393 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 18020 "Dialogs.c"
+#line 18148 "Dialogs.c"
 }
 
 
@@ -18156,200 +18284,200 @@ static PreferencesDialog* preferences_dialog_construct (GType object_type) {
 	RawDeveloper _tmp122_ = 0;
 	GtkComboBoxText* _tmp123_ = NULL;
 	GtkDialog* _tmp124_ = NULL;
-#line 2288 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2304 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self = (PreferencesDialog*) g_type_create_instance (object_type);
-#line 2289 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2305 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = app_window_create_builder ("shotwell.ui", NULL);
-#line 2289 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2305 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->builder);
-#line 2289 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2305 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->builder = _tmp0_;
-#line 2291 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2307 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = self->priv->builder;
-#line 2291 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2307 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = gtk_builder_get_object (_tmp1_, "preferences_dialog");
-#line 2291 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2307 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp2_, gtk_dialog_get_type ()) ? ((GtkDialog*) _tmp2_) : NULL);
-#line 2291 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2307 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->dialog);
-#line 2291 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2307 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->dialog = _tmp3_;
-#line 2293 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2309 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp4_ = gtk_settings_get_default ();
-#line 2293 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2309 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_object_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, G_TYPE_OBJECT, GObject), "gtk-dialogs-use-header", &use_header, NULL);
-#line 2294 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2310 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp5_ = use_header;
-#line 2294 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2310 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (!_tmp5_) {
-#line 18169 "Dialogs.c"
+#line 18297 "Dialogs.c"
 		GtkWidget* null_titlebar = NULL;
 		GtkDialog* _tmp6_ = NULL;
 		GtkWidget* _tmp7_ = NULL;
-#line 2295 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2311 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		null_titlebar = NULL;
-#line 2296 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2312 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp6_ = self->priv->dialog;
-#line 2296 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2312 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp7_ = null_titlebar;
-#line 2296 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2312 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_window_set_titlebar (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_window_get_type (), GtkWindow), _tmp7_);
-#line 2294 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2310 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (null_titlebar);
-#line 18183 "Dialogs.c"
+#line 18311 "Dialogs.c"
 	}
-#line 2298 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2314 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp8_ = self->priv->dialog;
-#line 2298 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2314 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp9_ = app_window_get_instance ();
-#line 2298 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2314 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp10_ = _tmp9_;
-#line 2298 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2314 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp11_ = gtk_widget_get_parent_window (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_widget_get_type (), GtkWidget));
-#line 2298 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2314 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_set_parent_window (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_widget_get_type (), GtkWidget), _tmp11_);
-#line 2298 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2314 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (_tmp10_);
-#line 2299 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2315 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp12_ = self->priv->dialog;
-#line 2299 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2315 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp13_ = app_window_get_instance ();
-#line 2299 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2315 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp14_ = _tmp13_;
-#line 2299 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2315 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_window_set_transient_for (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_window_get_type (), GtkWindow), G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_window_get_type (), GtkWindow));
-#line 2299 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2315 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (_tmp14_);
-#line 2300 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2316 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp15_ = self->priv->dialog;
-#line 2300 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2316 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, gtk_widget_get_type (), GtkWidget), "delete-event", (GCallback) _preferences_dialog_on_delete_gtk_widget_delete_event, self);
-#line 2301 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2317 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp16_ = self->priv->dialog;
-#line 2301 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2317 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_signal_connect (_tmp16_, "response", (GCallback) _preferences_dialog_on_close_gtk_dialog_response, self);
-#line 2302 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2318 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp17_ = self->priv->dialog;
-#line 2302 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2318 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_window_set_has_resize_grip (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_window_get_type (), GtkWindow), FALSE);
-#line 2304 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2320 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp18_ = self->priv->builder;
-#line 2304 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2320 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp19_ = gtk_builder_get_object (_tmp18_, "bg_color_adjustment");
-#line 2304 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2320 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp20_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp19_, gtk_adjustment_get_type ()) ? ((GtkAdjustment*) _tmp19_) : NULL);
-#line 2304 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2320 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->bg_color_adjustment);
-#line 2304 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2320 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->bg_color_adjustment = _tmp20_;
-#line 2305 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2321 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp21_ = self->priv->bg_color_adjustment;
-#line 2305 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2321 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp22_ = self->priv->bg_color_adjustment;
-#line 2305 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2321 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp23_ = gtk_adjustment_get_upper (_tmp22_);
-#line 2305 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2321 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp24_ = config_facade_get_instance ();
-#line 2305 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2321 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp25_ = _tmp24_;
-#line 2305 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2321 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	config_facade_get_bg_color (_tmp25_, &_tmp26_);
-#line 2305 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2321 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp27_ = _tmp26_.red;
-#line 2305 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2321 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_adjustment_set_value (_tmp21_, _tmp23_ - (_tmp27_ * 65535.0));
-#line 2305 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2321 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (_tmp25_);
-#line 2307 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2323 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp28_ = self->priv->bg_color_adjustment;
-#line 2307 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2323 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_signal_connect (_tmp28_, "value-changed", (GCallback) _preferences_dialog_on_value_changed_gtk_adjustment_value_changed, self);
-#line 2309 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2325 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp29_ = self->priv->builder;
-#line 2309 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2325 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp30_ = gtk_builder_get_object (_tmp29_, "bg_color_slider");
-#line 2309 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2325 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp31_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp30_, gtk_scale_get_type ()) ? ((GtkScale*) _tmp30_) : NULL);
-#line 2309 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2325 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->bg_color_slider);
-#line 2309 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2325 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->bg_color_slider = _tmp31_;
-#line 2310 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2326 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp32_ = self->priv->bg_color_slider;
-#line 2310 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2326 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, gtk_widget_get_type (), GtkWidget), "button-press-event", (GCallback) _preferences_dialog_on_bg_color_reset_gtk_widget_button_press_event, self);
-#line 2312 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2328 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp33_ = self->priv->builder;
-#line 2312 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2328 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp34_ = gtk_builder_get_object (_tmp33_, "library_dir_button");
-#line 2312 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2328 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp35_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp34_, gtk_file_chooser_button_get_type ()) ? ((GtkFileChooserButton*) _tmp34_) : NULL);
-#line 2312 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2328 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->library_dir_button);
-#line 2312 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2328 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->library_dir_button = _tmp35_;
-#line 2314 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2330 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp36_ = self->priv->builder;
-#line 2314 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2330 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp37_ = gtk_builder_get_object (_tmp36_, "external_photo_editor_combo");
-#line 2314 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2330 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp38_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp37_, gtk_combo_box_get_type ()) ? ((GtkComboBox*) _tmp37_) : NULL);
-#line 2314 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2330 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->photo_editor_combo);
-#line 2314 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2330 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->photo_editor_combo = _tmp38_;
-#line 2315 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2331 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp39_ = self->priv->builder;
-#line 2315 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2331 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp40_ = gtk_builder_get_object (_tmp39_, "external_raw_editor_combo");
-#line 2315 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2331 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp41_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp40_, gtk_combo_box_get_type ()) ? ((GtkComboBox*) _tmp40_) : NULL);
-#line 2315 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2331 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->raw_editor_combo);
-#line 2315 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2331 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->raw_editor_combo = _tmp41_;
-#line 2317 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2333 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp42_ = self->priv->builder;
-#line 2317 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2333 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp43_ = gtk_builder_get_object (_tmp42_, "pattern_help");
-#line 2317 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2333 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp44_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp43_, gtk_label_get_type ()) ? ((GtkLabel*) _tmp43_) : NULL);
-#line 2317 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2333 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	pattern_help = _tmp44_;
-#line 2324 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2340 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp45_ = resources_get_help_path ();
-#line 2324 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2340 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	help_path = _tmp45_;
-#line 2326 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2342 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp46_ = help_path;
-#line 2326 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2342 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp46_ == NULL) {
-#line 18311 "Dialogs.c"
+#line 18439 "Dialogs.c"
 		GtkLabel* _tmp47_ = NULL;
 		const gchar* _tmp48_ = NULL;
 		gchar* _tmp49_ = NULL;
 		gchar* _tmp50_ = NULL;
 		gchar* _tmp51_ = NULL;
 		gchar* _tmp52_ = NULL;
-#line 2328 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2344 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp47_ = pattern_help;
-#line 2328 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2344 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp48_ = _ ("(Help)");
-#line 2328 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2344 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp49_ = g_strconcat ("<a href=\"" RESOURCES_DIR_PATTERN_URI_SYSWIDE "\">", _tmp48_, NULL);
-#line 2328 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2344 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp50_ = _tmp49_;
-#line 2328 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2344 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp51_ = g_strconcat (_tmp50_, "</a>", NULL);
-#line 2328 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2344 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp52_ = _tmp51_;
-#line 2328 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2344 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_label_set_markup (_tmp47_, _tmp52_);
-#line 2328 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2344 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (_tmp52_);
-#line 2328 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2344 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (_tmp50_);
-#line 18336 "Dialogs.c"
+#line 18464 "Dialogs.c"
 	} else {
 		GtkLabel* _tmp53_ = NULL;
 		const gchar* _tmp54_ = NULL;
@@ -18358,270 +18486,270 @@ static PreferencesDialog* preferences_dialog_construct (GType object_type) {
 		gchar* _tmp57_ = NULL;
 		gchar* _tmp58_ = NULL;
 		GtkLabel* _tmp59_ = NULL;
-#line 2332 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2348 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp53_ = pattern_help;
-#line 2332 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2348 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp54_ = _ ("(Help)");
-#line 2332 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2348 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp55_ = g_strconcat ("<a href=\"dummy:\">", _tmp54_, NULL);
-#line 2332 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2348 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp56_ = _tmp55_;
-#line 2332 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2348 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp57_ = g_strconcat (_tmp56_, "</a>", NULL);
-#line 2332 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2348 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp58_ = _tmp57_;
-#line 2332 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2348 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_label_set_markup (_tmp53_, _tmp58_);
-#line 2332 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2348 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (_tmp58_);
-#line 2332 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2348 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (_tmp56_);
-#line 2333 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2349 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp59_ = pattern_help;
-#line 2333 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2349 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		g_signal_connect (_tmp59_, "activate-link", (GCallback) _preferences_dialog_on_local_pattern_help_gtk_label_activate_link, self);
-#line 18367 "Dialogs.c"
+#line 18495 "Dialogs.c"
 	}
-#line 2336 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2352 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp60_ = (GtkComboBoxText*) gtk_combo_box_text_new ();
-#line 2336 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2352 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_object_ref_sink (_tmp60_);
-#line 2336 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2352 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->dir_pattern_combo);
-#line 2336 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2352 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->dir_pattern_combo = _tmp60_;
-#line 2337 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2353 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp61_ = self->priv->builder;
-#line 2337 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2353 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp62_ = gtk_builder_get_object (_tmp61_, "dir choser");
-#line 2337 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2353 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp63_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp62_, gtk_alignment_get_type ()) ? ((GtkAlignment*) _tmp62_) : NULL);
-#line 2337 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2353 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	dir_choser_align = _tmp63_;
-#line 2338 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2354 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp64_ = self->priv->dir_pattern_combo;
-#line 2338 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2354 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (dir_choser_align, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp64_, gtk_widget_get_type (), GtkWidget));
-#line 2339 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2355 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp65_ = self->priv->builder;
-#line 2339 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2355 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp66_ = gtk_builder_get_object (_tmp65_, "dir_pattern_entry");
-#line 2339 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2355 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp67_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp66_, gtk_entry_get_type ()) ? ((GtkEntry*) _tmp66_) : NULL);
-#line 2339 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2355 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->dir_pattern_entry);
-#line 2339 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2355 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->dir_pattern_entry = _tmp67_;
-#line 2340 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2356 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp68_ = self->priv->builder;
-#line 2340 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2356 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp69_ = gtk_builder_get_object (_tmp68_, "dynamic example");
-#line 2340 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2356 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp70_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp69_, gtk_label_get_type ()) ? ((GtkLabel*) _tmp69_) : NULL);
-#line 2340 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2356 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->dir_pattern_example);
-#line 2340 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2356 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->dir_pattern_example = _tmp70_;
-#line 2341 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2357 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp71_ = _ ("Year%sMonth%sDay");
-#line 2341 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2357 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp72_ = g_strdup_printf (_tmp71_, G_DIR_SEPARATOR_S, G_DIR_SEPARATOR_S);
-#line 2341 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2357 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp73_ = _tmp72_;
-#line 2341 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2357 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	preferences_dialog_add_to_dir_formats (self, _tmp73_, "%Y" G_DIR_SEPARATOR_S "%m" G_DIR_SEPARATOR_S "%d");
-#line 2341 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2357 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (_tmp73_);
-#line 2343 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2359 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp74_ = _ ("Year%sMonth");
-#line 2343 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2359 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp75_ = g_strdup_printf (_tmp74_, G_DIR_SEPARATOR_S);
-#line 2343 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2359 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp76_ = _tmp75_;
-#line 2343 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2359 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	preferences_dialog_add_to_dir_formats (self, _tmp76_, "%Y" G_DIR_SEPARATOR_S "%m");
-#line 2343 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2359 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (_tmp76_);
-#line 2345 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2361 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp77_ = _ ("Year%sMonth-Day");
-#line 2345 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2361 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp78_ = g_strdup_printf (_tmp77_, G_DIR_SEPARATOR_S);
-#line 2345 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2361 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp79_ = _tmp78_;
-#line 2345 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2361 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	preferences_dialog_add_to_dir_formats (self, _tmp79_, "%Y" G_DIR_SEPARATOR_S "%m-%d");
-#line 2345 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2361 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (_tmp79_);
-#line 2347 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2363 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp80_ = _ ("Year-Month-Day");
-#line 2347 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2363 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	preferences_dialog_add_to_dir_formats (self, _tmp80_, "%Y-%m-%d");
-#line 2348 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2364 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp81_ = _ ("Custom");
-#line 2348 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2364 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	preferences_dialog_add_to_dir_formats (self, _tmp81_, NULL);
-#line 2349 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2365 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp82_ = self->priv->dir_pattern_combo;
-#line 2349 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2365 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp82_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _preferences_dialog_on_dir_pattern_combo_changed_gtk_combo_box_changed, self);
-#line 2350 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2366 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp83_ = self->priv->dir_pattern_entry;
-#line 2350 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2366 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp83_, GTK_TYPE_EDITABLE, GtkEditable), "changed", (GCallback) _preferences_dialog_on_dir_pattern_entry_changed_gtk_editable_changed, self);
-#line 2352 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2368 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp84_ = self->priv->builder;
-#line 2352 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2368 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp85_ = gtk_builder_get_object (_tmp84_, "dir_structure_label");
-#line 2352 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2368 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp86_ = self->priv->dir_pattern_combo;
-#line 2352 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2368 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_label_set_mnemonic_widget (G_TYPE_CHECK_INSTANCE_TYPE (_tmp85_, gtk_label_get_type ()) ? ((GtkLabel*) _tmp85_) : NULL, G_TYPE_CHECK_INSTANCE_CAST (_tmp86_, gtk_widget_get_type (), GtkWidget));
-#line 2354 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2370 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp87_ = self->priv->builder;
-#line 2354 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2370 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp88_ = gtk_builder_get_object (_tmp87_, "lowercase");
-#line 2354 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2370 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp89_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp88_, gtk_check_button_get_type ()) ? ((GtkCheckButton*) _tmp88_) : NULL);
-#line 2354 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2370 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->lowercase);
-#line 2354 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2370 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->lowercase = _tmp89_;
-#line 2355 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2371 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp90_ = self->priv->lowercase;
-#line 2355 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2371 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp90_, gtk_toggle_button_get_type (), GtkToggleButton), "toggled", (GCallback) _preferences_dialog_on_lowercase_toggled_gtk_toggle_button_toggled, self);
-#line 2357 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2373 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp91_ = self->priv->builder;
-#line 2357 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2373 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp92_ = gtk_builder_get_object (_tmp91_, "plugin-manifest-bin");
-#line 2357 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2373 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp93_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp92_, gtk_bin_get_type ()) ? ((GtkBin*) _tmp92_) : NULL);
-#line 2357 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2373 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	plugin_manifest_container = _tmp93_;
-#line 2358 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2374 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp94_ = self->priv->plugins_mediator;
-#line 2358 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2374 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp95_ = plugins_manifest_widget_mediator_get_widget (_tmp94_);
-#line 2358 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2374 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp96_ = _tmp95_;
-#line 2358 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2374 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (plugin_manifest_container, gtk_container_get_type (), GtkContainer), _tmp96_);
-#line 2360 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2376 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	preferences_dialog_populate_preference_options (self);
-#line 2362 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2378 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp97_ = self->priv->photo_editor_combo;
-#line 2362 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2378 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_signal_connect (_tmp97_, "changed", (GCallback) _preferences_dialog_on_photo_editor_changed_gtk_combo_box_changed, self);
-#line 2363 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2379 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp98_ = self->priv->raw_editor_combo;
-#line 2363 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2379 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_signal_connect (_tmp98_, "changed", (GCallback) _preferences_dialog_on_raw_editor_changed_gtk_combo_box_changed, self);
-#line 2365 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2381 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp99_ = self->priv->builder;
-#line 2365 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2381 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp100_ = gtk_builder_get_object (_tmp99_, "autoimport");
-#line 2365 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2381 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp101_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp100_, gtk_check_button_get_type ()) ? ((GtkCheckButton*) _tmp100_) : NULL);
-#line 2365 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2381 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	auto_import_button = _tmp101_;
-#line 2366 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2382 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp102_ = config_facade_get_instance ();
-#line 2366 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2382 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp103_ = _tmp102_;
-#line 2366 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2382 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp104_ = configuration_facade_get_auto_import_from_library (G_TYPE_CHECK_INSTANCE_CAST (_tmp103_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 2366 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2382 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (auto_import_button, gtk_toggle_button_get_type (), GtkToggleButton), _tmp104_);
-#line 2366 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2382 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (_tmp103_);
-#line 2368 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2384 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp105_ = self->priv->builder;
-#line 2368 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2384 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp106_ = gtk_builder_get_object (_tmp105_, "write_metadata");
-#line 2368 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2384 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp107_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp106_, gtk_check_button_get_type ()) ? ((GtkCheckButton*) _tmp106_) : NULL);
-#line 2368 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2384 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	commit_metadata_button = _tmp107_;
-#line 2369 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2385 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp108_ = config_facade_get_instance ();
-#line 2369 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2385 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp109_ = _tmp108_;
-#line 2369 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2385 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp110_ = configuration_facade_get_commit_metadata_to_masters (G_TYPE_CHECK_INSTANCE_CAST (_tmp109_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 2369 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2385 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (commit_metadata_button, gtk_toggle_button_get_type (), GtkToggleButton), _tmp110_);
-#line 2369 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2385 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (_tmp109_);
-#line 2371 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2387 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp111_ = self->priv->builder;
-#line 2371 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2387 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp112_ = gtk_builder_get_object (_tmp111_, "default_raw_developer");
-#line 2371 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2387 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp113_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp112_, gtk_combo_box_text_get_type ()) ? ((GtkComboBoxText*) _tmp112_) : NULL);
-#line 2371 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2387 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->default_raw_developer_combo);
-#line 2371 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2387 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->default_raw_developer_combo = _tmp113_;
-#line 2372 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2388 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp114_ = self->priv->default_raw_developer_combo;
-#line 2372 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2388 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp115_ = raw_developer_get_label (RAW_DEVELOPER_CAMERA);
-#line 2372 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2388 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp116_ = _tmp115_;
-#line 2372 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2388 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_combo_box_text_append_text (_tmp114_, _tmp116_);
-#line 2372 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2388 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (_tmp116_);
-#line 2373 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2389 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp117_ = self->priv->default_raw_developer_combo;
-#line 2373 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2389 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp118_ = raw_developer_get_label (RAW_DEVELOPER_SHOTWELL);
-#line 2373 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2389 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp119_ = _tmp118_;
-#line 2373 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2389 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_combo_box_text_append_text (_tmp117_, _tmp119_);
-#line 2373 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2389 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (_tmp119_);
-#line 2374 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2390 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp120_ = config_facade_get_instance ();
-#line 2374 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2390 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp121_ = _tmp120_;
-#line 2374 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2390 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp122_ = configuration_facade_get_default_raw_developer (G_TYPE_CHECK_INSTANCE_CAST (_tmp121_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 2374 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2390 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	preferences_dialog_set_raw_developer_combo (self, _tmp122_);
-#line 2374 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2390 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (_tmp121_);
-#line 2375 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2391 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp123_ = self->priv->default_raw_developer_combo;
-#line 2375 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2391 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp123_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _preferences_dialog_on_default_raw_developer_changed_gtk_combo_box_changed, self);
-#line 2377 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2393 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp124_ = self->priv->dialog;
-#line 2377 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2393 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp124_, gtk_widget_get_type (), GtkWidget), "map-event", (GCallback) _preferences_dialog_map_event_gtk_widget_map_event, self);
-#line 2288 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2304 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (commit_metadata_button);
-#line 2288 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2304 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (auto_import_button);
-#line 2288 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2304 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (plugin_manifest_container);
-#line 2288 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2304 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (dir_choser_align);
-#line 2288 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2304 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (help_path);
-#line 2288 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2304 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (pattern_help);
-#line 2288 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2304 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return self;
-#line 18601 "Dialogs.c"
+#line 18729 "Dialogs.c"
 }
 
 
 static PreferencesDialog* preferences_dialog_new (void) {
-#line 2288 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2304 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return preferences_dialog_construct (TYPE_PREFERENCES_DIALOG);
-#line 18608 "Dialogs.c"
+#line 18736 "Dialogs.c"
 }
 
 
@@ -18652,150 +18780,150 @@ void preferences_dialog_populate_preference_options (PreferencesDialog* self) {
 	ConfigFacade* _tmp21_ = NULL;
 	ConfigFacade* _tmp22_ = NULL;
 	gboolean _tmp23_ = FALSE;
-#line 2380 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2396 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_PREFERENCES_DIALOG (self));
-#line 2381 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2397 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = self->priv->photo_editor_combo;
-#line 2381 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2397 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = photo_file_format_get_editable_mime_types (&_tmp1_);
-#line 2381 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2397 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = _tmp2_;
-#line 2381 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2397 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3__length1 = _tmp1_;
-#line 2381 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2397 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp4_ = config_facade_get_instance ();
-#line 2381 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2397 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp5_ = _tmp4_;
-#line 2381 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2397 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp6_ = configuration_facade_get_external_photo_app (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 2381 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2397 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp7_ = _tmp6_;
-#line 2381 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2397 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	preferences_dialog_populate_app_combo_box (self, _tmp0_, _tmp3_, _tmp1_, _tmp7_, &_tmp8_);
-#line 2381 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2397 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->external_photo_apps);
-#line 2381 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2397 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->external_photo_apps = _tmp8_;
-#line 2381 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2397 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (_tmp7_);
-#line 2381 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2397 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (_tmp5_);
-#line 2381 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2397 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = (_vala_array_free (_tmp3_, _tmp3__length1, (GDestroyNotify) g_free), NULL);
-#line 2384 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2400 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp9_ = self->priv->raw_editor_combo;
-#line 2384 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2400 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp11_ = photo_file_format_get_mime_types (PHOTO_FILE_FORMAT_RAW, &_tmp10_);
-#line 2384 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2400 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp12_ = _tmp11_;
-#line 2384 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2400 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp12__length1 = _tmp10_;
-#line 2384 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2400 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp13_ = config_facade_get_instance ();
-#line 2384 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2400 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp14_ = _tmp13_;
-#line 2384 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2400 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp15_ = configuration_facade_get_external_raw_app (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 2384 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2400 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp16_ = _tmp15_;
-#line 2384 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2400 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	preferences_dialog_populate_app_combo_box (self, _tmp9_, _tmp12_, _tmp10_, _tmp16_, &_tmp17_);
-#line 2384 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2400 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->external_raw_apps);
-#line 2384 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2400 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->external_raw_apps = _tmp17_;
-#line 2384 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2400 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (_tmp16_);
-#line 2384 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2400 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (_tmp14_);
-#line 2384 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2400 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp12_ = (_vala_array_free (_tmp12_, _tmp12__length1, (GDestroyNotify) g_free), NULL);
-#line 2387 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2403 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp18_ = self->priv->dir_pattern_combo;
-#line 2387 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2403 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp19_ = self->priv->dir_pattern_entry;
-#line 2387 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2403 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	preferences_dialog_setup_dir_pattern (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_combo_box_get_type (), GtkComboBox), _tmp19_);
-#line 2389 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2405 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp20_ = self->priv->lowercase;
-#line 2389 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2405 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp21_ = config_facade_get_instance ();
-#line 2389 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2405 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp22_ = _tmp21_;
-#line 2389 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2405 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp23_ = configuration_facade_get_use_lowercase_filenames (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 2389 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2405 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, gtk_toggle_button_get_type (), GtkToggleButton), _tmp23_);
-#line 2389 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2405 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (_tmp22_);
-#line 18715 "Dialogs.c"
+#line 18843 "Dialogs.c"
 }
 
 
 static gboolean preferences_dialog_on_local_pattern_help (PreferencesDialog* self, const gchar* ignore) {
 	gboolean result = FALSE;
 	GError * _inner_error_ = NULL;
-#line 2394 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2410 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (IS_PREFERENCES_DIALOG (self), FALSE);
-#line 2394 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2410 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (ignore != NULL, FALSE);
-#line 18726 "Dialogs.c"
+#line 18854 "Dialogs.c"
 	{
 		AppWindow* _tmp0_ = NULL;
 		AppWindow* _tmp1_ = NULL;
 		GdkScreen* _tmp2_ = NULL;
-#line 2396 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2412 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp0_ = app_window_get_instance ();
-#line 2396 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2412 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp1_ = _tmp0_;
-#line 2396 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2412 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp2_ = gtk_window_get_screen (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_window_get_type (), GtkWindow));
-#line 2396 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2412 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		resources_launch_help (_tmp2_, "other-files.page", &_inner_error_);
-#line 2396 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2412 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (_tmp1_);
-#line 2396 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2412 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 18743 "Dialogs.c"
-			goto __catch414_g_error;
+#line 18871 "Dialogs.c"
+			goto __catch427_g_error;
 		}
 	}
-	goto __finally414;
-	__catch414_g_error:
+	goto __finally427;
+	__catch427_g_error:
 	{
 		GError* e = NULL;
 		GError* _tmp3_ = NULL;
 		const gchar* _tmp4_ = NULL;
-#line 2395 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2411 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		e = _inner_error_;
-#line 2395 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2411 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_inner_error_ = NULL;
-#line 2398 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2414 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp3_ = e;
-#line 2398 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2414 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp4_ = _tmp3_->message;
-#line 2398 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		g_message ("Dialogs.vala:2398: Unable to launch help: %s", _tmp4_);
-#line 2395 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2414 "/home/jens/Source/shotwell/src/Dialogs.vala"
+		g_message ("Dialogs.vala:2414: Unable to launch help: %s", _tmp4_);
+#line 2411 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_error_free0 (e);
-#line 18765 "Dialogs.c"
+#line 18893 "Dialogs.c"
 	}
-	__finally414:
-#line 2395 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	__finally427:
+#line 2411 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2395 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2411 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 2395 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2411 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		g_clear_error (&_inner_error_);
-#line 2395 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2411 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		return FALSE;
-#line 18776 "Dialogs.c"
+#line 18904 "Dialogs.c"
 	}
-#line 2400 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2416 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	result = TRUE;
-#line 2400 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2416 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 18782 "Dialogs.c"
+#line 18910 "Dialogs.c"
 }
 
 
@@ -18830,110 +18958,110 @@ static void preferences_dialog_populate_app_combo_box (PreferencesDialog* self,
 	GtkListStore* _tmp68_ = NULL;
 	gint _tmp69_ = 0;
 	GError * _inner_error_ = NULL;
-#line 2403 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2419 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_PREFERENCES_DIALOG (self));
-#line 2403 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2419 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (GTK_IS_COMBO_BOX (combo_box));
-#line 2403 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2419 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (current_app_executable != NULL);
-#line 2406 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2422 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = mime_types;
-#line 2406 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2422 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0__length1 = mime_types_length1;
-#line 2406 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2422 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_vala_assert (_tmp0__length1 != 0, "mime_types.length != 0");
-#line 2407 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2423 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = mime_types;
-#line 2407 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2423 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1__length1 = mime_types_length1;
-#line 2407 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2423 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = desktop_integration_get_apps_for_mime_types (_tmp1_, _tmp1__length1);
-#line 2407 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2423 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (_vala_external_apps);
-#line 2407 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2423 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_vala_external_apps = _tmp2_;
-#line 2409 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2425 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = _vala_external_apps;
-#line 2409 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2425 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp4_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 2409 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2425 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp5_ = _tmp4_;
-#line 2409 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2425 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp5_ == 0) {
-#line 2410 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2426 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (external_apps) {
-#line 2410 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2426 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			*external_apps = _vala_external_apps;
-#line 18851 "Dialogs.c"
+#line 18979 "Dialogs.c"
 		} else {
-#line 2410 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2426 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_object_unref0 (_vala_external_apps);
-#line 18855 "Dialogs.c"
+#line 18983 "Dialogs.c"
 		}
-#line 2410 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2426 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		return;
-#line 18859 "Dialogs.c"
+#line 18987 "Dialogs.c"
 	}
-#line 2413 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2429 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp6_ = (GtkCellRendererPixbuf*) gtk_cell_renderer_pixbuf_new ();
-#line 2413 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2429 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_object_ref_sink (_tmp6_);
-#line 2413 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2429 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	pixbuf_renderer = _tmp6_;
-#line 2414 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2430 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp7_ = (GtkCellRendererText*) gtk_cell_renderer_text_new ();
-#line 2414 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2430 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_object_ref_sink (_tmp7_);
-#line 2414 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2430 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	text_renderer = _tmp7_;
-#line 2415 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2431 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp8_ = combo_box;
-#line 2415 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2431 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_cell_layout_clear (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GTK_TYPE_CELL_LAYOUT, GtkCellLayout));
-#line 2416 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2432 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp9_ = combo_box;
-#line 2416 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2432 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp10_ = pixbuf_renderer;
-#line 2416 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2432 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_cell_layout_pack_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GTK_TYPE_CELL_LAYOUT, GtkCellLayout), G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_cell_renderer_get_type (), GtkCellRenderer), FALSE);
-#line 2417 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2433 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp11_ = combo_box;
-#line 2417 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2433 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp12_ = text_renderer;
-#line 2417 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2433 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_cell_layout_pack_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GTK_TYPE_CELL_LAYOUT, GtkCellLayout), G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_cell_renderer_get_type (), GtkCellRenderer), FALSE);
-#line 2418 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2434 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp13_ = combo_box;
-#line 2418 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2434 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp14_ = pixbuf_renderer;
-#line 2418 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2434 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_cell_layout_add_attribute (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GTK_TYPE_CELL_LAYOUT, GtkCellLayout), G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_cell_renderer_get_type (), GtkCellRenderer), "pixbuf", 0);
-#line 2419 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2435 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp15_ = combo_box;
-#line 2419 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2435 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp16_ = text_renderer;
-#line 2419 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2435 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_cell_layout_add_attribute (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GTK_TYPE_CELL_LAYOUT, GtkCellLayout), G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, gtk_cell_renderer_get_type (), GtkCellRenderer), "text", 1);
-#line 2422 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2438 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp17_ = gtk_list_store_new (2, GDK_TYPE_PIXBUF, G_TYPE_STRING, -1);
-#line 2422 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2438 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	combo_store = _tmp17_;
-#line 2425 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2441 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	current_app = -1;
-#line 18907 "Dialogs.c"
+#line 19035 "Dialogs.c"
 	{
 		GeeIterator* _app_it = NULL;
 		SortedList* _tmp18_ = NULL;
 		GeeIterator* _tmp19_ = NULL;
-#line 2427 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2443 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp18_ = _vala_external_apps;
-#line 2427 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2443 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp19_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 2427 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2443 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_app_it = _tmp19_;
-#line 2427 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2443 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		while (TRUE) {
-#line 18920 "Dialogs.c"
+#line 19048 "Dialogs.c"
 			GeeIterator* _tmp20_ = NULL;
 			gboolean _tmp21_ = FALSE;
 			GAppInfo* app = NULL;
@@ -18953,44 +19081,44 @@ static void preferences_dialog_populate_app_combo_box (PreferencesDialog* self,
 			GAppInfo* _tmp61_ = NULL;
 			const gchar* _tmp62_ = NULL;
 			const gchar* _tmp63_ = NULL;
-#line 2427 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2443 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp20_ = _app_it;
-#line 2427 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2443 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp21_ = gee_iterator_next (_tmp20_);
-#line 2427 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2443 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			if (!_tmp21_) {
-#line 2427 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2443 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				break;
-#line 18948 "Dialogs.c"
+#line 19076 "Dialogs.c"
 			}
-#line 2427 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2443 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp22_ = _app_it;
-#line 2427 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2443 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp23_ = gee_iterator_get (_tmp22_);
-#line 2427 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2443 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			app = (GAppInfo*) _tmp23_;
-#line 2428 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2444 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp24_ = combo_store;
-#line 2428 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2444 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			gtk_list_store_append (_tmp24_, &_tmp25_);
-#line 2428 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2444 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			iter = _tmp25_;
-#line 2430 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2446 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp26_ = app;
-#line 2430 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2446 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp27_ = g_app_info_get_icon (_tmp26_);
-#line 2430 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2446 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp28_ = _g_object_ref0 (_tmp27_);
-#line 2430 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2446 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			app_icon = _tmp28_;
-#line 18970 "Dialogs.c"
+#line 19098 "Dialogs.c"
 			{
 				GIcon* _tmp29_ = NULL;
-#line 2432 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2448 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp29_ = app_icon;
-#line 2432 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2448 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp29_, g_file_icon_get_type ())) {
-#line 18977 "Dialogs.c"
+#line 19105 "Dialogs.c"
 					GdkPixbuf* _tmp30_ = NULL;
 					GIcon* _tmp31_ = NULL;
 					GFile* _tmp32_ = NULL;
@@ -19002,51 +19130,51 @@ static void preferences_dialog_populate_app_combo_box (PreferencesDialog* self,
 					GtkTreeIter _tmp38_ = {0};
 					GdkPixbuf* _tmp39_ = NULL;
 					GValue _tmp40_ = {0};
-#line 2433 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2449 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp31_ = app_icon;
-#line 2433 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2449 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp32_ = g_file_icon_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, g_file_icon_get_type (), GFileIcon));
-#line 2433 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2449 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp33_ = g_file_get_path (_tmp32_);
-#line 2433 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2449 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp34_ = _tmp33_;
-#line 2433 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2449 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp35_ = gdk_pixbuf_new_from_file (_tmp34_, &_inner_error_);
-#line 2433 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2449 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp36_ = _tmp35_;
-#line 2433 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2449 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_g_free0 (_tmp34_);
-#line 2433 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2449 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp30_ = _tmp36_;
-#line 2433 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2449 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 19007 "Dialogs.c"
-						goto __catch415_g_error;
+#line 19135 "Dialogs.c"
+						goto __catch428_g_error;
 					}
-#line 2433 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2449 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp37_ = combo_store;
-#line 2433 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2449 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp38_ = iter;
-#line 2433 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2449 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp39_ = scale_pixbuf (_tmp30_, RESOURCES_DEFAULT_ICON_SCALE, GDK_INTERP_BILINEAR, FALSE);
-#line 2433 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2449 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					g_value_init (&_tmp40_, GDK_TYPE_PIXBUF);
-#line 2433 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2449 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					g_value_take_object (&_tmp40_, _tmp39_);
-#line 2433 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2449 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					gtk_list_store_set_value (_tmp37_, &_tmp38_, 0, &_tmp40_);
-#line 2433 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2449 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					G_IS_VALUE (&_tmp40_) ? (g_value_unset (&_tmp40_), NULL) : NULL;
-#line 2432 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2448 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_g_object_unref0 (_tmp30_);
-#line 19026 "Dialogs.c"
+#line 19154 "Dialogs.c"
 				} else {
 					GIcon* _tmp41_ = NULL;
-#line 2436 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2452 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp41_ = app_icon;
-#line 2436 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2452 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp41_, g_themed_icon_get_type ())) {
-#line 19033 "Dialogs.c"
+#line 19161 "Dialogs.c"
 						GdkPixbuf* icon_pixbuf = NULL;
 						GtkIconTheme* _tmp42_ = NULL;
 						GIcon* _tmp43_ = NULL;
@@ -19058,178 +19186,178 @@ static void preferences_dialog_populate_app_combo_box (PreferencesDialog* self,
 						GtkTreeIter _tmp49_ = {0};
 						GdkPixbuf* _tmp50_ = NULL;
 						GValue _tmp51_ = {0};
-#line 2437 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2453 "/home/jens/Source/shotwell/src/Dialogs.vala"
 						_tmp42_ = gtk_icon_theme_get_default ();
-#line 2437 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2453 "/home/jens/Source/shotwell/src/Dialogs.vala"
 						_tmp43_ = app_icon;
-#line 2437 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2453 "/home/jens/Source/shotwell/src/Dialogs.vala"
 						_tmp45_ = _tmp44_ = g_themed_icon_get_names (G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, g_themed_icon_get_type (), GThemedIcon));
-#line 2437 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2453 "/home/jens/Source/shotwell/src/Dialogs.vala"
 						_tmp46_ = _tmp45_[0];
-#line 2437 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2453 "/home/jens/Source/shotwell/src/Dialogs.vala"
 						_tmp47_ = gtk_icon_theme_load_icon (_tmp42_, _tmp46_, RESOURCES_DEFAULT_ICON_SCALE, GTK_ICON_LOOKUP_FORCE_SIZE, &_inner_error_);
-#line 2437 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2453 "/home/jens/Source/shotwell/src/Dialogs.vala"
 						icon_pixbuf = _tmp47_;
-#line 2437 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2453 "/home/jens/Source/shotwell/src/Dialogs.vala"
 						if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 19059 "Dialogs.c"
-							goto __catch415_g_error;
+#line 19187 "Dialogs.c"
+							goto __catch428_g_error;
 						}
-#line 2441 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2457 "/home/jens/Source/shotwell/src/Dialogs.vala"
 						_tmp48_ = combo_store;
-#line 2441 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2457 "/home/jens/Source/shotwell/src/Dialogs.vala"
 						_tmp49_ = iter;
-#line 2441 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2457 "/home/jens/Source/shotwell/src/Dialogs.vala"
 						_tmp50_ = icon_pixbuf;
-#line 2441 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2457 "/home/jens/Source/shotwell/src/Dialogs.vala"
 						g_value_init (&_tmp51_, GDK_TYPE_PIXBUF);
-#line 2441 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2457 "/home/jens/Source/shotwell/src/Dialogs.vala"
 						g_value_set_object (&_tmp51_, _tmp50_);
-#line 2441 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2457 "/home/jens/Source/shotwell/src/Dialogs.vala"
 						gtk_list_store_set_value (_tmp48_, &_tmp49_, 0, &_tmp51_);
-#line 2441 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2457 "/home/jens/Source/shotwell/src/Dialogs.vala"
 						G_IS_VALUE (&_tmp51_) ? (g_value_unset (&_tmp51_), NULL) : NULL;
-#line 2436 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2452 "/home/jens/Source/shotwell/src/Dialogs.vala"
 						_g_object_unref0 (icon_pixbuf);
-#line 19078 "Dialogs.c"
+#line 19206 "Dialogs.c"
 					}
 				}
 			}
-			goto __finally415;
-			__catch415_g_error:
+			goto __finally428;
+			__catch428_g_error:
 			{
 				GError* _error_ = NULL;
 				GError* _tmp52_ = NULL;
 				const gchar* _tmp53_ = NULL;
 				gchar* _tmp54_ = NULL;
 				gchar* _tmp55_ = NULL;
-#line 2431 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2447 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_error_ = _inner_error_;
-#line 2431 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2447 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_inner_error_ = NULL;
-#line 2444 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2460 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp52_ = _error_;
-#line 2444 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2460 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp53_ = _tmp52_->message;
-#line 2444 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2460 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp54_ = g_strconcat ("Error loading icon pixbuf: ", _tmp53_, NULL);
-#line 2444 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2460 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp55_ = _tmp54_;
-#line 2444 "/home/jens/Source/shotwell/src/Dialogs.vala"
-				g_warning ("Dialogs.vala:2444: %s", _tmp55_);
-#line 2444 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2460 "/home/jens/Source/shotwell/src/Dialogs.vala"
+				g_warning ("Dialogs.vala:2460: %s", _tmp55_);
+#line 2460 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_free0 (_tmp55_);
-#line 2431 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2447 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_error_free0 (_error_);
-#line 19108 "Dialogs.c"
+#line 19236 "Dialogs.c"
 			}
-			__finally415:
-#line 2431 "/home/jens/Source/shotwell/src/Dialogs.vala"
+			__finally428:
+#line 2447 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2431 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2447 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_object_unref0 (app_icon);
-#line 2431 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2447 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_object_unref0 (app);
-#line 2431 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2447 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_object_unref0 (_app_it);
-#line 2431 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2447 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_object_unref0 (combo_store);
-#line 2431 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2447 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_object_unref0 (text_renderer);
-#line 2431 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2447 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_object_unref0 (pixbuf_renderer);
-#line 2431 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2447 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 2431 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2447 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				g_clear_error (&_inner_error_);
-#line 2431 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2447 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				return;
-#line 19131 "Dialogs.c"
+#line 19259 "Dialogs.c"
 			}
-#line 2447 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2463 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp56_ = combo_store;
-#line 2447 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2463 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp57_ = iter;
-#line 2447 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2463 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp58_ = app;
-#line 2447 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2463 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp59_ = g_app_info_get_name (_tmp58_);
-#line 2447 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2463 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			g_value_init (&_tmp60_, G_TYPE_STRING);
-#line 2447 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2463 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			g_value_set_string (&_tmp60_, _tmp59_);
-#line 2447 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2463 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			gtk_list_store_set_value (_tmp56_, &_tmp57_, 1, &_tmp60_);
-#line 2447 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2463 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			G_IS_VALUE (&_tmp60_) ? (g_value_unset (&_tmp60_), NULL) : NULL;
-#line 2449 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2465 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp61_ = app;
-#line 2449 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2465 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp62_ = g_app_info_get_commandline (_tmp61_);
-#line 2449 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2465 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp63_ = current_app_executable;
-#line 2449 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2465 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			if (g_strcmp0 (_tmp62_, _tmp63_) == 0) {
-#line 19157 "Dialogs.c"
+#line 19285 "Dialogs.c"
 				SortedList* _tmp64_ = NULL;
 				GAppInfo* _tmp65_ = NULL;
 				gint _tmp66_ = 0;
-#line 2450 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2466 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp64_ = _vala_external_apps;
-#line 2450 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2466 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp65_ = app;
-#line 2450 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2466 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp66_ = sorted_list_index_of (_tmp64_, _tmp65_);
-#line 2450 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2466 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				current_app = _tmp66_;
-#line 19169 "Dialogs.c"
+#line 19297 "Dialogs.c"
 			}
-#line 2427 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2443 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_object_unref0 (app_icon);
-#line 2427 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2443 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_object_unref0 (app);
-#line 19175 "Dialogs.c"
+#line 19303 "Dialogs.c"
 		}
-#line 2427 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2443 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (_app_it);
-#line 19179 "Dialogs.c"
+#line 19307 "Dialogs.c"
 	}
-#line 2455 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2471 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp67_ = combo_box;
-#line 2455 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2471 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp68_ = combo_store;
-#line 2455 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2471 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_combo_box_set_model (_tmp67_, G_TYPE_CHECK_INSTANCE_CAST (_tmp68_, GTK_TYPE_TREE_MODEL, GtkTreeModel));
-#line 2457 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2473 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp69_ = current_app;
-#line 2457 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2473 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp69_ != -1) {
-#line 19191 "Dialogs.c"
+#line 19319 "Dialogs.c"
 		GtkComboBox* _tmp70_ = NULL;
 		gint _tmp71_ = 0;
-#line 2458 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2474 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp70_ = combo_box;
-#line 2458 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2474 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp71_ = current_app;
-#line 2458 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2474 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_combo_box_set_active (_tmp70_, _tmp71_);
-#line 19200 "Dialogs.c"
+#line 19328 "Dialogs.c"
 	}
-#line 2403 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2419 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (combo_store);
-#line 2403 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2419 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (text_renderer);
-#line 2403 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2419 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (pixbuf_renderer);
-#line 2403 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2419 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (external_apps) {
-#line 2403 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2419 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		*external_apps = _vala_external_apps;
-#line 19212 "Dialogs.c"
+#line 19340 "Dialogs.c"
 	} else {
-#line 2403 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2419 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (_vala_external_apps);
-#line 19216 "Dialogs.c"
+#line 19344 "Dialogs.c"
 	}
 }
 
@@ -19243,35 +19371,35 @@ static void preferences_dialog_setup_dir_pattern (PreferencesDialog* self, GtkCo
 	gboolean found = FALSE;
 	const gchar* _tmp4_ = NULL;
 	gboolean _tmp32_ = FALSE;
-#line 2461 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2477 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_PREFERENCES_DIALOG (self));
-#line 2461 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2477 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (GTK_IS_COMBO_BOX (combo_box));
-#line 2461 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2477 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (GTK_IS_ENTRY (entry));
-#line 2462 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2478 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = config_facade_get_instance ();
-#line 2462 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2478 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = _tmp0_;
-#line 2462 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2478 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = configuration_facade_get_directory_pattern (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 2462 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2478 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = _tmp2_;
-#line 2462 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2478 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (_tmp1_);
-#line 2462 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2478 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	pattern = _tmp3_;
-#line 2463 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2479 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	found = FALSE;
-#line 2464 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2480 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp4_ = pattern;
-#line 2464 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2480 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (NULL != _tmp4_) {
-#line 19254 "Dialogs.c"
+#line 19382 "Dialogs.c"
 		gint i = 0;
-#line 2466 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2482 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		i = 0;
-#line 19258 "Dialogs.c"
+#line 19386 "Dialogs.c"
 		{
 			GeeArrayList* _pf_list = NULL;
 			GeeArrayList* _tmp5_ = NULL;
@@ -19281,25 +19409,25 @@ static void preferences_dialog_setup_dir_pattern (PreferencesDialog* self, GtkCo
 			gint _tmp8_ = 0;
 			gint _tmp9_ = 0;
 			gint _pf_index = 0;
-#line 2467 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2483 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp5_ = self->priv->path_formats;
-#line 2467 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2483 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp6_ = _g_object_ref0 (_tmp5_);
-#line 2467 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2483 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_pf_list = _tmp6_;
-#line 2467 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2483 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp7_ = _pf_list;
-#line 2467 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2483 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp8_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 2467 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2483 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp9_ = _tmp8_;
-#line 2467 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2483 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_pf_size = _tmp9_;
-#line 2467 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2483 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_pf_index = -1;
-#line 2467 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2483 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			while (TRUE) {
-#line 19286 "Dialogs.c"
+#line 19414 "Dialogs.c"
 				gint _tmp10_ = 0;
 				gint _tmp11_ = 0;
 				gint _tmp12_ = 0;
@@ -19311,64 +19439,64 @@ static void preferences_dialog_setup_dir_pattern (PreferencesDialog* self, GtkCo
 				const gchar* _tmp17_ = NULL;
 				const gchar* _tmp18_ = NULL;
 				gint _tmp21_ = 0;
-#line 2467 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2483 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp10_ = _pf_index;
-#line 2467 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2483 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_pf_index = _tmp10_ + 1;
-#line 2467 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2483 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp11_ = _pf_index;
-#line 2467 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2483 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp12_ = _pf_size;
-#line 2467 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2483 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				if (!(_tmp11_ < _tmp12_)) {
-#line 2467 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2483 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					break;
-#line 19310 "Dialogs.c"
+#line 19438 "Dialogs.c"
 				}
-#line 2467 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2483 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp13_ = _pf_list;
-#line 2467 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2483 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp14_ = _pf_index;
-#line 2467 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2483 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp15_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp14_);
-#line 2467 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2483 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				pf = (PreferencesDialogPathFormat*) _tmp15_;
-#line 2468 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2484 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp16_ = pf;
-#line 2468 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2484 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp17_ = _tmp16_->pattern;
-#line 2468 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2484 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp18_ = pattern;
-#line 2468 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2484 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				if (g_strcmp0 (_tmp17_, _tmp18_) == 0) {
-#line 19328 "Dialogs.c"
+#line 19456 "Dialogs.c"
 					GtkComboBox* _tmp19_ = NULL;
 					gint _tmp20_ = 0;
-#line 2469 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2485 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp19_ = combo_box;
-#line 2469 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2485 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp20_ = i;
-#line 2469 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2485 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					gtk_combo_box_set_active (_tmp19_, _tmp20_);
-#line 2470 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2486 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					found = TRUE;
-#line 2471 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2487 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_preferences_dialog_path_format_unref0 (pf);
-#line 2471 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2487 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					break;
-#line 19343 "Dialogs.c"
+#line 19471 "Dialogs.c"
 				}
-#line 2473 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2489 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp21_ = i;
-#line 2473 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2489 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				i = _tmp21_ + 1;
-#line 2467 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2483 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_preferences_dialog_path_format_unref0 (pf);
-#line 19351 "Dialogs.c"
+#line 19479 "Dialogs.c"
 			}
-#line 2467 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2483 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_object_unref0 (_pf_list);
-#line 19355 "Dialogs.c"
+#line 19483 "Dialogs.c"
 		}
 	} else {
 		gchar* s = NULL;
@@ -19378,64 +19506,64 @@ static void preferences_dialog_setup_dir_pattern (PreferencesDialog* self, GtkCo
 		gchar* _tmp25_ = NULL;
 		const gchar* _tmp26_ = NULL;
 		gboolean _tmp27_ = FALSE;
-#line 2477 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2493 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp22_ = config_facade_get_instance ();
-#line 2477 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2493 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp23_ = _tmp22_;
-#line 2477 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2493 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp24_ = configuration_facade_get_directory_pattern_custom (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 2477 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2493 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp25_ = _tmp24_;
-#line 2477 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2493 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (_tmp23_);
-#line 2477 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2493 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		s = _tmp25_;
-#line 2478 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2494 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp26_ = s;
-#line 2478 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2494 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp27_ = is_string_empty (_tmp26_);
-#line 2478 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2494 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (!_tmp27_) {
-#line 19383 "Dialogs.c"
+#line 19511 "Dialogs.c"
 			GtkComboBox* _tmp28_ = NULL;
 			GeeArrayList* _tmp29_ = NULL;
 			gint _tmp30_ = 0;
 			gint _tmp31_ = 0;
-#line 2479 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2495 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp28_ = combo_box;
-#line 2479 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2495 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp29_ = self->priv->path_formats;
-#line 2479 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2495 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp30_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 2479 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2495 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp31_ = _tmp30_;
-#line 2479 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2495 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			gtk_combo_box_set_active (_tmp28_, _tmp31_ - 1);
-#line 2480 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2496 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			found = TRUE;
-#line 19400 "Dialogs.c"
+#line 19528 "Dialogs.c"
 		}
-#line 2464 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2480 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (s);
-#line 19404 "Dialogs.c"
+#line 19532 "Dialogs.c"
 	}
-#line 2484 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2500 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp32_ = found;
-#line 2484 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2500 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (!_tmp32_) {
-#line 19410 "Dialogs.c"
+#line 19538 "Dialogs.c"
 		GtkComboBox* _tmp33_ = NULL;
-#line 2485 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2501 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp33_ = combo_box;
-#line 2485 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2501 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_combo_box_set_active (_tmp33_, 0);
-#line 19416 "Dialogs.c"
+#line 19544 "Dialogs.c"
 	}
-#line 2488 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2504 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	preferences_dialog_on_dir_pattern_combo_changed (self);
-#line 2461 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2477 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (pattern);
-#line 19422 "Dialogs.c"
+#line 19550 "Dialogs.c"
 }
 
 
@@ -19452,55 +19580,55 @@ void preferences_dialog_show (void) {
 	gchar* _tmp10_ = NULL;
 	PreferencesDialog* _tmp11_ = NULL;
 	GtkDialog* _tmp12_ = NULL;
-#line 2492 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2508 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = preferences_dialog_preferences_dialog;
-#line 2492 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2508 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp0_ == NULL) {
-#line 19443 "Dialogs.c"
+#line 19571 "Dialogs.c"
 		PreferencesDialog* _tmp1_ = NULL;
-#line 2493 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2509 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp1_ = preferences_dialog_new ();
-#line 2493 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2509 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_preferences_dialog_unref0 (preferences_dialog_preferences_dialog);
-#line 2493 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2509 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		preferences_dialog_preferences_dialog = _tmp1_;
-#line 19451 "Dialogs.c"
+#line 19579 "Dialogs.c"
 	}
-#line 2495 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2511 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = preferences_dialog_preferences_dialog;
-#line 2495 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2511 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	preferences_dialog_populate_preference_options (_tmp2_);
-#line 2496 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2512 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = preferences_dialog_preferences_dialog;
-#line 2496 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2512 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp4_ = _tmp3_->priv->dialog;
-#line 2496 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2512 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_widget_get_type (), GtkWidget));
-#line 2497 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2513 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp5_ = preferences_dialog_preferences_dialog;
-#line 2497 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2513 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp6_ = _tmp5_->priv->library_dir_button;
-#line 2497 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2513 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp7_ = app_dirs_get_import_dir ();
-#line 2497 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2513 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp8_ = _tmp7_;
-#line 2497 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2513 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp9_ = g_file_get_path (_tmp8_);
-#line 2497 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2513 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp10_ = _tmp9_;
-#line 2497 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2513 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_file_chooser_set_current_folder (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser), _tmp10_);
-#line 2497 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2513 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (_tmp10_);
-#line 2497 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2513 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (_tmp8_);
-#line 2501 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2517 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp11_ = preferences_dialog_preferences_dialog;
-#line 2501 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2517 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp12_ = _tmp11_->priv->dialog;
-#line 2501 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2517 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_window_present (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_window_get_type (), GtkWindow));
-#line 19487 "Dialogs.c"
+#line 19615 "Dialogs.c"
 }
 
 
@@ -19525,113 +19653,113 @@ static void preferences_dialog_commit_on_close (PreferencesDialog* self) {
 	gpointer _tmp25_ = NULL;
 	PreferencesDialogPathFormat* _tmp26_ = NULL;
 	const gchar* _tmp27_ = NULL;
-#line 2506 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2522 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_PREFERENCES_DIALOG (self));
-#line 2507 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2523 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = config_facade_get_instance ();
-#line 2507 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2523 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = _tmp0_;
-#line 2507 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2523 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	config_facade_commit_bg_color (_tmp1_);
-#line 2507 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2523 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (_tmp1_);
-#line 2509 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2525 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = self->priv->builder;
-#line 2509 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2525 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = gtk_builder_get_object (_tmp2_, "autoimport");
-#line 2509 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2525 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp4_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp3_, gtk_check_button_get_type ()) ? ((GtkCheckButton*) _tmp3_) : NULL);
-#line 2509 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2525 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	autoimport = _tmp4_;
-#line 2510 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2526 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp5_ = autoimport;
-#line 2510 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2526 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp5_ != NULL) {
-#line 19534 "Dialogs.c"
+#line 19662 "Dialogs.c"
 		ConfigFacade* _tmp6_ = NULL;
 		ConfigFacade* _tmp7_ = NULL;
 		GtkCheckButton* _tmp8_ = NULL;
 		gboolean _tmp9_ = FALSE;
 		gboolean _tmp10_ = FALSE;
-#line 2511 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2527 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp6_ = config_facade_get_instance ();
-#line 2511 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2527 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp7_ = _tmp6_;
-#line 2511 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2527 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp8_ = autoimport;
-#line 2511 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2527 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp9_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_toggle_button_get_type (), GtkToggleButton));
-#line 2511 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2527 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp10_ = _tmp9_;
-#line 2511 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2527 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		configuration_facade_set_auto_import_from_library (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp10_);
-#line 2511 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2527 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (_tmp7_);
-#line 19554 "Dialogs.c"
+#line 19682 "Dialogs.c"
 	}
-#line 2513 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2529 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp11_ = self->priv->builder;
-#line 2513 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2529 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp12_ = gtk_builder_get_object (_tmp11_, "write_metadata");
-#line 2513 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2529 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp13_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp12_, gtk_check_button_get_type ()) ? ((GtkCheckButton*) _tmp12_) : NULL);
-#line 2513 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2529 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	commit_metadata = _tmp13_;
-#line 2514 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2530 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp14_ = commit_metadata;
-#line 2514 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2530 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp14_ != NULL) {
-#line 19568 "Dialogs.c"
+#line 19696 "Dialogs.c"
 		ConfigFacade* _tmp15_ = NULL;
 		ConfigFacade* _tmp16_ = NULL;
 		GtkCheckButton* _tmp17_ = NULL;
 		gboolean _tmp18_ = FALSE;
 		gboolean _tmp19_ = FALSE;
-#line 2515 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2531 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp15_ = config_facade_get_instance ();
-#line 2515 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2531 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp16_ = _tmp15_;
-#line 2515 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2531 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp17_ = commit_metadata;
-#line 2515 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2531 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp18_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_toggle_button_get_type (), GtkToggleButton));
-#line 2515 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2531 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp19_ = _tmp18_;
-#line 2515 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2531 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		configuration_facade_set_commit_metadata_to_masters (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp19_);
-#line 2515 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2531 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (_tmp16_);
-#line 19588 "Dialogs.c"
+#line 19716 "Dialogs.c"
 	}
-#line 2517 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2533 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp20_ = self->priv->lib_dir;
-#line 2517 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2533 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp20_ != NULL) {
-#line 19594 "Dialogs.c"
+#line 19722 "Dialogs.c"
 		const gchar* _tmp21_ = NULL;
-#line 2518 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2534 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp21_ = self->priv->lib_dir;
-#line 2518 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2534 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		app_dirs_set_import_dir (_tmp21_);
-#line 19600 "Dialogs.c"
+#line 19728 "Dialogs.c"
 	}
-#line 2520 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2536 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp22_ = self->priv->path_formats;
-#line 2520 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2536 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp23_ = self->priv->dir_pattern_combo;
-#line 2520 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2536 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp24_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, gtk_combo_box_get_type (), GtkComboBox));
-#line 2520 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2536 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp25_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp24_);
-#line 2520 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2536 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	pf = (PreferencesDialogPathFormat*) _tmp25_;
-#line 2521 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2537 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp26_ = pf;
-#line 2521 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2537 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp27_ = _tmp26_->pattern;
-#line 2521 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2537 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (NULL == _tmp27_) {
-#line 19618 "Dialogs.c"
+#line 19746 "Dialogs.c"
 		ConfigFacade* _tmp28_ = NULL;
 		ConfigFacade* _tmp29_ = NULL;
 		GtkEntry* _tmp30_ = NULL;
@@ -19639,55 +19767,55 @@ static void preferences_dialog_commit_on_close (PreferencesDialog* self) {
 		const gchar* _tmp32_ = NULL;
 		ConfigFacade* _tmp33_ = NULL;
 		ConfigFacade* _tmp34_ = NULL;
-#line 2522 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2538 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp28_ = config_facade_get_instance ();
-#line 2522 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2538 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp29_ = _tmp28_;
-#line 2522 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2538 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp30_ = self->priv->dir_pattern_entry;
-#line 2522 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2538 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp31_ = gtk_entry_get_text (_tmp30_);
-#line 2522 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2538 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp32_ = _tmp31_;
-#line 2522 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2538 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		configuration_facade_set_directory_pattern_custom (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp32_);
-#line 2522 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2538 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (_tmp29_);
-#line 2523 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2539 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp33_ = config_facade_get_instance ();
-#line 2523 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2539 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp34_ = _tmp33_;
-#line 2523 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2539 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		configuration_facade_set_directory_pattern (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), NULL);
-#line 2523 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2539 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (_tmp34_);
-#line 19648 "Dialogs.c"
+#line 19776 "Dialogs.c"
 	} else {
 		ConfigFacade* _tmp35_ = NULL;
 		ConfigFacade* _tmp36_ = NULL;
 		PreferencesDialogPathFormat* _tmp37_ = NULL;
 		const gchar* _tmp38_ = NULL;
-#line 2525 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2541 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp35_ = config_facade_get_instance ();
-#line 2525 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2541 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp36_ = _tmp35_;
-#line 2525 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2541 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp37_ = pf;
-#line 2525 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2541 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp38_ = _tmp37_->pattern;
-#line 2525 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2541 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		configuration_facade_set_directory_pattern (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp38_);
-#line 2525 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2541 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (_tmp36_);
-#line 19666 "Dialogs.c"
+#line 19794 "Dialogs.c"
 	}
-#line 2506 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2522 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_preferences_dialog_path_format_unref0 (pf);
-#line 2506 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2522 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (commit_metadata);
-#line 2506 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2522 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (autoimport);
-#line 19674 "Dialogs.c"
+#line 19802 "Dialogs.c"
 }
 
 
@@ -19696,52 +19824,52 @@ static gboolean preferences_dialog_on_delete (PreferencesDialog* self) {
 	gboolean _tmp0_ = FALSE;
 	GtkDialog* _tmp1_ = NULL;
 	gboolean _tmp2_ = FALSE;
-#line 2529 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2545 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (IS_PREFERENCES_DIALOG (self), FALSE);
-#line 2530 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2546 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = preferences_dialog_get_allow_closing (self);
-#line 2530 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2546 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (!_tmp0_) {
-#line 2531 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2547 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		result = TRUE;
-#line 2531 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2547 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		return result;
-#line 19693 "Dialogs.c"
+#line 19821 "Dialogs.c"
 	}
-#line 2533 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2549 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	preferences_dialog_commit_on_close (self);
-#line 2534 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2550 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = self->priv->dialog;
-#line 2534 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2550 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = gtk_widget_hide_on_delete (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_widget_get_type (), GtkWidget));
-#line 2534 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2550 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	result = _tmp2_;
-#line 2534 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2550 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 19705 "Dialogs.c"
+#line 19833 "Dialogs.c"
 }
 
 
 static void preferences_dialog_on_close (PreferencesDialog* self) {
 	gboolean _tmp0_ = FALSE;
 	GtkDialog* _tmp1_ = NULL;
-#line 2537 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2553 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_PREFERENCES_DIALOG (self));
-#line 2538 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2554 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = preferences_dialog_get_allow_closing (self);
-#line 2538 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2554 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (!_tmp0_) {
-#line 2539 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2555 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		return;
-#line 19720 "Dialogs.c"
+#line 19848 "Dialogs.c"
 	}
-#line 2541 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2557 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = self->priv->dialog;
-#line 2541 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2557 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_widget_get_type (), GtkWidget));
-#line 2542 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2558 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	preferences_dialog_commit_on_close (self);
-#line 19728 "Dialogs.c"
+#line 19856 "Dialogs.c"
 }
 
 
@@ -19750,19 +19878,19 @@ static void preferences_dialog_on_value_changed (PreferencesDialog* self) {
 	gdouble _tmp1_ = 0.0;
 	GtkAdjustment* _tmp2_ = NULL;
 	gdouble _tmp3_ = 0.0;
-#line 2545 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2561 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_PREFERENCES_DIALOG (self));
-#line 2546 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2562 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = self->priv->bg_color_adjustment;
-#line 2546 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2562 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = gtk_adjustment_get_upper (_tmp0_);
-#line 2546 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2562 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = self->priv->bg_color_adjustment;
-#line 2546 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2562 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = gtk_adjustment_get_value (_tmp2_);
-#line 2546 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2562 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	preferences_dialog_set_background_color (self, ((gdouble) (_tmp1_ - _tmp3_)) / 65535.0);
-#line 19749 "Dialogs.c"
+#line 19877 "Dialogs.c"
 }
 
 
@@ -19772,84 +19900,84 @@ static gboolean preferences_dialog_on_bg_color_reset (PreferencesDialog* self, G
 	gboolean _tmp1_ = FALSE;
 	GdkEventButton* _tmp2_ = NULL;
 	guint _tmp3_ = 0U;
-#line 2550 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2566 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (IS_PREFERENCES_DIALOG (self), FALSE);
-#line 2550 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2566 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 2551 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2567 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = event;
-#line 2551 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2567 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = _tmp2_->button;
-#line 2551 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2567 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp3_ == ((guint) 1)) {
-#line 19769 "Dialogs.c"
+#line 19897 "Dialogs.c"
 		GdkEventButton* _tmp4_ = NULL;
 		GdkEventType _tmp5_ = 0;
-#line 2551 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2567 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp4_ = event;
-#line 2551 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2567 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp5_ = _tmp4_->type;
-#line 2551 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2567 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp1_ = _tmp5_ == GDK_BUTTON_PRESS;
-#line 19778 "Dialogs.c"
+#line 19906 "Dialogs.c"
 	} else {
-#line 2551 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2567 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp1_ = FALSE;
-#line 19782 "Dialogs.c"
+#line 19910 "Dialogs.c"
 	}
-#line 2551 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2567 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp1_) {
-#line 19786 "Dialogs.c"
+#line 19914 "Dialogs.c"
 		GdkEventButton* _tmp6_ = NULL;
 		GdkModifierType _tmp7_ = 0;
 		gboolean _tmp8_ = FALSE;
-#line 2552 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2568 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp6_ = event;
-#line 2552 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2568 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp7_ = _tmp6_->state;
-#line 2552 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2568 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp8_ = has_only_key_modifier (_tmp7_, GDK_CONTROL_MASK);
-#line 2552 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2568 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp0_ = _tmp8_;
-#line 19798 "Dialogs.c"
+#line 19926 "Dialogs.c"
 	} else {
-#line 2551 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2567 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp0_ = FALSE;
-#line 19802 "Dialogs.c"
+#line 19930 "Dialogs.c"
 	}
-#line 2551 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2567 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp0_) {
-#line 19806 "Dialogs.c"
+#line 19934 "Dialogs.c"
 		GtkScale* _tmp9_ = NULL;
 		GtkAdjustment* _tmp10_ = NULL;
 		gdouble _tmp11_ = 0.0;
 		GdkRGBA _tmp12_ = {0};
 		gdouble _tmp13_ = 0.0;
-#line 2554 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2570 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp9_ = self->priv->bg_color_slider;
-#line 2554 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2570 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp10_ = self->priv->bg_color_adjustment;
-#line 2554 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2570 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp11_ = gtk_adjustment_get_upper (_tmp10_);
-#line 2554 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2570 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		parse_color (CONFIG_FACADE_DEFAULT_BG_COLOR, &_tmp12_);
-#line 2554 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2570 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp13_ = _tmp12_.red;
-#line 2554 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2570 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_range_get_type (), GtkRange), _tmp11_ - (_tmp13_ * 65536.0f));
-#line 2556 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2572 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		preferences_dialog_on_value_changed (self);
-#line 2558 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2574 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		result = TRUE;
-#line 2558 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2574 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		return result;
-#line 19830 "Dialogs.c"
+#line 19958 "Dialogs.c"
 	}
-#line 2561 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2577 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	result = FALSE;
-#line 2561 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2577 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 19836 "Dialogs.c"
+#line 19964 "Dialogs.c"
 }
 
 
@@ -19861,25 +19989,25 @@ static void preferences_dialog_on_dir_pattern_combo_changed (PreferencesDialog*
 	gpointer _tmp3_ = NULL;
 	PreferencesDialogPathFormat* _tmp4_ = NULL;
 	const gchar* _tmp5_ = NULL;
-#line 2564 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2580 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_PREFERENCES_DIALOG (self));
-#line 2565 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2581 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = self->priv->path_formats;
-#line 2565 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2581 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = self->priv->dir_pattern_combo;
-#line 2565 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2581 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_combo_box_get_type (), GtkComboBox));
-#line 2565 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2581 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp2_);
-#line 2565 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2581 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	pf = (PreferencesDialogPathFormat*) _tmp3_;
-#line 2566 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2582 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp4_ = pf;
-#line 2566 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2582 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp5_ = _tmp4_->pattern;
-#line 2566 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2582 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (NULL == _tmp5_) {
-#line 19866 "Dialogs.c"
+#line 19994 "Dialogs.c"
 		gchar* dir_pattern = NULL;
 		ConfigFacade* _tmp6_ = NULL;
 		ConfigFacade* _tmp7_ = NULL;
@@ -19891,78 +20019,78 @@ static void preferences_dialog_on_dir_pattern_combo_changed (PreferencesDialog*
 		const gchar* _tmp14_ = NULL;
 		GtkEntry* _tmp15_ = NULL;
 		GtkEntry* _tmp16_ = NULL;
-#line 2568 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2584 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp6_ = config_facade_get_instance ();
-#line 2568 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2584 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp7_ = _tmp6_;
-#line 2568 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2584 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp8_ = configuration_facade_get_directory_pattern_custom (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 2568 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2584 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp9_ = _tmp8_;
-#line 2568 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2584 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (_tmp7_);
-#line 2568 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2584 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		dir_pattern = _tmp9_;
-#line 2569 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2585 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp10_ = dir_pattern;
-#line 2569 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2585 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp11_ = is_string_empty (_tmp10_);
-#line 2569 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2585 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (_tmp11_) {
-#line 19896 "Dialogs.c"
+#line 20024 "Dialogs.c"
 			gchar* _tmp12_ = NULL;
-#line 2570 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2586 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp12_ = g_strdup ("");
-#line 2570 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2586 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_free0 (dir_pattern);
-#line 2570 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2586 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			dir_pattern = _tmp12_;
-#line 19904 "Dialogs.c"
+#line 20032 "Dialogs.c"
 		}
-#line 2571 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2587 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp13_ = self->priv->dir_pattern_entry;
-#line 2571 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2587 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp14_ = dir_pattern;
-#line 2571 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2587 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_entry_set_text (_tmp13_, _tmp14_);
-#line 2572 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2588 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp15_ = self->priv->dir_pattern_entry;
-#line 2572 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2588 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		g_object_set (_tmp15_, "editable", TRUE, NULL);
-#line 2573 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2589 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp16_ = self->priv->dir_pattern_entry;
-#line 2573 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2589 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, gtk_widget_get_type (), GtkWidget), TRUE);
-#line 2566 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2582 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (dir_pattern);
-#line 19922 "Dialogs.c"
+#line 20050 "Dialogs.c"
 	} else {
 		GtkEntry* _tmp17_ = NULL;
 		PreferencesDialogPathFormat* _tmp18_ = NULL;
 		const gchar* _tmp19_ = NULL;
 		GtkEntry* _tmp20_ = NULL;
 		GtkEntry* _tmp21_ = NULL;
-#line 2575 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2591 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp17_ = self->priv->dir_pattern_entry;
-#line 2575 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2591 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp18_ = pf;
-#line 2575 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2591 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp19_ = _tmp18_->pattern;
-#line 2575 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2591 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_entry_set_text (_tmp17_, _tmp19_);
-#line 2576 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2592 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp20_ = self->priv->dir_pattern_entry;
-#line 2576 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2592 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		g_object_set (_tmp20_, "editable", FALSE, NULL);
-#line 2577 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2593 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp21_ = self->priv->dir_pattern_entry;
-#line 2577 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2593 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 19945 "Dialogs.c"
+#line 20073 "Dialogs.c"
 	}
-#line 2564 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2580 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_preferences_dialog_path_format_unref0 (pf);
-#line 19949 "Dialogs.c"
+#line 20077 "Dialogs.c"
 }
 
 
@@ -19976,92 +20104,92 @@ static void preferences_dialog_on_dir_pattern_entry_changed (PreferencesDialog*
 	gboolean _tmp5_ = FALSE;
 	const gchar* _tmp6_ = NULL;
 	gboolean _tmp7_ = FALSE;
-#line 2581 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2597 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_PREFERENCES_DIALOG (self));
-#line 2582 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2598 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = self->priv->example_date;
-#line 2582 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2598 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = self->priv->dir_pattern_entry;
-#line 2582 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2598 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = gtk_entry_get_text (_tmp1_);
-#line 2582 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2598 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = _tmp2_;
-#line 2582 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2598 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp4_ = g_date_time_format (_tmp0_, _tmp3_);
-#line 2582 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2598 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	example = _tmp4_;
-#line 2583 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2599 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp6_ = example;
-#line 2583 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2599 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp7_ = is_string_empty (_tmp6_);
-#line 2583 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2599 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp7_) {
-#line 19983 "Dialogs.c"
+#line 20111 "Dialogs.c"
 		GtkEntry* _tmp8_ = NULL;
 		const gchar* _tmp9_ = NULL;
 		const gchar* _tmp10_ = NULL;
 		gboolean _tmp11_ = FALSE;
-#line 2583 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2599 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp8_ = self->priv->dir_pattern_entry;
-#line 2583 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2599 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp9_ = gtk_entry_get_text (_tmp8_);
-#line 2583 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2599 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp10_ = _tmp9_;
-#line 2583 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2599 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp11_ = is_string_empty (_tmp10_);
-#line 2583 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2599 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp5_ = !_tmp11_;
-#line 19998 "Dialogs.c"
+#line 20126 "Dialogs.c"
 	} else {
-#line 2583 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2599 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp5_ = FALSE;
-#line 20002 "Dialogs.c"
+#line 20130 "Dialogs.c"
 	}
-#line 2583 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2599 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp5_) {
-#line 20006 "Dialogs.c"
+#line 20134 "Dialogs.c"
 		GtkLabel* _tmp12_ = NULL;
 		const gchar* _tmp13_ = NULL;
 		GtkEntry* _tmp14_ = NULL;
 		GtkEntry* _tmp15_ = NULL;
-#line 2585 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2601 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp12_ = self->priv->dir_pattern_example;
-#line 2585 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2601 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp13_ = _ ("Invalid pattern");
-#line 2585 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2601 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_label_set_text (_tmp12_, _tmp13_);
-#line 2586 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2602 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp14_ = self->priv->dir_pattern_entry;
-#line 2586 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2602 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_entry_set_icon_from_icon_name (_tmp14_, GTK_ENTRY_ICON_SECONDARY, "dialog-error");
-#line 2587 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2603 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp15_ = self->priv->dir_pattern_entry;
-#line 2587 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2603 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_entry_set_icon_activatable (_tmp15_, GTK_ENTRY_ICON_SECONDARY, FALSE);
-#line 2588 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2604 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		preferences_dialog_set_allow_closing (self, FALSE);
-#line 20027 "Dialogs.c"
+#line 20155 "Dialogs.c"
 	} else {
 		GtkLabel* _tmp16_ = NULL;
 		const gchar* _tmp17_ = NULL;
 		GtkEntry* _tmp18_ = NULL;
-#line 2591 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2607 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp16_ = self->priv->dir_pattern_example;
-#line 2591 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2607 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp17_ = example;
-#line 2591 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2607 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_label_set_text (_tmp16_, _tmp17_);
-#line 2592 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2608 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp18_ = self->priv->dir_pattern_entry;
-#line 2592 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2608 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_entry_set_icon_from_icon_name (_tmp18_, GTK_ENTRY_ICON_SECONDARY, NULL);
-#line 2593 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2609 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		preferences_dialog_set_allow_closing (self, TRUE);
-#line 20044 "Dialogs.c"
+#line 20172 "Dialogs.c"
 	}
-#line 2581 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2597 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (example);
-#line 20048 "Dialogs.c"
+#line 20176 "Dialogs.c"
 }
 
 
@@ -20069,34 +20197,34 @@ static void preferences_dialog_set_allow_closing (PreferencesDialog* self, gbool
 	GtkDialog* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
 	gboolean _tmp2_ = FALSE;
-#line 2597 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2613 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_PREFERENCES_DIALOG (self));
-#line 2598 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2614 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = self->priv->dialog;
-#line 2598 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2614 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = allow;
-#line 2598 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2614 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_window_set_deletable (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_window_get_type (), GtkWindow), _tmp1_);
-#line 2599 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2615 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = allow;
-#line 2599 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2615 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->allow_closing = _tmp2_;
-#line 20068 "Dialogs.c"
+#line 20196 "Dialogs.c"
 }
 
 
 static gboolean preferences_dialog_get_allow_closing (PreferencesDialog* self) {
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
-#line 2602 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2618 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (IS_PREFERENCES_DIALOG (self), FALSE);
-#line 2603 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2619 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = self->priv->allow_closing;
-#line 2603 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2619 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	result = _tmp0_;
-#line 2603 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2619 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 20083 "Dialogs.c"
+#line 20211 "Dialogs.c"
 }
 
 
@@ -20105,21 +20233,21 @@ static void preferences_dialog_set_background_color (PreferencesDialog* self, gd
 	ConfigFacade* _tmp1_ = NULL;
 	gdouble _tmp2_ = 0.0;
 	GdkRGBA _tmp3_ = {0};
-#line 2606 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2622 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_PREFERENCES_DIALOG (self));
-#line 2607 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2623 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = config_facade_get_instance ();
-#line 2607 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2623 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = _tmp0_;
-#line 2607 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2623 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = bg_color_value;
-#line 2607 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2623 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	preferences_dialog_to_grayscale (self, _tmp2_, &_tmp3_);
-#line 2607 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2623 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	config_facade_set_bg_color (_tmp1_, &_tmp3_);
-#line 2607 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2623 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (_tmp1_);
-#line 20106 "Dialogs.c"
+#line 20234 "Dialogs.c"
 }
 
 
@@ -20128,29 +20256,29 @@ static void preferences_dialog_to_grayscale (PreferencesDialog* self, gdouble co
 	gdouble _tmp0_ = 0.0;
 	gdouble _tmp1_ = 0.0;
 	gdouble _tmp2_ = 0.0;
-#line 2610 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2626 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_PREFERENCES_DIALOG (self));
-#line 2611 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2627 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	memset (&color, 0, sizeof (GdkRGBA));
-#line 2613 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2629 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = color_value;
-#line 2613 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2629 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	color.red = _tmp0_;
-#line 2614 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2630 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = color_value;
-#line 2614 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2630 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	color.green = _tmp1_;
-#line 2615 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2631 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = color_value;
-#line 2615 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2631 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	color.blue = _tmp2_;
-#line 2616 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2632 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	color.alpha = 1.0;
-#line 2618 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2634 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	*result = color;
-#line 2618 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2634 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return;
-#line 20137 "Dialogs.c"
+#line 20265 "Dialogs.c"
 }
 
 
@@ -20171,77 +20299,77 @@ static void preferences_dialog_on_photo_editor_changed (PreferencesDialog* self)
 	gchar* _tmp16_ = NULL;
 	gchar* _tmp17_ = NULL;
 	gchar* _tmp18_ = NULL;
-#line 2621 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2637 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_PREFERENCES_DIALOG (self));
-#line 2622 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2638 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = self->priv->photo_editor_combo;
-#line 2622 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2638 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = gtk_combo_box_get_active (_tmp1_);
-#line 2622 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2638 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = self->priv->external_photo_apps;
-#line 2622 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2638 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp4_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 2622 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2638 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp5_ = _tmp4_;
-#line 2622 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2638 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp2_ < _tmp5_) {
-#line 20172 "Dialogs.c"
+#line 20300 "Dialogs.c"
 		GtkComboBox* _tmp6_ = NULL;
 		gint _tmp7_ = 0;
-#line 2623 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2639 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp6_ = self->priv->photo_editor_combo;
-#line 2623 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2639 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp7_ = gtk_combo_box_get_active (_tmp6_);
-#line 2623 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2639 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp0_ = _tmp7_;
-#line 20181 "Dialogs.c"
+#line 20309 "Dialogs.c"
 	} else {
 		SortedList* _tmp8_ = NULL;
 		gint _tmp9_ = 0;
 		gint _tmp10_ = 0;
-#line 2623 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2639 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp8_ = self->priv->external_photo_apps;
-#line 2623 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2639 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp9_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 2623 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2639 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp10_ = _tmp9_;
-#line 2623 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2639 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp0_ = _tmp10_;
-#line 20194 "Dialogs.c"
+#line 20322 "Dialogs.c"
 	}
-#line 2622 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2638 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	photo_app_choice_index = _tmp0_;
-#line 2625 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2641 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp11_ = self->priv->external_photo_apps;
-#line 2625 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2641 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp12_ = sorted_list_get_at (_tmp11_, photo_app_choice_index);
-#line 2625 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2641 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	app = (GAppInfo*) _tmp12_;
-#line 2627 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2643 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp13_ = config_facade_get_instance ();
-#line 2627 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2643 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp14_ = _tmp13_;
-#line 2627 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2643 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp15_ = desktop_integration_get_app_open_command (app);
-#line 2627 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2643 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp16_ = _tmp15_;
-#line 2627 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2643 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	configuration_facade_set_external_photo_app (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp16_);
-#line 2627 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2643 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (_tmp16_);
-#line 2627 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2643 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (_tmp14_);
-#line 2629 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2645 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp17_ = desktop_integration_get_app_open_command (app);
-#line 2629 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2645 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp18_ = _tmp17_;
-#line 2629 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_debug ("Dialogs.vala:2629: setting external photo editor to: %s", _tmp18_);
-#line 2629 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2645 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	g_debug ("Dialogs.vala:2645: setting external photo editor to: %s", _tmp18_);
+#line 2645 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (_tmp18_);
-#line 2621 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2637 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (app);
-#line 20228 "Dialogs.c"
+#line 20356 "Dialogs.c"
 }
 
 
@@ -20260,69 +20388,69 @@ static void preferences_dialog_on_raw_editor_changed (PreferencesDialog* self) {
 	ConfigFacade* _tmp14_ = NULL;
 	const gchar* _tmp15_ = NULL;
 	const gchar* _tmp16_ = NULL;
-#line 2632 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2648 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_PREFERENCES_DIALOG (self));
-#line 2633 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2649 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = self->priv->raw_editor_combo;
-#line 2633 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2649 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = gtk_combo_box_get_active (_tmp1_);
-#line 2633 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2649 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = self->priv->external_raw_apps;
-#line 2633 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2649 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp4_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 2633 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2649 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp5_ = _tmp4_;
-#line 2633 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2649 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp2_ < _tmp5_) {
-#line 20261 "Dialogs.c"
+#line 20389 "Dialogs.c"
 		GtkComboBox* _tmp6_ = NULL;
 		gint _tmp7_ = 0;
-#line 2634 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2650 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp6_ = self->priv->raw_editor_combo;
-#line 2634 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2650 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp7_ = gtk_combo_box_get_active (_tmp6_);
-#line 2634 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2650 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp0_ = _tmp7_;
-#line 20270 "Dialogs.c"
+#line 20398 "Dialogs.c"
 	} else {
 		SortedList* _tmp8_ = NULL;
 		gint _tmp9_ = 0;
 		gint _tmp10_ = 0;
-#line 2634 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2650 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp8_ = self->priv->external_raw_apps;
-#line 2634 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2650 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp9_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 2634 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2650 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp10_ = _tmp9_;
-#line 2634 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2650 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp0_ = _tmp10_;
-#line 20283 "Dialogs.c"
+#line 20411 "Dialogs.c"
 	}
-#line 2633 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2649 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	raw_app_choice_index = _tmp0_;
-#line 2636 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2652 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp11_ = self->priv->external_raw_apps;
-#line 2636 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2652 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp12_ = sorted_list_get_at (_tmp11_, raw_app_choice_index);
-#line 2636 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2652 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	app = (GAppInfo*) _tmp12_;
-#line 2638 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2654 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp13_ = config_facade_get_instance ();
-#line 2638 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2654 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp14_ = _tmp13_;
-#line 2638 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2654 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp15_ = g_app_info_get_commandline (app);
-#line 2638 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2654 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	configuration_facade_set_external_raw_app (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp15_);
-#line 2638 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2654 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (_tmp14_);
-#line 2640 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2656 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp16_ = g_app_info_get_commandline (app);
-#line 2640 "/home/jens/Source/shotwell/src/Dialogs.vala"
-	g_debug ("Dialogs.vala:2640: setting external raw editor to: %s", _tmp16_);
-#line 2632 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2656 "/home/jens/Source/shotwell/src/Dialogs.vala"
+	g_debug ("Dialogs.vala:2656: setting external raw editor to: %s", _tmp16_);
+#line 2648 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (app);
-#line 20309 "Dialogs.c"
+#line 20437 "Dialogs.c"
 }
 
 
@@ -20330,50 +20458,50 @@ static RawDeveloper preferences_dialog_raw_developer_from_combo (PreferencesDial
 	RawDeveloper result = 0;
 	GtkComboBoxText* _tmp0_ = NULL;
 	gint _tmp1_ = 0;
-#line 2643 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2659 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (IS_PREFERENCES_DIALOG (self), 0);
-#line 2644 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2660 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = self->priv->default_raw_developer_combo;
-#line 2644 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2660 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_combo_box_get_type (), GtkComboBox));
-#line 2644 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2660 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp1_ == 0) {
-#line 2645 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2661 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		result = RAW_DEVELOPER_CAMERA;
-#line 2645 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2661 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		return result;
-#line 20329 "Dialogs.c"
+#line 20457 "Dialogs.c"
 	}
-#line 2646 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2662 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	result = RAW_DEVELOPER_SHOTWELL;
-#line 2646 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2662 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 20335 "Dialogs.c"
+#line 20463 "Dialogs.c"
 }
 
 
 static void preferences_dialog_set_raw_developer_combo (PreferencesDialog* self, RawDeveloper d) {
 	RawDeveloper _tmp0_ = 0;
-#line 2649 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2665 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_PREFERENCES_DIALOG (self));
-#line 2650 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2666 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = d;
-#line 2650 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2666 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp0_ == RAW_DEVELOPER_CAMERA) {
-#line 20347 "Dialogs.c"
+#line 20475 "Dialogs.c"
 		GtkComboBoxText* _tmp1_ = NULL;
-#line 2651 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2667 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp1_ = self->priv->default_raw_developer_combo;
-#line 2651 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2667 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_combo_box_get_type (), GtkComboBox), 0);
-#line 20353 "Dialogs.c"
+#line 20481 "Dialogs.c"
 	} else {
 		GtkComboBoxText* _tmp2_ = NULL;
-#line 2653 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2669 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp2_ = self->priv->default_raw_developer_combo;
-#line 2653 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2669 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_combo_box_get_type (), GtkComboBox), 1);
-#line 20360 "Dialogs.c"
+#line 20488 "Dialogs.c"
 	}
 }
 
@@ -20382,60 +20510,60 @@ static void preferences_dialog_on_default_raw_developer_changed (PreferencesDial
 	ConfigFacade* _tmp0_ = NULL;
 	ConfigFacade* _tmp1_ = NULL;
 	RawDeveloper _tmp2_ = 0;
-#line 2656 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2672 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_PREFERENCES_DIALOG (self));
-#line 2657 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2673 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = config_facade_get_instance ();
-#line 2657 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2673 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = _tmp0_;
-#line 2657 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2673 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = preferences_dialog_raw_developer_from_combo (self);
-#line 2657 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2673 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	configuration_facade_set_default_raw_developer (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp2_);
-#line 2657 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2673 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (_tmp1_);
-#line 20381 "Dialogs.c"
+#line 20509 "Dialogs.c"
 }
 
 
 static void preferences_dialog_on_current_folder_changed (PreferencesDialog* self) {
 	GtkFileChooserButton* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
-#line 2660 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2676 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_PREFERENCES_DIALOG (self));
-#line 2661 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2677 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = self->priv->library_dir_button;
-#line 2661 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2677 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = gtk_file_chooser_get_filename (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser));
-#line 2661 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2677 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (self->priv->lib_dir);
-#line 2661 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2677 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->lib_dir = _tmp1_;
-#line 20398 "Dialogs.c"
+#line 20526 "Dialogs.c"
 }
 
 
 static void _preferences_dialog_on_current_folder_changed_gtk_file_chooser_current_folder_changed (GtkFileChooser* _sender, gpointer self) {
-#line 2669 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2685 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	preferences_dialog_on_current_folder_changed ((PreferencesDialog*) self);
-#line 20405 "Dialogs.c"
+#line 20533 "Dialogs.c"
 }
 
 
 static gboolean preferences_dialog_map_event (PreferencesDialog* self) {
 	gboolean result = FALSE;
 	GtkFileChooserButton* _tmp0_ = NULL;
-#line 2664 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2680 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (IS_PREFERENCES_DIALOG (self), FALSE);
-#line 2669 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2685 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = self->priv->library_dir_button;
-#line 2669 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2685 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser), "current-folder-changed", (GCallback) _preferences_dialog_on_current_folder_changed_gtk_file_chooser_current_folder_changed, self);
-#line 2670 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2686 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	result = TRUE;
-#line 2670 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2686 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 20422 "Dialogs.c"
+#line 20550 "Dialogs.c"
 }
 
 
@@ -20447,31 +20575,31 @@ static void preferences_dialog_add_to_dir_formats (PreferencesDialog* self, cons
 	GeeArrayList* _tmp3_ = NULL;
 	GtkComboBoxText* _tmp4_ = NULL;
 	const gchar* _tmp5_ = NULL;
-#line 2673 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2689 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_PREFERENCES_DIALOG (self));
-#line 2673 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2689 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (name != NULL);
-#line 2674 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2690 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = name;
-#line 2674 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2690 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = pattern;
-#line 2674 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2690 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = preferences_dialog_path_format_new (_tmp0_, _tmp1_);
-#line 2674 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2690 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	pf = _tmp2_;
-#line 2675 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2691 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = self->priv->path_formats;
-#line 2675 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2691 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), pf);
-#line 2676 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2692 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp4_ = self->priv->dir_pattern_combo;
-#line 2676 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2692 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp5_ = name;
-#line 2676 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2692 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_combo_box_text_append_text (_tmp4_, _tmp5_);
-#line 2673 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2689 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_preferences_dialog_path_format_unref0 (pf);
-#line 20458 "Dialogs.c"
+#line 20586 "Dialogs.c"
 }
 
 
@@ -20480,21 +20608,21 @@ static void preferences_dialog_on_lowercase_toggled (PreferencesDialog* self) {
 	ConfigFacade* _tmp1_ = NULL;
 	GtkCheckButton* _tmp2_ = NULL;
 	gboolean _tmp3_ = FALSE;
-#line 2679 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2695 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (IS_PREFERENCES_DIALOG (self));
-#line 2680 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2696 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = config_facade_get_instance ();
-#line 2680 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2696 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = _tmp0_;
-#line 2680 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2696 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = self->priv->lowercase;
-#line 2680 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2696 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_toggle_button_get_type (), GtkToggleButton));
-#line 2680 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2696 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	configuration_facade_set_use_lowercase_filenames (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp3_);
-#line 2680 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2696 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (_tmp1_);
-#line 20481 "Dialogs.c"
+#line 20609 "Dialogs.c"
 }
 
 
@@ -20504,246 +20632,246 @@ static PreferencesDialogPathFormat* preferences_dialog_path_format_construct (GT
 	gchar* _tmp1_ = NULL;
 	const gchar* _tmp2_ = NULL;
 	gchar* _tmp3_ = NULL;
-#line 2258 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2274 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (name != NULL, NULL);
-#line 2258 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2274 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self = (PreferencesDialogPathFormat*) g_type_create_instance (object_type);
-#line 2259 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2275 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = name;
-#line 2259 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2275 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 2259 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2275 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (self->name);
-#line 2259 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2275 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->name = _tmp1_;
-#line 2260 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2276 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = pattern;
-#line 2260 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2276 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = g_strdup (_tmp2_);
-#line 2260 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2276 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (self->pattern);
-#line 2260 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2276 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->pattern = _tmp3_;
-#line 2258 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2274 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return self;
-#line 20513 "Dialogs.c"
+#line 20641 "Dialogs.c"
 }
 
 
 static PreferencesDialogPathFormat* preferences_dialog_path_format_new (const gchar* name, const gchar* pattern) {
-#line 2258 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2274 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return preferences_dialog_path_format_construct (PREFERENCES_DIALOG_TYPE_PATH_FORMAT, name, pattern);
-#line 20520 "Dialogs.c"
+#line 20648 "Dialogs.c"
 }
 
 
 static void preferences_dialog_value_path_format_init (GValue* value) {
-#line 2257 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2273 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	value->data[0].v_pointer = NULL;
-#line 20527 "Dialogs.c"
+#line 20655 "Dialogs.c"
 }
 
 
 static void preferences_dialog_value_path_format_free_value (GValue* value) {
-#line 2257 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2273 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (value->data[0].v_pointer) {
-#line 2257 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2273 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		preferences_dialog_path_format_unref (value->data[0].v_pointer);
-#line 20536 "Dialogs.c"
+#line 20664 "Dialogs.c"
 	}
 }
 
 
 static void preferences_dialog_value_path_format_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 2257 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2273 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (src_value->data[0].v_pointer) {
-#line 2257 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2273 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		dest_value->data[0].v_pointer = preferences_dialog_path_format_ref (src_value->data[0].v_pointer);
-#line 20546 "Dialogs.c"
+#line 20674 "Dialogs.c"
 	} else {
-#line 2257 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2273 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 20550 "Dialogs.c"
+#line 20678 "Dialogs.c"
 	}
 }
 
 
 static gpointer preferences_dialog_value_path_format_peek_pointer (const GValue* value) {
-#line 2257 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2273 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return value->data[0].v_pointer;
-#line 20558 "Dialogs.c"
+#line 20686 "Dialogs.c"
 }
 
 
 static gchar* preferences_dialog_value_path_format_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 2257 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2273 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (collect_values[0].v_pointer) {
-#line 20565 "Dialogs.c"
+#line 20693 "Dialogs.c"
 		PreferencesDialogPathFormat* object;
 		object = collect_values[0].v_pointer;
-#line 2257 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2273 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (object->parent_instance.g_class == NULL) {
-#line 2257 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2273 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 20572 "Dialogs.c"
+#line 20700 "Dialogs.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 2257 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2273 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 20576 "Dialogs.c"
+#line 20704 "Dialogs.c"
 		}
-#line 2257 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2273 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		value->data[0].v_pointer = preferences_dialog_path_format_ref (object);
-#line 20580 "Dialogs.c"
+#line 20708 "Dialogs.c"
 	} else {
-#line 2257 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2273 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		value->data[0].v_pointer = NULL;
-#line 20584 "Dialogs.c"
+#line 20712 "Dialogs.c"
 	}
-#line 2257 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2273 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return NULL;
-#line 20588 "Dialogs.c"
+#line 20716 "Dialogs.c"
 }
 
 
 static gchar* preferences_dialog_value_path_format_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 	PreferencesDialogPathFormat** object_p;
 	object_p = collect_values[0].v_pointer;
-#line 2257 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2273 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (!object_p) {
-#line 2257 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2273 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 20599 "Dialogs.c"
+#line 20727 "Dialogs.c"
 	}
-#line 2257 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2273 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (!value->data[0].v_pointer) {
-#line 2257 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2273 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		*object_p = NULL;
-#line 20605 "Dialogs.c"
+#line 20733 "Dialogs.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 2257 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2273 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		*object_p = value->data[0].v_pointer;
-#line 20609 "Dialogs.c"
+#line 20737 "Dialogs.c"
 	} else {
-#line 2257 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2273 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		*object_p = preferences_dialog_path_format_ref (value->data[0].v_pointer);
-#line 20613 "Dialogs.c"
+#line 20741 "Dialogs.c"
 	}
-#line 2257 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2273 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return NULL;
-#line 20617 "Dialogs.c"
+#line 20745 "Dialogs.c"
 }
 
 
 static GParamSpec* preferences_dialog_param_spec_path_format (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
 	PreferencesDialogParamSpecPathFormat* spec;
-#line 2257 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2273 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, PREFERENCES_DIALOG_TYPE_PATH_FORMAT), NULL);
-#line 2257 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2273 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 2257 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2273 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 2257 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2273 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return G_PARAM_SPEC (spec);
-#line 20631 "Dialogs.c"
+#line 20759 "Dialogs.c"
 }
 
 
 static gpointer preferences_dialog_value_get_path_format (const GValue* value) {
-#line 2257 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2273 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PREFERENCES_DIALOG_TYPE_PATH_FORMAT), NULL);
-#line 2257 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2273 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return value->data[0].v_pointer;
-#line 20640 "Dialogs.c"
+#line 20768 "Dialogs.c"
 }
 
 
 static void preferences_dialog_value_set_path_format (GValue* value, gpointer v_object) {
 	PreferencesDialogPathFormat* old;
-#line 2257 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2273 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PREFERENCES_DIALOG_TYPE_PATH_FORMAT));
-#line 2257 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2273 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	old = value->data[0].v_pointer;
-#line 2257 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2273 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (v_object) {
-#line 2257 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2273 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, PREFERENCES_DIALOG_TYPE_PATH_FORMAT));
-#line 2257 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2273 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 2257 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2273 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		value->data[0].v_pointer = v_object;
-#line 2257 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2273 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		preferences_dialog_path_format_ref (value->data[0].v_pointer);
-#line 20660 "Dialogs.c"
+#line 20788 "Dialogs.c"
 	} else {
-#line 2257 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2273 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		value->data[0].v_pointer = NULL;
-#line 20664 "Dialogs.c"
+#line 20792 "Dialogs.c"
 	}
-#line 2257 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2273 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (old) {
-#line 2257 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2273 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		preferences_dialog_path_format_unref (old);
-#line 20670 "Dialogs.c"
+#line 20798 "Dialogs.c"
 	}
 }
 
 
 static void preferences_dialog_value_take_path_format (GValue* value, gpointer v_object) {
 	PreferencesDialogPathFormat* old;
-#line 2257 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2273 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PREFERENCES_DIALOG_TYPE_PATH_FORMAT));
-#line 2257 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2273 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	old = value->data[0].v_pointer;
-#line 2257 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2273 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (v_object) {
-#line 2257 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2273 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, PREFERENCES_DIALOG_TYPE_PATH_FORMAT));
-#line 2257 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2273 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 2257 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2273 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		value->data[0].v_pointer = v_object;
-#line 20689 "Dialogs.c"
+#line 20817 "Dialogs.c"
 	} else {
-#line 2257 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2273 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		value->data[0].v_pointer = NULL;
-#line 20693 "Dialogs.c"
+#line 20821 "Dialogs.c"
 	}
-#line 2257 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2273 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (old) {
-#line 2257 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2273 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		preferences_dialog_path_format_unref (old);
-#line 20699 "Dialogs.c"
+#line 20827 "Dialogs.c"
 	}
 }
 
 
 static void preferences_dialog_path_format_class_init (PreferencesDialogPathFormatClass * klass) {
-#line 2257 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2273 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	preferences_dialog_path_format_parent_class = g_type_class_peek_parent (klass);
-#line 2257 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2273 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	((PreferencesDialogPathFormatClass *) klass)->finalize = preferences_dialog_path_format_finalize;
-#line 20709 "Dialogs.c"
+#line 20837 "Dialogs.c"
 }
 
 
 static void preferences_dialog_path_format_instance_init (PreferencesDialogPathFormat * self) {
-#line 2257 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2273 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->ref_count = 1;
-#line 20716 "Dialogs.c"
+#line 20844 "Dialogs.c"
 }
 
 
 static void preferences_dialog_path_format_finalize (PreferencesDialogPathFormat* obj) {
 	PreferencesDialogPathFormat * self;
-#line 2257 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2273 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PREFERENCES_DIALOG_TYPE_PATH_FORMAT, PreferencesDialogPathFormat);
-#line 2257 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2273 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_signal_handlers_destroy (self);
-#line 2262 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2278 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (self->name);
-#line 2263 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2279 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (self->pattern);
-#line 20730 "Dialogs.c"
+#line 20858 "Dialogs.c"
 }
 
 
@@ -20764,216 +20892,216 @@ static GType preferences_dialog_path_format_get_type (void) {
 static gpointer preferences_dialog_path_format_ref (gpointer instance) {
 	PreferencesDialogPathFormat* self;
 	self = instance;
-#line 2257 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2273 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_atomic_int_inc (&self->ref_count);
-#line 2257 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2273 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return instance;
-#line 20755 "Dialogs.c"
+#line 20883 "Dialogs.c"
 }
 
 
 static void preferences_dialog_path_format_unref (gpointer instance) {
 	PreferencesDialogPathFormat* self;
 	self = instance;
-#line 2257 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2273 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 2257 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2273 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		PREFERENCES_DIALOG_PATH_FORMAT_GET_CLASS (self)->finalize (self);
-#line 2257 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2273 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 20768 "Dialogs.c"
+#line 20896 "Dialogs.c"
 	}
 }
 
 
 static void value_preferences_dialog_init (GValue* value) {
-#line 2256 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2272 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	value->data[0].v_pointer = NULL;
-#line 20776 "Dialogs.c"
+#line 20904 "Dialogs.c"
 }
 
 
 static void value_preferences_dialog_free_value (GValue* value) {
-#line 2256 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2272 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (value->data[0].v_pointer) {
-#line 2256 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2272 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		preferences_dialog_unref (value->data[0].v_pointer);
-#line 20785 "Dialogs.c"
+#line 20913 "Dialogs.c"
 	}
 }
 
 
 static void value_preferences_dialog_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 2256 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2272 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (src_value->data[0].v_pointer) {
-#line 2256 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2272 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		dest_value->data[0].v_pointer = preferences_dialog_ref (src_value->data[0].v_pointer);
-#line 20795 "Dialogs.c"
+#line 20923 "Dialogs.c"
 	} else {
-#line 2256 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2272 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 20799 "Dialogs.c"
+#line 20927 "Dialogs.c"
 	}
 }
 
 
 static gpointer value_preferences_dialog_peek_pointer (const GValue* value) {
-#line 2256 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2272 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return value->data[0].v_pointer;
-#line 20807 "Dialogs.c"
+#line 20935 "Dialogs.c"
 }
 
 
 static gchar* value_preferences_dialog_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 2256 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2272 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (collect_values[0].v_pointer) {
-#line 20814 "Dialogs.c"
+#line 20942 "Dialogs.c"
 		PreferencesDialog* object;
 		object = collect_values[0].v_pointer;
-#line 2256 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2272 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (object->parent_instance.g_class == NULL) {
-#line 2256 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2272 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 20821 "Dialogs.c"
+#line 20949 "Dialogs.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 2256 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2272 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 20825 "Dialogs.c"
+#line 20953 "Dialogs.c"
 		}
-#line 2256 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2272 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		value->data[0].v_pointer = preferences_dialog_ref (object);
-#line 20829 "Dialogs.c"
+#line 20957 "Dialogs.c"
 	} else {
-#line 2256 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2272 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		value->data[0].v_pointer = NULL;
-#line 20833 "Dialogs.c"
+#line 20961 "Dialogs.c"
 	}
-#line 2256 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2272 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return NULL;
-#line 20837 "Dialogs.c"
+#line 20965 "Dialogs.c"
 }
 
 
 static gchar* value_preferences_dialog_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 	PreferencesDialog** object_p;
 	object_p = collect_values[0].v_pointer;
-#line 2256 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2272 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (!object_p) {
-#line 2256 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2272 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 20848 "Dialogs.c"
+#line 20976 "Dialogs.c"
 	}
-#line 2256 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2272 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (!value->data[0].v_pointer) {
-#line 2256 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2272 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		*object_p = NULL;
-#line 20854 "Dialogs.c"
+#line 20982 "Dialogs.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 2256 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2272 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		*object_p = value->data[0].v_pointer;
-#line 20858 "Dialogs.c"
+#line 20986 "Dialogs.c"
 	} else {
-#line 2256 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2272 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		*object_p = preferences_dialog_ref (value->data[0].v_pointer);
-#line 20862 "Dialogs.c"
+#line 20990 "Dialogs.c"
 	}
-#line 2256 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2272 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return NULL;
-#line 20866 "Dialogs.c"
+#line 20994 "Dialogs.c"
 }
 
 
 GParamSpec* param_spec_preferences_dialog (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
 	ParamSpecPreferencesDialog* spec;
-#line 2256 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2272 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, TYPE_PREFERENCES_DIALOG), NULL);
-#line 2256 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2272 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 2256 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2272 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 2256 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2272 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return G_PARAM_SPEC (spec);
-#line 20880 "Dialogs.c"
+#line 21008 "Dialogs.c"
 }
 
 
 gpointer value_get_preferences_dialog (const GValue* value) {
-#line 2256 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2272 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PREFERENCES_DIALOG), NULL);
-#line 2256 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2272 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return value->data[0].v_pointer;
-#line 20889 "Dialogs.c"
+#line 21017 "Dialogs.c"
 }
 
 
 void value_set_preferences_dialog (GValue* value, gpointer v_object) {
 	PreferencesDialog* old;
-#line 2256 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2272 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PREFERENCES_DIALOG));
-#line 2256 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2272 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	old = value->data[0].v_pointer;
-#line 2256 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2272 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (v_object) {
-#line 2256 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2272 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_PREFERENCES_DIALOG));
-#line 2256 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2272 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 2256 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2272 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		value->data[0].v_pointer = v_object;
-#line 2256 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2272 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		preferences_dialog_ref (value->data[0].v_pointer);
-#line 20909 "Dialogs.c"
+#line 21037 "Dialogs.c"
 	} else {
-#line 2256 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2272 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		value->data[0].v_pointer = NULL;
-#line 20913 "Dialogs.c"
+#line 21041 "Dialogs.c"
 	}
-#line 2256 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2272 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (old) {
-#line 2256 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2272 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		preferences_dialog_unref (old);
-#line 20919 "Dialogs.c"
+#line 21047 "Dialogs.c"
 	}
 }
 
 
 void value_take_preferences_dialog (GValue* value, gpointer v_object) {
 	PreferencesDialog* old;
-#line 2256 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2272 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PREFERENCES_DIALOG));
-#line 2256 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2272 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	old = value->data[0].v_pointer;
-#line 2256 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2272 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (v_object) {
-#line 2256 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2272 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_PREFERENCES_DIALOG));
-#line 2256 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2272 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 2256 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2272 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		value->data[0].v_pointer = v_object;
-#line 20938 "Dialogs.c"
+#line 21066 "Dialogs.c"
 	} else {
-#line 2256 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2272 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		value->data[0].v_pointer = NULL;
-#line 20942 "Dialogs.c"
+#line 21070 "Dialogs.c"
 	}
-#line 2256 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2272 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (old) {
-#line 2256 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2272 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		preferences_dialog_unref (old);
-#line 20948 "Dialogs.c"
+#line 21076 "Dialogs.c"
 	}
 }
 
 
 static void preferences_dialog_class_init (PreferencesDialogClass * klass) {
-#line 2256 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2272 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	preferences_dialog_parent_class = g_type_class_peek_parent (klass);
-#line 2256 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2272 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	((PreferencesDialogClass *) klass)->finalize = preferences_dialog_finalize;
-#line 2256 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2272 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_type_class_add_private (klass, sizeof (PreferencesDialogPrivate));
-#line 20960 "Dialogs.c"
+#line 21088 "Dialogs.c"
 }
 
 
@@ -20981,73 +21109,73 @@ static void preferences_dialog_instance_init (PreferencesDialog * self) {
 	GeeArrayList* _tmp0_ = NULL;
 	GDateTime* _tmp1_ = NULL;
 	PluginsManifestWidgetMediator* _tmp2_ = NULL;
-#line 2256 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2272 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv = PREFERENCES_DIALOG_GET_PRIVATE (self);
-#line 2280 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2296 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->allow_closing = FALSE;
-#line 2281 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2297 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->lib_dir = NULL;
-#line 2282 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2298 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = gee_array_list_new (PREFERENCES_DIALOG_TYPE_PATH_FORMAT, (GBoxedCopyFunc) preferences_dialog_path_format_ref, preferences_dialog_path_format_unref, NULL, NULL, NULL);
-#line 2282 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2298 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->path_formats = _tmp0_;
-#line 2283 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2299 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = g_date_time_new_local (2009, 3, 10, 18, 16, (gdouble) 11);
-#line 2283 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2299 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->example_date = _tmp1_;
-#line 2285 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2301 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = plugins_manifest_widget_mediator_new ();
-#line 2285 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2301 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->priv->plugins_mediator = _tmp2_;
-#line 2256 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2272 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self->ref_count = 1;
-#line 20988 "Dialogs.c"
+#line 21116 "Dialogs.c"
 }
 
 
 static void preferences_dialog_finalize (PreferencesDialog* obj) {
 	PreferencesDialog * self;
-#line 2256 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2272 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PREFERENCES_DIALOG, PreferencesDialog);
-#line 2256 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2272 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_signal_handlers_destroy (self);
-#line 2268 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2284 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->dialog);
-#line 2269 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2285 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->builder);
-#line 2270 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2286 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->bg_color_adjustment);
-#line 2271 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2287 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->bg_color_slider);
-#line 2272 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2288 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->photo_editor_combo);
-#line 2273 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2289 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->raw_editor_combo);
-#line 2274 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2290 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->external_raw_apps);
-#line 2275 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2291 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->external_photo_apps);
-#line 2276 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2292 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->library_dir_button);
-#line 2277 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2293 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->dir_pattern_combo);
-#line 2278 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2294 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->dir_pattern_entry);
-#line 2279 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2295 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->dir_pattern_example);
-#line 2281 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2297 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (self->priv->lib_dir);
-#line 2282 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2298 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->path_formats);
-#line 2283 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2299 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_date_time_unref0 (self->priv->example_date);
-#line 2284 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2300 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->lowercase);
-#line 2285 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2301 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_plugins_manifest_widget_mediator_unref0 (self->priv->plugins_mediator);
-#line 2286 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2302 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (self->priv->default_raw_developer_combo);
-#line 21034 "Dialogs.c"
+#line 21162 "Dialogs.c"
 }
 
 
@@ -21068,24 +21196,24 @@ GType preferences_dialog_get_type (void) {
 gpointer preferences_dialog_ref (gpointer instance) {
 	PreferencesDialog* self;
 	self = instance;
-#line 2256 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2272 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_atomic_int_inc (&self->ref_count);
-#line 2256 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2272 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return instance;
-#line 21059 "Dialogs.c"
+#line 21187 "Dialogs.c"
 }
 
 
 void preferences_dialog_unref (gpointer instance) {
 	PreferencesDialog* self;
 	self = instance;
-#line 2256 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2272 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 2256 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2272 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		PREFERENCES_DIALOG_GET_CLASS (self)->finalize (self);
-#line 2256 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2272 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 21072 "Dialogs.c"
+#line 21200 "Dialogs.c"
 	}
 }
 
@@ -21105,54 +21233,54 @@ GtkResponseType copy_files_dialog (void) {
 	const gchar* _tmp8_ = NULL;
 	GtkResponseType _result_ = 0;
 	gint _tmp9_ = 0;
-#line 2687 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2703 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = _ ("Shotwell can copy the photos into your library folder or it can import" \
 " them without copying.");
-#line 2687 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2703 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 2687 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2703 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	msg = _tmp1_;
-#line 2689 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2705 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = app_window_get_instance ();
-#line 2689 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2705 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = _tmp2_;
-#line 2689 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2705 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp4_ = (GtkMessageDialog*) gtk_message_dialog_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_window_get_type (), GtkWindow), GTK_DIALOG_MODAL, GTK_MESSAGE_QUESTION, GTK_BUTTONS_CANCEL, "%s", msg);
-#line 2689 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2705 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_object_ref_sink (_tmp4_);
-#line 2689 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2705 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp5_ = _tmp4_;
-#line 2689 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2705 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (_tmp3_);
-#line 2689 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2705 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	dialog = _tmp5_;
-#line 2692 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2708 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp6_ = _ ("Co_py Photos");
-#line 2692 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2708 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_dialog_add_button (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_dialog_get_type (), GtkDialog), _tmp6_, (gint) GTK_RESPONSE_ACCEPT);
-#line 2693 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2709 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp7_ = _ ("_Import in Place");
-#line 2693 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2709 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_dialog_add_button (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_dialog_get_type (), GtkDialog), _tmp7_, (gint) GTK_RESPONSE_REJECT);
-#line 2694 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2710 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp8_ = _ ("Import to Library");
-#line 2694 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2710 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_window_set_title (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_window_get_type (), GtkWindow), _tmp8_);
-#line 2696 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2712 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp9_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_dialog_get_type (), GtkDialog));
-#line 2696 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2712 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_result_ = (GtkResponseType) _tmp9_;
-#line 2698 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2714 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_widget_get_type (), GtkWidget));
-#line 2700 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2716 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	result = _result_;
-#line 2700 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2716 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (dialog);
-#line 2700 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2716 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (msg);
-#line 2700 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2716 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 21138 "Dialogs.c"
+#line 21266 "Dialogs.c"
 }
 
 
@@ -21163,47 +21291,47 @@ void remove_photos_from_library (GeeCollection* photos) {
 	gint _tmp3_ = 0;
 	GeeCollection* _tmp6_ = NULL;
 	const gchar* _tmp7_ = NULL;
-#line 2703 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2719 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (GEE_IS_COLLECTION (photos));
-#line 2705 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2721 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = photos;
-#line 2705 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2721 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = gee_collection_get_size (_tmp1_);
-#line 2705 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2721 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = _tmp2_;
-#line 2705 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2721 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp3_ == 1) {
-#line 21159 "Dialogs.c"
+#line 21287 "Dialogs.c"
 		const gchar* _tmp4_ = NULL;
-#line 2705 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2721 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp4_ = _ ("Removing Photo From Library");
-#line 2705 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2721 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp0_ = _tmp4_;
-#line 21165 "Dialogs.c"
+#line 21293 "Dialogs.c"
 	} else {
 		const gchar* _tmp5_ = NULL;
-#line 2705 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2721 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp5_ = _ ("Removing Photos From Library");
-#line 2705 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2721 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp0_ = _tmp5_;
-#line 21172 "Dialogs.c"
+#line 21300 "Dialogs.c"
 	}
-#line 2704 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2720 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp6_ = photos;
-#line 2704 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2720 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp7_ = _ ("Remove From Library");
-#line 2704 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2720 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	remove_from_app (_tmp6_, _tmp7_, _tmp0_);
-#line 21180 "Dialogs.c"
+#line 21308 "Dialogs.c"
 }
 
 
 static gboolean _progress_dialog_monitor_progress_monitor (guint64 current, guint64 total, gboolean do_event_loop, gpointer self) {
 	gboolean result;
 	result = progress_dialog_monitor ((ProgressDialog*) self, current, total, do_event_loop);
-#line 2745 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2761 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	return result;
-#line 21189 "Dialogs.c"
+#line 21317 "Dialogs.c"
 }
 
 
@@ -21274,71 +21402,71 @@ void remove_from_app (GeeCollection* sources, const gchar* dialog_title, const g
 	ProgressDialog* _tmp122_ = NULL;
 	AppWindow* _tmp124_ = NULL;
 	AppWindow* _tmp125_ = NULL;
-#line 2708 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2724 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (GEE_IS_COLLECTION (sources));
-#line 2708 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2724 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (dialog_title != NULL);
-#line 2708 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2724 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	g_return_if_fail (progress_dialog_text != NULL);
-#line 2710 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2726 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp0_ = sources;
-#line 2710 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2726 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp1_ = gee_collection_get_size (_tmp0_);
-#line 2710 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2726 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp2_ = _tmp1_;
-#line 2710 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2726 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp2_ == 0) {
-#line 2711 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2727 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		return;
-#line 21276 "Dialogs.c"
+#line 21404 "Dialogs.c"
 	}
-#line 2713 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2729 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp3_ = gee_array_list_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
-#line 2713 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2729 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	photos = _tmp3_;
-#line 2714 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2730 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp4_ = gee_array_list_new (TYPE_VIDEO, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
-#line 2714 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2730 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	videos = _tmp4_;
-#line 2715 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2731 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp5_ = sources;
-#line 2715 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2731 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp6_ = photos;
-#line 2715 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2731 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp7_ = videos;
-#line 2715 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2731 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	media_source_collection_filter_media (_tmp5_, G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 2717 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2733 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	user_message = NULL;
-#line 2718 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2734 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp9_ = photos;
-#line 2718 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2734 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp10_ = gee_collection_get_is_empty (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 2718 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2734 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp11_ = _tmp10_;
-#line 2718 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2734 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (!_tmp11_) {
-#line 21304 "Dialogs.c"
+#line 21432 "Dialogs.c"
 		GeeArrayList* _tmp12_ = NULL;
 		gboolean _tmp13_ = FALSE;
 		gboolean _tmp14_ = FALSE;
-#line 2718 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2734 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp12_ = videos;
-#line 2718 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2734 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp13_ = gee_collection_get_is_empty (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 2718 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2734 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp14_ = _tmp13_;
-#line 2718 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2734 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp8_ = !_tmp14_;
-#line 21316 "Dialogs.c"
+#line 21444 "Dialogs.c"
 	} else {
-#line 2718 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2734 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp8_ = FALSE;
-#line 21320 "Dialogs.c"
+#line 21448 "Dialogs.c"
 	}
-#line 2718 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2734 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp8_) {
-#line 21324 "Dialogs.c"
+#line 21452 "Dialogs.c"
 		GeeCollection* _tmp15_ = NULL;
 		gint _tmp16_ = 0;
 		gint _tmp17_ = 0;
@@ -21347,46 +21475,46 @@ void remove_from_app (GeeCollection* sources, const gchar* dialog_title, const g
 		gint _tmp20_ = 0;
 		gint _tmp21_ = 0;
 		gchar* _tmp22_ = NULL;
-#line 2719 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2735 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp15_ = sources;
-#line 2719 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2735 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp16_ = gee_collection_get_size (_tmp15_);
-#line 2719 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2735 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp17_ = _tmp16_;
-#line 2719 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp18_ = ngettext ("This will remove the photo/video from your Shotwell library.  Would yo" \
-"u also like to move the file to your desktop trash?\n" \
+#line 2735 "/home/jens/Source/shotwell/src/Dialogs.vala"
+		_tmp18_ = ngettext ("This will remove the photo/video from your Shotwell library. Would you" \
+" also like to move the file to your desktop trash?\n" \
 "\n" \
-"This action cannot be undone.", "This will remove %d photos/videos from your Shotwell library.  Would y" \
-"ou also like to move the files to your desktop trash?\n" \
+"This action cannot be undone.", "This will remove %d photos/videos from your Shotwell library. Would yo" \
+"u also like to move the files to your desktop trash?\n" \
 "\n" \
 "This action cannot be undone.", (gulong) _tmp17_);
-#line 2719 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2735 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp19_ = sources;
-#line 2719 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2735 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp20_ = gee_collection_get_size (_tmp19_);
-#line 2719 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2735 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp21_ = _tmp20_;
-#line 2719 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2735 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp22_ = g_strdup_printf (_tmp18_, _tmp21_);
-#line 2719 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2735 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (user_message);
-#line 2719 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2735 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		user_message = _tmp22_;
-#line 21353 "Dialogs.c"
+#line 21481 "Dialogs.c"
 	} else {
 		GeeArrayList* _tmp23_ = NULL;
 		gboolean _tmp24_ = FALSE;
 		gboolean _tmp25_ = FALSE;
-#line 2722 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2738 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp23_ = videos;
-#line 2722 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2738 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp24_ = gee_collection_get_is_empty (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 2722 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2738 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp25_ = _tmp24_;
-#line 2722 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2738 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (!_tmp25_) {
-#line 21366 "Dialogs.c"
+#line 21494 "Dialogs.c"
 			GeeCollection* _tmp26_ = NULL;
 			gint _tmp27_ = 0;
 			gint _tmp28_ = 0;
@@ -21395,33 +21523,33 @@ void remove_from_app (GeeCollection* sources, const gchar* dialog_title, const g
 			gint _tmp31_ = 0;
 			gint _tmp32_ = 0;
 			gchar* _tmp33_ = NULL;
-#line 2723 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2739 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp26_ = sources;
-#line 2723 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2739 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp27_ = gee_collection_get_size (_tmp26_);
-#line 2723 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2739 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp28_ = _tmp27_;
-#line 2723 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp29_ = ngettext ("This will remove the video from your Shotwell library.  Would you also" \
-" like to move the file to your desktop trash?\n" \
+#line 2739 "/home/jens/Source/shotwell/src/Dialogs.vala"
+			_tmp29_ = ngettext ("This will remove the video from your Shotwell library. Would you also " \
+"like to move the file to your desktop trash?\n" \
 "\n" \
-"This action cannot be undone.", "This will remove %d videos from your Shotwell library.  Would you also" \
-" like to move the files to your desktop trash?\n" \
+"This action cannot be undone.", "This will remove %d videos from your Shotwell library. Would you also " \
+"like to move the files to your desktop trash?\n" \
 "\n" \
 "This action cannot be undone.", (gulong) _tmp28_);
-#line 2723 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2739 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp30_ = sources;
-#line 2723 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2739 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp31_ = gee_collection_get_size (_tmp30_);
-#line 2723 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2739 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp32_ = _tmp31_;
-#line 2723 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2739 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp33_ = g_strdup_printf (_tmp29_, _tmp32_);
-#line 2723 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2739 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_free0 (user_message);
-#line 2723 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2739 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			user_message = _tmp33_;
-#line 21395 "Dialogs.c"
+#line 21523 "Dialogs.c"
 		} else {
 			GeeCollection* _tmp34_ = NULL;
 			gint _tmp35_ = 0;
@@ -21431,222 +21559,222 @@ void remove_from_app (GeeCollection* sources, const gchar* dialog_title, const g
 			gint _tmp39_ = 0;
 			gint _tmp40_ = 0;
 			gchar* _tmp41_ = NULL;
-#line 2727 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2743 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp34_ = sources;
-#line 2727 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2743 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp35_ = gee_collection_get_size (_tmp34_);
-#line 2727 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2743 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp36_ = _tmp35_;
-#line 2727 "/home/jens/Source/shotwell/src/Dialogs.vala"
-			_tmp37_ = ngettext ("This will remove the photo from your Shotwell library.  Would you also" \
-" like to move the file to your desktop trash?\n" \
+#line 2743 "/home/jens/Source/shotwell/src/Dialogs.vala"
+			_tmp37_ = ngettext ("This will remove the photo from your Shotwell library. Would you also " \
+"like to move the file to your desktop trash?\n" \
 "\n" \
-"This action cannot be undone.", "This will remove %d photos from your Shotwell library.  Would you also" \
-" like to move the files to your desktop trash?\n" \
+"This action cannot be undone.", "This will remove %d photos from your Shotwell library. Would you also " \
+"like to move the files to your desktop trash?\n" \
 "\n" \
 "This action cannot be undone.", (gulong) _tmp36_);
-#line 2727 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2743 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp38_ = sources;
-#line 2727 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2743 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp39_ = gee_collection_get_size (_tmp38_);
-#line 2727 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2743 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp40_ = _tmp39_;
-#line 2727 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2743 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp41_ = g_strdup_printf (_tmp37_, _tmp40_);
-#line 2727 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2743 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_free0 (user_message);
-#line 2727 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2743 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			user_message = _tmp41_;
-#line 21425 "Dialogs.c"
+#line 21553 "Dialogs.c"
 		}
 	}
-#line 2732 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2748 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp42_ = app_window_get_instance ();
-#line 2732 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2748 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp43_ = _tmp42_;
-#line 2732 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2748 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp44_ = dialog_title;
-#line 2732 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2748 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp45_ = user_message;
-#line 2732 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2748 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp46_ = sources;
-#line 2732 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2748 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp47_ = gee_collection_get_size (_tmp46_);
-#line 2732 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2748 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp48_ = _tmp47_;
-#line 2732 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2748 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp49_ = remove_from_library_dialog (G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, gtk_window_get_type (), GtkWindow), _tmp44_, _tmp45_, _tmp48_);
-#line 2732 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2748 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp50_ = _tmp49_;
-#line 2732 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2748 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (_tmp43_);
-#line 2732 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2748 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_result_ = _tmp50_;
-#line 2734 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2750 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp52_ = _result_;
-#line 2734 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2750 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp52_ != GTK_RESPONSE_YES) {
-#line 21454 "Dialogs.c"
+#line 21582 "Dialogs.c"
 		GtkResponseType _tmp53_ = 0;
-#line 2734 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2750 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp53_ = _result_;
-#line 2734 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2750 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp51_ = _tmp53_ != GTK_RESPONSE_NO;
-#line 21460 "Dialogs.c"
+#line 21588 "Dialogs.c"
 	} else {
-#line 2734 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2750 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp51_ = FALSE;
-#line 21464 "Dialogs.c"
+#line 21592 "Dialogs.c"
 	}
-#line 2734 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2750 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp51_) {
-#line 2735 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2751 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (user_message);
-#line 2735 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2751 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (videos);
-#line 2735 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2751 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (photos);
-#line 2735 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2751 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		return;
-#line 21476 "Dialogs.c"
+#line 21604 "Dialogs.c"
 	}
-#line 2737 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2753 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp54_ = _result_;
-#line 2737 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2753 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	delete_backing = _tmp54_ == GTK_RESPONSE_YES;
-#line 2739 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2755 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp55_ = app_window_get_instance ();
-#line 2739 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2755 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp56_ = _tmp55_;
-#line 2739 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2755 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	page_window_set_busy_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp56_, TYPE_PAGE_WINDOW, PageWindow));
-#line 2739 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2755 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (_tmp56_);
-#line 2741 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2757 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	progress = NULL;
-#line 2742 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2758 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	monitor = NULL;
-#line 2742 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2758 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	monitor_target = NULL;
-#line 2742 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2758 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	monitor_target_destroy_notify = NULL;
-#line 2743 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2759 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp57_ = sources;
-#line 2743 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2759 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp58_ = gee_collection_get_size (_tmp57_);
-#line 2743 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2759 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp59_ = _tmp58_;
-#line 2743 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2759 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp59_ >= 20) {
-#line 21506 "Dialogs.c"
+#line 21634 "Dialogs.c"
 		AppWindow* _tmp60_ = NULL;
 		AppWindow* _tmp61_ = NULL;
 		const gchar* _tmp62_ = NULL;
 		ProgressDialog* _tmp63_ = NULL;
 		ProgressDialog* _tmp64_ = NULL;
-#line 2744 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2760 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp60_ = app_window_get_instance ();
-#line 2744 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2760 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp61_ = _tmp60_;
-#line 2744 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2760 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp62_ = progress_dialog_text;
-#line 2744 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2760 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp63_ = progress_dialog_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp61_, gtk_window_get_type (), GtkWindow), _tmp62_, NULL);
-#line 2744 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2760 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		g_object_ref_sink (_tmp63_);
-#line 2744 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2760 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (progress);
-#line 2744 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2760 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		progress = _tmp63_;
-#line 2744 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2760 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (_tmp61_);
-#line 2745 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2761 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp64_ = progress;
-#line 2745 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2761 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		(monitor_target_destroy_notify == NULL) ? NULL : (monitor_target_destroy_notify (monitor_target), NULL);
-#line 2745 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2761 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		monitor = NULL;
-#line 2745 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2761 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		monitor_target = NULL;
-#line 2745 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2761 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		monitor_target_destroy_notify = NULL;
-#line 2745 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2761 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		monitor = _progress_dialog_monitor_progress_monitor;
-#line 2745 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2761 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		monitor_target = g_object_ref (_tmp64_);
-#line 2745 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2761 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		monitor_target_destroy_notify = g_object_unref;
-#line 21544 "Dialogs.c"
+#line 21672 "Dialogs.c"
 	}
-#line 2748 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2764 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp65_ = gee_array_list_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
-#line 2748 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2764 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	not_removed_photos = _tmp65_;
-#line 2749 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2765 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp66_ = gee_array_list_new (TYPE_VIDEO, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
-#line 2749 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2765 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	not_removed_videos = _tmp66_;
-#line 2752 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2768 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp67_ = library_photo_global;
-#line 2752 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2768 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp68_ = photos;
-#line 2752 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2768 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp69_ = delete_backing;
-#line 2752 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2768 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp70_ = monitor;
-#line 2752 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2768 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp70__target = monitor_target;
-#line 2752 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2768 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp71_ = not_removed_photos;
-#line 2752 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2768 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	media_source_collection_remove_from_app (G_TYPE_CHECK_INSTANCE_CAST (_tmp67_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp68_, GEE_TYPE_COLLECTION, GeeCollection), _tmp69_, _tmp70_, _tmp70__target, G_TYPE_CHECK_INSTANCE_CAST (_tmp71_, GEE_TYPE_LIST, GeeList));
-#line 2753 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2769 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp72_ = video_global;
-#line 2753 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2769 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp73_ = videos;
-#line 2753 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2769 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp74_ = delete_backing;
-#line 2753 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2769 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp75_ = monitor;
-#line 2753 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2769 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp75__target = monitor_target;
-#line 2753 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2769 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp76_ = not_removed_videos;
-#line 2753 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2769 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	media_source_collection_remove_from_app (G_TYPE_CHECK_INSTANCE_CAST (_tmp72_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp73_, GEE_TYPE_COLLECTION, GeeCollection), _tmp74_, _tmp75_, _tmp75__target, G_TYPE_CHECK_INSTANCE_CAST (_tmp76_, GEE_TYPE_LIST, GeeList));
-#line 2756 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2772 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp77_ = not_removed_photos;
-#line 2756 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2772 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp78_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp77_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 2756 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2772 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp79_ = _tmp78_;
-#line 2756 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2772 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp80_ = not_removed_videos;
-#line 2756 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2772 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp81_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp80_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 2756 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2772 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp82_ = _tmp81_;
-#line 2756 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2772 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	num_not_removed = _tmp79_ + _tmp82_;
-#line 2757 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2773 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp84_ = delete_backing;
-#line 2757 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2773 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp84_) {
-#line 21600 "Dialogs.c"
+#line 21728 "Dialogs.c"
 		gint _tmp85_ = 0;
-#line 2757 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2773 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp85_ = num_not_removed;
-#line 2757 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2773 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp83_ = _tmp85_ > 0;
-#line 21606 "Dialogs.c"
+#line 21734 "Dialogs.c"
 	} else {
-#line 2757 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2773 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp83_ = FALSE;
-#line 21610 "Dialogs.c"
+#line 21738 "Dialogs.c"
 	}
-#line 2757 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2773 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp83_) {
-#line 21614 "Dialogs.c"
+#line 21742 "Dialogs.c"
 		gchar* not_deleted_message = NULL;
 		gint _tmp86_ = 0;
 		const gchar* _tmp87_ = NULL;
@@ -21660,39 +21788,39 @@ void remove_from_app (GeeCollection* sources, const gchar* dialog_title, const g
 		GtkResponseType _tmp94_ = 0;
 		GtkResponseType _tmp95_ = 0;
 		GtkResponseType _tmp96_ = 0;
-#line 2758 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2774 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp86_ = num_not_removed;
-#line 2758 "/home/jens/Source/shotwell/src/Dialogs.vala"
-		_tmp87_ = ngettext ("The photo or video cannot be moved to your desktop trash.  Delete this" \
-" file?", "%d photos/videos cannot be moved to your desktop trash.  Delete these " \
-"files?", (gulong) _tmp86_);
-#line 2758 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2774 "/home/jens/Source/shotwell/src/Dialogs.vala"
+		_tmp87_ = ngettext ("The photo or video cannot be moved to your desktop trash. Delete this " \
+"file?", "%d photos/videos cannot be moved to your desktop trash. Delete these f" \
+"iles?", (gulong) _tmp86_);
+#line 2774 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp88_ = num_not_removed;
-#line 2758 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2774 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp89_ = g_strdup_printf (_tmp87_, _tmp88_);
-#line 2758 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2774 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		not_deleted_message = _tmp89_;
-#line 2762 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2778 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp90_ = app_window_get_instance ();
-#line 2762 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2778 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp91_ = _tmp90_;
-#line 2762 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2778 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp92_ = dialog_title;
-#line 2762 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2778 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp93_ = not_deleted_message;
-#line 2762 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2778 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp94_ = remove_from_filesystem_dialog (G_TYPE_CHECK_INSTANCE_CAST (_tmp91_, gtk_window_get_type (), GtkWindow), _tmp92_, _tmp93_);
-#line 2762 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2778 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp95_ = _tmp94_;
-#line 2762 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2778 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_object_unref0 (_tmp91_);
-#line 2762 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2778 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		result_delete = _tmp95_;
-#line 2765 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2781 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp96_ = result_delete;
-#line 2765 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2781 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (GTK_RESPONSE_YES == _tmp96_) {
-#line 21658 "Dialogs.c"
+#line 21786 "Dialogs.c"
 			GeeArrayList* not_deleted_photos = NULL;
 			GeeArrayList* _tmp97_ = NULL;
 			GeeArrayList* not_deleted_videos = NULL;
@@ -21715,57 +21843,57 @@ void remove_from_app (GeeCollection* sources, const gchar* dialog_title, const g
 			gint _tmp111_ = 0;
 			gint _tmp112_ = 0;
 			gint _tmp113_ = 0;
-#line 2767 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2783 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp97_ = gee_array_list_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
-#line 2767 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2783 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			not_deleted_photos = _tmp97_;
-#line 2768 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2784 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp98_ = gee_array_list_new (TYPE_VIDEO, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
-#line 2768 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2784 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			not_deleted_videos = _tmp98_;
-#line 2769 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2785 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp99_ = library_photo_global;
-#line 2769 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2785 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp100_ = not_removed_photos;
-#line 2769 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2785 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp101_ = monitor;
-#line 2769 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2785 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp101__target = monitor_target;
-#line 2769 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2785 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp102_ = not_deleted_photos;
-#line 2769 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2785 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			media_source_collection_delete_backing_files (G_TYPE_CHECK_INSTANCE_CAST (_tmp99_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp100_, GEE_TYPE_COLLECTION, GeeCollection), _tmp101_, _tmp101__target, G_TYPE_CHECK_INSTANCE_CAST (_tmp102_, GEE_TYPE_LIST, GeeList));
-#line 2770 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2786 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp103_ = video_global;
-#line 2770 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2786 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp104_ = not_removed_videos;
-#line 2770 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2786 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp105_ = monitor;
-#line 2770 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2786 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp105__target = monitor_target;
-#line 2770 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2786 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp106_ = not_deleted_videos;
-#line 2770 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2786 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			media_source_collection_delete_backing_files (G_TYPE_CHECK_INSTANCE_CAST (_tmp103_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp104_, GEE_TYPE_COLLECTION, GeeCollection), _tmp105_, _tmp105__target, G_TYPE_CHECK_INSTANCE_CAST (_tmp106_, GEE_TYPE_LIST, GeeList));
-#line 2772 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2788 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp107_ = not_deleted_photos;
-#line 2772 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2788 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp108_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp107_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 2772 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2788 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp109_ = _tmp108_;
-#line 2772 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2788 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp110_ = not_deleted_videos;
-#line 2772 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2788 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp111_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp110_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 2772 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2788 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp112_ = _tmp111_;
-#line 2772 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2788 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			num_not_deleted = _tmp109_ + _tmp112_;
-#line 2773 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2789 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp113_ = num_not_deleted;
-#line 2773 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2789 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			if (_tmp113_ > 0) {
-#line 21731 "Dialogs.c"
+#line 21859 "Dialogs.c"
 				gchar* delete_failed_message = NULL;
 				gint _tmp114_ = 0;
 				const gchar* _tmp115_ = NULL;
@@ -21775,83 +21903,83 @@ void remove_from_app (GeeCollection* sources, const gchar* dialog_title, const g
 				const gchar* _tmp119_ = NULL;
 				AppWindow* _tmp120_ = NULL;
 				AppWindow* _tmp121_ = NULL;
-#line 2775 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2791 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp114_ = num_not_deleted;
-#line 2775 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2791 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp115_ = ngettext ("The photo or video cannot be deleted.", "%d photos/videos cannot be deleted.", (gulong) _tmp114_);
-#line 2775 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2791 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp116_ = num_not_deleted;
-#line 2775 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2791 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp117_ = g_strdup_printf (_tmp115_, _tmp116_);
-#line 2775 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2791 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				delete_failed_message = _tmp117_;
-#line 2779 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2795 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp118_ = dialog_title;
-#line 2779 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2795 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp119_ = delete_failed_message;
-#line 2779 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2795 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp120_ = app_window_get_instance ();
-#line 2779 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2795 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_tmp121_ = _tmp120_;
-#line 2779 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2795 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				app_window_error_message_with_title (_tmp118_, _tmp119_, G_TYPE_CHECK_INSTANCE_CAST (_tmp121_, gtk_window_get_type (), GtkWindow), TRUE);
-#line 2779 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2795 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_object_unref0 (_tmp121_);
-#line 2773 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2789 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_free0 (delete_failed_message);
-#line 21765 "Dialogs.c"
+#line 21893 "Dialogs.c"
 			}
-#line 2765 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2781 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_object_unref0 (not_deleted_videos);
-#line 2765 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2781 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_object_unref0 (not_deleted_photos);
-#line 21771 "Dialogs.c"
+#line 21899 "Dialogs.c"
 		}
-#line 2757 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2773 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_g_free0 (not_deleted_message);
-#line 21775 "Dialogs.c"
+#line 21903 "Dialogs.c"
 	}
-#line 2784 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2800 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp122_ = progress;
-#line 2784 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2800 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (_tmp122_ != NULL) {
-#line 21781 "Dialogs.c"
+#line 21909 "Dialogs.c"
 		ProgressDialog* _tmp123_ = NULL;
-#line 2785 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2801 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp123_ = progress;
-#line 2785 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2801 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		progress_dialog_close (_tmp123_);
-#line 21787 "Dialogs.c"
+#line 21915 "Dialogs.c"
 	}
-#line 2787 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2803 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp124_ = app_window_get_instance ();
-#line 2787 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2803 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_tmp125_ = _tmp124_;
-#line 2787 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2803 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp125_, TYPE_PAGE_WINDOW, PageWindow));
-#line 2787 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2803 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (_tmp125_);
-#line 2708 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2724 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (not_removed_videos);
-#line 2708 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2724 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (not_removed_photos);
-#line 2708 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2724 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	(monitor_target_destroy_notify == NULL) ? NULL : (monitor_target_destroy_notify (monitor_target), NULL);
-#line 2708 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2724 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	monitor = NULL;
-#line 2708 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2724 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	monitor_target = NULL;
-#line 2708 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2724 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	monitor_target_destroy_notify = NULL;
-#line 2708 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2724 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (progress);
-#line 2708 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2724 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_free0 (user_message);
-#line 2708 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2724 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (videos);
-#line 2708 "/home/jens/Source/shotwell/src/Dialogs.vala"
+#line 2724 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (photos);
-#line 21817 "Dialogs.c"
+#line 21945 "Dialogs.c"
 }
 
 
diff --git a/src/Dialogs.vala b/src/Dialogs.vala
index f01e078..01caced 100644
--- a/src/Dialogs.vala
+++ b/src/Dialogs.vala
@@ -13,8 +13,8 @@ public bool confirm_delete_tag(Tag tag) {
     if (count == 0)
         return true;
     string msg = ngettext(
-        "This will remove the tag \"%s\" from one photo.  Continue?",
-        "This will remove the tag \"%s\" from %d photos.  Continue?",
+        "This will remove the tag “%s” from one photo. Continue?",
+        "This will remove the tag “%s” from %d photos. Continue?",
         count).printf(tag.get_user_visible_name(), count);
     
     return AppWindow.negate_affirm_question(msg, _("_Cancel"), _("_Delete"),
@@ -22,7 +22,7 @@ public bool confirm_delete_tag(Tag tag) {
 }
 
 public bool confirm_delete_saved_search(SavedSearch search) {
-    string msg = _("This will remove the saved search \"%s\".  Continue?")
+    string msg = _("This will remove the saved search “%s”. Continue?")
         .printf(search.get_name());
     
     return AppWindow.negate_affirm_question(msg, _("_Cancel"), _("_Delete"),
@@ -66,15 +66,11 @@ public File? choose_file(string current_file_basename) {
     chooser.set_current_name(current_file_basename);
     chooser.set_local_only(false);
     
-    // The log handler reset should be removed once GTK 3.4 becomes widely available; 
-    // please see https://bugzilla.gnome.org/show_bug.cgi?id=662814 for details.
-    Log.set_handler("Gtk", LogLevelFlags.LEVEL_WARNING, suppress_warnings);
     File file = null;
     if (chooser.run() == Gtk.ResponseType.ACCEPT) {
         file = File.new_for_path(chooser.get_filename());
         current_export_dir = file.get_parent();
     }
-    Log.set_handler("Gtk", LogLevelFlags.LEVEL_WARNING, Log.default_handler);    
     chooser.destroy();
     
     return file;
@@ -113,7 +109,7 @@ public void open_external_editor_error_dialog(Error err, Photo photo) {
     if (err is IOError.PERMISSION_DENIED || err is FileError.PERM) {
          // Yes - display an alternate error message here.
          AppWindow.error_message(          
-            _("Shotwell couldn't create a file for editing this photo because you do not have permission to write to %s.").printf(photo.get_master_file().get_parent().get_path()));
+            _("Shotwell couldn’t create a file for editing this photo because you do not have permission to write to %s.").printf(photo.get_master_file().get_parent().get_path()));
     } else {
         // No - something else is wrong, display the error message 
         // the system gave us.
@@ -162,7 +158,7 @@ public class ExportDialog : Gtk.Dialog {
     private Gtk.ComboBoxText quality_combo;
     private Gtk.ComboBoxText constraint_combo;
     private Gtk.ComboBoxText format_combo;
-    private Gtk.CheckButton export_metadata;
+    private Gtk.Switch export_metadata;
     private Gee.ArrayList<string> format_options = new Gee.ArrayList<string>();
     private Gtk.Entry pixels_entry;
     private Gtk.Widget ok_button;
@@ -176,6 +172,15 @@ public class ExportDialog : Gtk.Dialog {
         this.title = title;
         resizable = false;
 
+        //get information about the export settings out of our config backend
+        Config.Facade config = Config.Facade.get_instance();
+        current_parameters.mode = config.get_export_export_format_mode(); //ExportFormatMode
+        current_parameters.specified_format = config.get_export_photo_file_format(); //PhotoFileFormat
+        current_parameters.quality = config.get_export_quality(); //quality
+        current_parameters.export_metadata = config.get_export_export_metadata(); //export metadata
+        current_constraint = config.get_export_constraint(); //constraint
+        current_scale = config.get_export_scale(); //scale
+
         quality_combo = new Gtk.ComboBoxText();
         int ctr = 0;
         foreach (Jpeg.Quality quality in QUALITY_ARRAY) {
@@ -225,13 +230,15 @@ public class ExportDialog : Gtk.Dialog {
         add_label(_("_Pixels:"), 0, 3, pixels_entry);
         add_control(pixels_entry, 1, 3);
         
-        export_metadata = new Gtk.CheckButton.with_label(_("Export metadata"));
+        export_metadata = new Gtk.Switch ();
+        add_label(_("Export _metadata:"), 0, 4, export_metadata);
         add_control(export_metadata, 1, 4);
         export_metadata.active = true;
+        export_metadata.halign = Gtk.Align.START;
         
-        table.set_row_spacing(5);
-        table.set_column_spacing(5);
-        table.set_border_width(3);
+        table.set_row_spacing(6);
+        table.set_column_spacing(12);
+        table.set_border_width(18);
         
         ((Gtk.Box) get_content_area()).add(table);
         
@@ -343,6 +350,15 @@ public class ExportDialog : Gtk.Dialog {
                 if (current_parameters.specified_format == PhotoFileFormat.JFIF)
                     parameters.quality = current_parameters.quality = QUALITY_ARRAY[quality_combo.get_active()];
             }
+
+            //save current settings in config backend for reusing later
+            Config.Facade config = Config.Facade.get_instance();
+            config.set_export_export_format_mode(current_parameters.mode); //ExportFormatMode
+            config.set_export_photo_file_format(current_parameters.specified_format); //PhotoFileFormat
+            config.set_export_quality(current_parameters.quality); //quality
+            config.set_export_export_metadata(current_parameters.export_metadata); //export metadata
+            config.set_export_constraint(current_constraint); //constraint
+            config.set_export_scale(current_scale); //scale
         } else {
             scale = 0;
             constraint = ScaleConstraint.ORIGINAL;
@@ -354,24 +370,24 @@ public class ExportDialog : Gtk.Dialog {
     }
     
     private void add_label(string text, int x, int y, Gtk.Widget? widget = null) {
-        Gtk.Alignment left_aligned = new Gtk.Alignment(1, 0.5f, 0, 0);
-        
         Gtk.Label new_label = new Gtk.Label.with_mnemonic(text);
+        new_label.halign = Gtk.Align.END;
+        new_label.valign = Gtk.Align.CENTER;
         new_label.set_use_underline(true);
         
         if (widget != null)
             new_label.set_mnemonic_widget(widget);
         
-        left_aligned.add(new_label);
-        
-        table.attach(left_aligned, x, y, 1, 1);
+        table.attach(new_label, x, y, 1, 1);
     }
     
     private void add_control(Gtk.Widget widget, int x, int y) {
-        Gtk.Alignment left_aligned = new Gtk.Alignment(0, 0.5f, 1, 0);
-        left_aligned.add(widget);
+        widget.halign = Gtk.Align.FILL;
+        widget.valign = Gtk.Align.CENTER;
+        widget.hexpand = true;
+        widget.vexpand = true;
         
-        table.attach(left_aligned, x, y, 1, 1);
+        table.attach(widget, x, y, 1, 1);
     }
     
     private void on_constraint_changed() {
@@ -459,7 +475,7 @@ public class ExportDialog : Gtk.Dialog {
 
 namespace ImportUI {
 private const int REPORT_FAILURE_COUNT = 4;
-internal const string SAVE_RESULTS_BUTTON_NAME = _("Save Details...");
+internal const string SAVE_RESULTS_BUTTON_NAME = _("Save Details…");
 internal const string SAVE_RESULTS_FILE_CHOOSER_TITLE = _("Save Details");
 internal const int SAVE_RESULTS_RESPONSE_ID = 1024;
 
@@ -576,7 +592,7 @@ public string create_result_report_from_manifest(ImportManifest manifest) {
     // Files Not Imported Because They Weren't Recognized as Photos or Videos
     //
     if (manifest.skipped_files.size > 0) {
-        builder.append(_("Files Not Imported Because They Weren't Recognized as Photos or Videos:")
+        builder.append(_("Files Not Imported Because They Weren’t Recognized as Photos or Videos:")
             + "\n\n");
         
         foreach (BatchImportResult result in manifest.skipped_files) {
@@ -591,7 +607,7 @@ public string create_result_report_from_manifest(ImportManifest manifest) {
     // Photos/Videos Not Imported Because They Weren't in a Format Shotwell Understands
     //
     if (manifest.skipped_photos.size > 0) {
-        builder.append(_("Photos/Videos Not Imported Because They Weren't in a Format Shotwell Understands:")
+        builder.append(_("Photos/Videos Not Imported Because They Weren’t in a Format Shotwell Understands:")
             + "\n\n");
         
         foreach (BatchImportResult result in manifest.skipped_photos) {
@@ -606,11 +622,11 @@ public string create_result_report_from_manifest(ImportManifest manifest) {
     // Photos/Videos Not Imported Because Shotwell Couldn't Copy Them into its Library
     //
     if (manifest.write_failed.size > 0) {
-        builder.append(_("Photos/Videos Not Imported Because Shotwell Couldn't Copy Them into its Library:")
+        builder.append(_("Photos/Videos Not Imported Because Shotwell Couldn’t Copy Them into its Library:")
              + "\n\n");
         
         foreach (BatchImportResult result in manifest.write_failed) {
-            current_file_summary = (_("couldn't copy %s\n\tto %s")).printf(result.src_identifier,
+            current_file_summary = (_("couldn’t copy %s\n\tto %s")).printf(result.src_identifier,
             result.dest_identifier) + "\n\t" + _("error message:") + " " +
             result.errmsg + "\n\n";
 
@@ -1414,8 +1430,8 @@ public bool revert_editable_dialog(Gtk.Window owner, Gee.Collection<Photo> photo
            
     string headline = (count == 1) ? _("Revert External Edit?") : _("Revert External Edits?");
     string msg = ngettext(
-        "This will destroy all changes made to the external file.  Continue?",
-        "This will destroy all changes made to %d external files.  Continue?",
+        "This will destroy all changes made to the external file. Continue?",
+        "This will destroy all changes made to %d external files. Continue?",
         count).printf(count);
 
     string action = (count == 1) ? _("Re_vert External Edit") : _("Re_vert External Edits");
@@ -1439,8 +1455,8 @@ public bool remove_offline_dialog(Gtk.Window owner, int count) {
         return false;
     
     string msg = ngettext(
-        "This will remove the photo from the library.  Continue?",
-        "This will remove %d photos from the library.  Continue?",
+        "This will remove the photo from the library. Continue?",
+        "This will remove %d photos from the library. Continue?",
         count).printf(count);
     
     Gtk.MessageDialog dialog = new Gtk.MessageDialog(owner, Gtk.DialogFlags.MODAL,
@@ -2143,7 +2159,7 @@ public class WelcomeDialog : Gtk.Dialog {
         content.add(import_content);
         content.pack_start(instructions, false, false, 0);
 
-        hide_button = new Gtk.CheckButton.with_mnemonic(_("_Don't show this message again"));
+        hide_button = new Gtk.CheckButton.with_mnemonic(_("_Don’t show this message again"));
         hide_button.set_active(true);
         content.pack_start(hide_button, false, false, 6);
         
@@ -2716,16 +2732,16 @@ public void remove_from_app(Gee.Collection<MediaSource> sources, string dialog_t
     
     string? user_message = null;
     if ((!photos.is_empty) && (!videos.is_empty)) {
-        user_message = ngettext("This will remove the photo/video from your Shotwell library.  Would you also like to move the file to your desktop trash?\n\nThis action cannot be undone.",
-            "This will remove %d photos/videos from your Shotwell library.  Would you also like to move the files to your desktop trash?\n\nThis action cannot be undone.",
+        user_message = ngettext("This will remove the photo/video from your Shotwell library. Would you also like to move the file to your desktop trash?\n\nThis action cannot be undone.",
+            "This will remove %d photos/videos from your Shotwell library. Would you also like to move the files to your desktop trash?\n\nThis action cannot be undone.",
              sources.size).printf(sources.size);
     } else if (!videos.is_empty) {
-        user_message = ngettext("This will remove the video from your Shotwell library.  Would you also like to move the file to your desktop trash?\n\nThis action cannot be undone.",
-            "This will remove %d videos from your Shotwell library.  Would you also like to move the files to your desktop trash?\n\nThis action cannot be undone.",
+        user_message = ngettext("This will remove the video from your Shotwell library. Would you also like to move the file to your desktop trash?\n\nThis action cannot be undone.",
+            "This will remove %d videos from your Shotwell library. Would you also like to move the files to your desktop trash?\n\nThis action cannot be undone.",
              sources.size).printf(sources.size);
     } else {
-        user_message = ngettext("This will remove the photo from your Shotwell library.  Would you also like to move the file to your desktop trash?\n\nThis action cannot be undone.",
-            "This will remove %d photos from your Shotwell library.  Would you also like to move the files to your desktop trash?\n\nThis action cannot be undone.",
+        user_message = ngettext("This will remove the photo from your Shotwell library. Would you also like to move the file to your desktop trash?\n\nThis action cannot be undone.",
+            "This will remove %d photos from your Shotwell library. Would you also like to move the files to your desktop trash?\n\nThis action cannot be undone.",
              sources.size).printf(sources.size);
     }
     
@@ -2756,8 +2772,8 @@ public void remove_from_app(Gee.Collection<MediaSource> sources, string dialog_t
     int num_not_removed = not_removed_photos.size + not_removed_videos.size;
     if (delete_backing && num_not_removed > 0) {
         string not_deleted_message = 
-            ngettext("The photo or video cannot be moved to your desktop trash.  Delete this file?",
-                "%d photos/videos cannot be moved to your desktop trash.  Delete these files?",
+            ngettext("The photo or video cannot be moved to your desktop trash. Delete this file?",
+                "%d photos/videos cannot be moved to your desktop trash. Delete these files?",
                 num_not_removed).printf(num_not_removed);
         Gtk.ResponseType result_delete = remove_from_filesystem_dialog(AppWindow.get_instance(), 
             dialog_title, not_deleted_message);
diff --git a/src/DirectoryMonitor.c b/src/DirectoryMonitor.c
index 140736c..38932d1 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 __catch469_g_error;
+				goto __catch482_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 __finally469;
-		__catch469_g_error:
+		goto __finally482;
+		__catch482_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"
 		}
-		__finally469:
+		__finally482:
 #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 __catch470_g_error;
+			goto __catch483_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 __catch470_g_error;
+					goto __catch483_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 __finally470;
-	__catch470_g_error:
+	goto __finally483;
+	__catch483_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"
 	}
-	__finally470:
+	__finally483:
 #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 __catch471_g_error;
+			goto __catch484_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 __finally471;
-	__catch471_g_error:
+	goto __finally484;
+	__catch484_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"
 	}
-	__finally471:
+	__finally484:
 #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 __catch472_g_error;
+			goto __catch485_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 __finally472;
-	__catch472_g_error:
+	goto __finally485;
+	__catch485_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"
 	}
-	__finally472:
+	__finally485:
 #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 __catch473_g_error;
+			goto __catch486_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 __finally473;
-	__catch473_g_error:
+	goto __finally486;
+	__catch486_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"
 	}
-	__finally473:
+	__finally486:
 #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 0c3af9b..88c7dda 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 __catch424_database_error;
+				goto __catch437_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 __finally424;
-	__catch424_database_error:
+	goto __finally437;
+	__catch437_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"
 	}
-	__finally424:
+	__finally437:
 #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 __catch425_g_error;
+			goto __catch438_g_error;
 		}
 	}
-	goto __finally425;
-	__catch425_g_error:
+	goto __finally438;
+	__catch438_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"
 	}
-	__finally425:
+	__finally438:
 #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 __catch426_g_error;
+			goto __catch439_g_error;
 		}
 	}
-	goto __finally426;
-	__catch426_g_error:
+	goto __finally439;
+	__catch439_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"
 	}
-	__finally426:
+	__finally439:
 #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 __catch427_g_error;
+			goto __catch440_g_error;
 		}
 	}
-	goto __finally427;
-	__catch427_g_error:
+	goto __finally440;
+	__catch440_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"
 	}
-	__finally427:
+	__finally440:
 #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 __catch428_g_error;
+			goto __catch441_g_error;
 		}
 	}
-	goto __finally428;
-	__catch428_g_error:
+	goto __finally441;
+	__catch441_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"
 	}
-	__finally428:
+	__finally441:
 #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 __catch429_database_error;
+				goto __catch442_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 __finally429;
-	__catch429_database_error:
+	goto __finally442;
+	__catch442_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"
 	}
-	__finally429:
+	__finally442:
 #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 __catch430_g_error;
+			goto __catch443_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 __finally430;
-	__catch430_g_error:
+	goto __finally443;
+	__catch443_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"
 	}
-	__finally430:
+	__finally443:
 #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 __catch431_database_error;
+				goto __catch444_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 __finally431;
-	__catch431_database_error:
+	goto __finally444;
+	__catch444_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"
 	}
-	__finally431:
+	__finally444:
 #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 a120c56..ef0deab 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 __catch467_g_error;
+						goto __catch480_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 __finally467;
-				__catch467_g_error:
+				goto __finally480;
+				__catch480_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"
 				}
-				__finally467:
+				__finally480:
 #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 __catch468_g_error;
+				goto __catch481_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 __catch468_g_error;
+					goto __catch481_g_error;
 				}
 			}
 		}
 	}
-	goto __finally468;
-	__catch468_g_error:
+	goto __finally481;
+	__catch481_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"
 	}
-	__finally468:
+	__finally481:
 #line 95 "/home/jens/Source/shotwell/src/Exporter.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 95 "/home/jens/Source/shotwell/src/Exporter.vala"
@@ -2452,7 +2452,7 @@ static ExporterOverwrite exporter_ui_on_export_overwrite (ExporterUI* self, Expo
 #line 316 "/home/jens/Source/shotwell/src/Exporter.vala"
 	gtk_window_set_modal (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_window_get_type (), GtkWindow), FALSE);
 #line 317 "/home/jens/Source/shotwell/src/Exporter.vala"
-	_tmp1_ = _ ("File %s already exists.  Replace?");
+	_tmp1_ = _ ("File %s already exists. Replace?");
 #line 317 "/home/jens/Source/shotwell/src/Exporter.vala"
 	_tmp2_ = file;
 #line 317 "/home/jens/Source/shotwell/src/Exporter.vala"
diff --git a/src/Exporter.vala b/src/Exporter.vala
index 221ba73..b9596f5 100644
--- a/src/Exporter.vala
+++ b/src/Exporter.vala
@@ -314,7 +314,7 @@ public class ExporterUI {
     
     private Exporter.Overwrite on_export_overwrite(Exporter exporter, File file) {
         progress_dialog.set_modal(false);
-        string question = _("File %s already exists.  Replace?").printf(file.get_basename());
+        string question = _("File %s already exists. Replace?").printf(file.get_basename());
         Gtk.ResponseType response = AppWindow.negate_affirm_all_cancel_question(question, 
             _("_Skip"), _("_Replace"), _("Replace _All"), _("Export"));
         
diff --git a/src/LibraryFiles.c b/src/LibraryFiles.c
index 9139935..c62e8b7 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 __catch451_g_error;
+			goto __catch464_g_error;
 		}
 	}
-	goto __finally451;
-	__catch451_g_error:
+	goto __finally464;
+	__catch464_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 __finally451;
+			goto __finally464;
 		}
 #line 29 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		_g_error_free0 (err);
 #line 318 "LibraryFiles.c"
 	}
-	__finally451:
+	__finally464:
 #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 __catch452_g_error;
+			goto __catch465_g_error;
 		}
 #line 50 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		timestamp = _tmp0_;
 #line 449 "LibraryFiles.c"
 	}
-	goto __finally452;
-	__catch452_g_error:
+	goto __finally465;
+	__catch465_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"
 	}
-	__finally452:
+	__finally465:
 #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 __catch453_g_error;
+				goto __catch466_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 __finally453;
-		__catch453_g_error:
+		goto __finally466;
+		__catch466_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"
 		}
-		__finally453:
+		__finally466:
 #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 __catch454_g_error;
+				goto __catch467_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 __finally454;
-		__catch454_g_error:
+		goto __finally467;
+		__catch467_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"
 		}
-		__finally454:
+		__finally467:
 #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 __catch455_g_error;
+			goto __catch468_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 __finally455;
-	__catch455_g_error:
+	goto __finally468;
+	__catch468_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 __finally455;
+				goto __finally468;
 			}
 #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 __finally455;
+				goto __finally468;
 			}
 #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"
 	}
-	__finally455:
+	__finally468:
 #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 __catch456_g_error;
+			goto __catch469_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 __catch456_g_error;
+			goto __catch469_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 __finally456;
-	__catch456_g_error:
+	goto __finally469;
+	__catch469_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"
 	}
-	__finally456:
+	__finally469:
 #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 6253bd5..ebdfd74 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 __catch474_g_error;
+							goto __catch487_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 __finally474;
-					__catch474_g_error:
+					goto __finally487;
+					__catch487_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"
 					}
-					__finally474:
+					__finally487:
 #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 __catch475_database_error;
+					goto __catch488_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 __finally475;
-		__catch475_database_error:
+		goto __finally488;
+		__catch488_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"
 		}
-		__finally475:
+		__finally488:
 #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"
 		}
-		__finally476:
+		__finally489:
 		{
 			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"
 			}
 		}
-		__finally477:
+		__finally490:
 		{
 			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"
 		}
-		__finally478:
+		__finally491:
 		{
 			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"
 		}
-		__finally479:
+		__finally492:
 		{
 			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 __catch480_g_error;
+			goto __catch493_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 __finally480;
-	__catch480_g_error:
+	goto __finally493;
+	__catch493_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"
 	}
-	__finally480:
+	__finally493:
 #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 __catch481_g_error;
+			goto __catch494_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 __finally481;
-	__catch481_g_error:
+	goto __finally494;
+	__catch494_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"
 	}
-	__finally481:
+	__finally494:
 #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 f539c7c..0ae31e2 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 __catch549_g_error;
+			goto __catch562_g_error;
 		}
 #line 102 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		ret = _tmp1_;
 #line 2089 "MediaDataRepresentation.c"
 	}
-	goto __finally549;
-	__catch549_g_error:
+	goto __finally562;
+	__catch562_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"
 	}
-	__finally549:
+	__finally562:
 #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 __catch550_g_error;
+					goto __catch563_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 __finally550;
-			__catch550_g_error:
+			goto __finally563;
+			__catch563_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"
 			}
-			__finally550:
+			__finally563:
 #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 __catch551_g_error;
+					goto __catch564_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 __finally551;
-			__catch551_g_error:
+			goto __finally564;
+			__catch564_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"
 			}
-			__finally551:
+			__finally564:
 #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 __catch552_database_error;
+					goto __catch565_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 __finally552;
-		__catch552_database_error:
+		goto __finally565;
+		__catch565_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"
 		}
-		__finally552:
+		__finally565:
 #line 703 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 703 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
@@ -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 __catch553_g_error;
+					goto __catch566_g_error;
 				}
 			}
-			goto __finally553;
-			__catch553_g_error:
+			goto __finally566;
+			__catch566_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"
 			}
-			__finally553:
+			__finally566:
 #line 720 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 720 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
diff --git a/src/MediaInterfaces.c b/src/MediaInterfaces.c
index 0331fd7..e387e0b 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 __catch560_g_error;
+					goto __catch573_g_error;
 				}
 			}
-			goto __finally560;
-			__catch560_g_error:
+			goto __finally573;
+			__catch573_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"
 			}
-			__finally560:
+			__finally573:
 #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"
 			}
 		}
-		__finally559:
+		__finally572:
 		{
 			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 __catch562_g_error;
+					goto __catch575_g_error;
 				}
 			}
-			goto __finally562;
-			__catch562_g_error:
+			goto __finally575;
+			__catch575_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"
 			}
-			__finally562:
+			__finally575:
 #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"
 			}
 		}
-		__finally561:
+		__finally574:
 		{
 			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"
 		}
-		__finally558:
+		__finally571:
 		{
 			gint _tmp2_ = 0;
 #line 58 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
diff --git a/src/MediaMonitor.c b/src/MediaMonitor.c
index 3072ab4..9802989 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 __catch571_g_error;
+				goto __catch584_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 __finally571;
-		__catch571_g_error:
+		goto __finally584;
+		__catch584_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"
 		}
-		__finally571:
+		__finally584:
 #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 79c8125..d6bc5c0 100644
--- a/src/MediaPage.c
+++ b/src/MediaPage.c
@@ -1107,13 +1107,13 @@ GtkActionEntry* page_init_collect_action_entries (Page* self, int* result_length
 #define TRANSLATABLE "translatable"
 void media_page_on_export (MediaPage* self);
 static void _media_page_on_export_gtk_action_callback (GtkAction* action, gpointer self);
-#define RESOURCES_EXPORT_MENU _ ("_Export...")
+#define RESOURCES_EXPORT_MENU _ ("_Export…")
 static void _vala_array_add297 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
 static void media_page_on_send_to (MediaPage* self);
 static void _media_page_on_send_to_gtk_action_callback (GtkAction* action, gpointer self);
-#define RESOURCES_SEND_TO_MENU _ ("Send _To...")
+#define RESOURCES_SEND_TO_MENU _ ("Send _To…")
 static void _vala_array_add298 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
-#define RESOURCES_SEND_TO_CONTEXT_MENU _ ("Send T_o...")
+#define RESOURCES_SEND_TO_CONTEXT_MENU _ ("Send T_o…")
 static void _vala_array_add299 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
 #define RESOURCES_REMOVE_LABEL _ ("_Remove")
 static void media_page_on_remove_from_library (MediaPage* self);
@@ -1131,13 +1131,13 @@ static void _media_page_on_new_event_gtk_action_callback (GtkAction* action, gpo
 static void _vala_array_add302 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
 static void media_page_on_add_tags (MediaPage* self);
 static void _media_page_on_add_tags_gtk_action_callback (GtkAction* action, gpointer self);
-#define RESOURCES_ADD_TAGS_MENU _ ("Add _Tags...")
+#define RESOURCES_ADD_TAGS_MENU _ ("Add _Tags…")
 static void _vala_array_add303 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
-#define RESOURCES_ADD_TAGS_CONTEXT_MENU _ ("_Add Tags...")
+#define RESOURCES_ADD_TAGS_CONTEXT_MENU _ ("_Add Tags…")
 static void _vala_array_add304 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
 static void media_page_on_modify_tags (MediaPage* self);
 static void _media_page_on_modify_tags_gtk_action_callback (GtkAction* action, gpointer self);
-#define RESOURCES_MODIFY_TAGS_MENU _ ("Modif_y Tags...")
+#define RESOURCES_MODIFY_TAGS_MENU _ ("Modif_y Tags…")
 static void _vala_array_add305 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
 #define RESOURCES_ZOOM_IN_LABEL _ ("Zoom _In")
 void media_page_on_increase_size (MediaPage* self);
@@ -1185,11 +1185,11 @@ static void _media_page_on_rate_five_gtk_action_callback (GtkAction* action, gpo
 static void _vala_array_add318 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
 void media_page_on_edit_title (MediaPage* self);
 static void _media_page_on_edit_title_gtk_action_callback (GtkAction* action, gpointer self);
-#define RESOURCES_EDIT_TITLE_MENU _ ("Edit _Title...")
+#define RESOURCES_EDIT_TITLE_MENU _ ("Edit _Title…")
 static void _vala_array_add319 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
 void media_page_on_edit_comment (MediaPage* self);
 static void _media_page_on_edit_comment_gtk_action_callback (GtkAction* action, gpointer self);
-#define RESOURCES_EDIT_COMMENT_MENU _ ("Edit _Comment...")
+#define RESOURCES_EDIT_COMMENT_MENU _ ("Edit _Comment…")
 static void _vala_array_add320 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
 static void _vala_array_add321 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
 #define RESOURCES_FILTER_PHOTOS_MENU _ ("_Filter Photos")
@@ -1216,7 +1216,7 @@ static void _vala_array_add328 (GtkToggleActionEntry** array, int* length, int*
 void media_page_on_display_ratings (MediaPage* self, GtkAction* action);
 static void _media_page_on_display_ratings_gtk_action_callback (GtkAction* action, gpointer self);
 #define RESOURCES_VIEW_RATINGS_MENU _ ("_Ratings")
-#define RESOURCES_VIEW_RATINGS_TOOLTIP _ ("Display each photo's rating")
+#define RESOURCES_VIEW_RATINGS_TOOLTIP _ ("Display each photo’s rating")
 static void _vala_array_add329 (GtkToggleActionEntry** array, int* length, int* size, const GtkToggleActionEntry* value);
 void media_page_on_display_tags (MediaPage* self, GtkAction* action);
 static void _media_page_on_display_tags_gtk_action_callback (GtkAction* action, gpointer self);
@@ -4344,7 +4344,7 @@ static GtkToggleActionEntry* media_page_real_init_collect_toggle_action_entries
 #line 469 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	tags.label = _tmp32_;
 #line 470 "/home/jens/Source/shotwell/src/MediaPage.vala"
-	_tmp33_ = _ ("Display each photo's tags");
+	_tmp33_ = _ ("Display each photo’s tags");
 #line 470 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	tags.tooltip = _tmp33_;
 #line 471 "/home/jens/Source/shotwell/src/MediaPage.vala"
@@ -6227,11 +6227,11 @@ void media_page_on_play_video (MediaPage* self) {
 #line 721 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 6230 "MediaPage.c"
-			goto __catch548_g_error;
+			goto __catch561_g_error;
 		}
 	}
-	goto __finally548;
-	__catch548_g_error:
+	goto __finally561;
+	__catch561_g_error:
 	{
 		GError* e = NULL;
 		const gchar* _tmp17_ = NULL;
@@ -6261,7 +6261,7 @@ void media_page_on_play_video (MediaPage* self) {
 		_g_error_free0 (e);
 #line 6263 "MediaPage.c"
 	}
-	__finally548:
+	__finally561:
 #line 720 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 720 "/home/jens/Source/shotwell/src/MediaPage.vala"
diff --git a/src/MediaPage.vala b/src/MediaPage.vala
index 1da615c..89aa2fc 100644
--- a/src/MediaPage.vala
+++ b/src/MediaPage.vala
@@ -467,7 +467,7 @@ public abstract class MediaPage : CheckerboardPage {
         Gtk.ToggleActionEntry tags = { "ViewTags", null, TRANSLATABLE, "<Ctrl><Shift>G",
             TRANSLATABLE, on_display_tags, Config.Facade.get_instance().get_display_photo_tags() };
         tags.label = _("Ta_gs");
-        tags.tooltip = _("Display each photo's tags");
+        tags.tooltip = _("Display each photo’s tags");
         toggle_actions += tags;
         
         return toggle_actions;
diff --git a/src/MetadataWriter.c b/src/MetadataWriter.c
index f8990df..187fbc9 100644
--- a/src/MetadataWriter.c
+++ b/src/MetadataWriter.c
@@ -786,7 +786,7 @@ GType photo_metadata_set_option_get_type (void) G_GNUC_CONST;
 void photo_metadata_set_title (PhotoMetadata* self, const gchar* title, PhotoMetadataSetOption option);
 gchar* media_source_get_comment (MediaSource* self);
 gchar* media_metadata_get_comment (MediaMetadata* self);
-void photo_metadata_set_comment (PhotoMetadata* self, const gchar* comment);
+void photo_metadata_set_comment (PhotoMetadata* self, const gchar* comment, PhotoMetadataSetOption option);
 GType rating_get_type (void) G_GNUC_CONST;
 Rating media_source_get_rating (MediaSource* self);
 Rating photo_metadata_get_rating (PhotoMetadata* self);
@@ -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 __catch541_g_error;
+						goto __catch554_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 __finally541;
-		__catch541_g_error:
+		goto __finally554;
+		__catch554_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"
 		}
-		__finally541:
+		__finally554:
 #line 534 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 534 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
@@ -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 __catch542_database_error;
+						goto __catch555_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 __catch542_database_error;
+						goto __catch555_database_error;
 					}
 					{
 						LibraryPhoto* _tmp76_ = NULL;
@@ -3885,8 +3885,8 @@ static void metadata_writer_on_update_completed (MetadataWriter* self, Backgroun
 				}
 			}
 		}
-		goto __finally542;
-		__catch542_database_error:
+		goto __finally555;
+		__catch555_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"
 		}
-		__finally542:
+		__finally555:
 		{
 			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 __catch543_database_error;
+				goto __catch556_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 __finally543;
-	__catch543_database_error:
+	goto __finally556;
+	__catch556_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"
 	}
-	__finally543:
+	__finally556:
 #line 682 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 682 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
@@ -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 __catch544_g_error;
+			goto __catch557_g_error;
 		}
 #line 39 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 		metadata_writer_commit_job_commit_editable (self, &_inner_error_);
 #line 39 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 4167 "MetadataWriter.c"
-			goto __catch544_g_error;
+			goto __catch557_g_error;
 		}
 	}
-	goto __finally544;
-	__catch544_g_error:
+	goto __finally557;
+	__catch557_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"
 	}
-	__finally544:
+	__finally557:
 #line 37 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 37 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
@@ -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 __finally545;
+				goto __finally558;
 			}
 		}
-		__finally545:
+		__finally558:
 		{
 			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 __finally546;
+				goto __finally559;
 			}
 		}
-		__finally546:
+		__finally559:
 		{
 			LibraryPhoto* _tmp18_ = NULL;
 			GFile* _tmp19_ = NULL;
@@ -4585,7 +4585,7 @@ static gboolean metadata_writer_commit_job_update_metadata (MetadataWriterCommit
 #line 99 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 		_tmp17_ = current_comment;
 #line 99 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
-		photo_metadata_set_comment (_tmp16_, _tmp17_);
+		photo_metadata_set_comment (_tmp16_, _tmp17_, PHOTO_METADATA_SET_OPTION_ALL_DOMAINS);
 #line 100 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 		changed = TRUE;
 #line 4592 "MetadataWriter.c"
diff --git a/src/Page.c b/src/Page.c
index 622f3ce..3ec4a8c 100644
--- a/src/Page.c
+++ b/src/Page.c
@@ -5050,7 +5050,7 @@ static void page_init_load_ui (Page* self, const gchar* ui_filename) {
 #line 561 "/home/jens/Source/shotwell/src/Page.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 5053 "Page.c"
-			goto __catch241_g_error;
+			goto __catch254_g_error;
 		}
 #line 561 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp8_ = self->priv->merge_ids;
@@ -5060,8 +5060,8 @@ static void page_init_load_ui (Page* self, const gchar* ui_filename) {
 		_vala_array_add250 (&self->priv->merge_ids, &self->priv->merge_ids_length1, &self->priv->_merge_ids_size_, _tmp2_);
 #line 5062 "Page.c"
 	}
-	goto __finally241;
-	__catch241_g_error:
+	goto __finally254;
+	__catch254_g_error:
 	{
 		GError* err = NULL;
 		gchar* _tmp9_ = NULL;
@@ -5106,7 +5106,7 @@ static void page_init_load_ui (Page* self, const gchar* ui_filename) {
 		_g_error_free0 (err);
 #line 5108 "Page.c"
 	}
-	__finally241:
+	__finally254:
 #line 560 "/home/jens/Source/shotwell/src/Page.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 560 "/home/jens/Source/shotwell/src/Page.vala"
@@ -15219,7 +15219,7 @@ static void drag_and_drop_handler_on_drag_begin (DragAndDropHandler* self, GdkDr
 #line 2494 "/home/jens/Source/shotwell/src/Page.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 15222 "Page.c"
-			goto __catch242_g_error;
+			goto __catch255_g_error;
 		}
 #line 2495 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp20_ = self->priv->event_source;
@@ -15231,8 +15231,8 @@ static void drag_and_drop_handler_on_drag_begin (DragAndDropHandler* self, GdkDr
 		_g_object_unref0 (icon);
 #line 15233 "Page.c"
 	}
-	goto __finally242;
-	__catch242_g_error:
+	goto __finally255;
+	__catch255_g_error:
 	{
 		GError* err = NULL;
 		ThumbnailSource* _tmp22_ = NULL;
@@ -15262,7 +15262,7 @@ static void drag_and_drop_handler_on_drag_begin (DragAndDropHandler* self, GdkDr
 		_g_error_free0 (err);
 #line 15264 "Page.c"
 	}
-	__finally242:
+	__finally255:
 #line 2493 "/home/jens/Source/shotwell/src/Page.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 2493 "/home/jens/Source/shotwell/src/Page.vala"
diff --git a/src/Photo.c b/src/Photo.c
index 2a8c634..7f36b6f 100644
--- a/src/Photo.c
+++ b/src/Photo.c
@@ -1421,7 +1421,8 @@ typedef enum  {
 	PIXEL_TRANSFORMATION_TYPE_TEMPERATURE,
 	PIXEL_TRANSFORMATION_TYPE_TINT,
 	PIXEL_TRANSFORMATION_TYPE_SATURATION,
-	PIXEL_TRANSFORMATION_TYPE_EXPOSURE
+	PIXEL_TRANSFORMATION_TYPE_EXPOSURE,
+	PIXEL_TRANSFORMATION_TYPE_CONTRAST
 } PixelTransformationType;
 
 struct _EditingToolsRedeyeInstance {
@@ -2318,7 +2319,7 @@ PhotoFileMetadataWriter* photo_file_reader_create_metadata_writer (PhotoFileRead
 void library_monitor_blacklist_file (GFile* file, const gchar* reason);
 void library_monitor_unblacklist_file (GFile* file);
 void photo_set_comment_persistent (Photo* self, const gchar* comment, GError** error);
-void photo_metadata_set_comment (PhotoMetadata* self, const gchar* comment);
+void photo_metadata_set_comment (PhotoMetadata* self, const gchar* comment, PhotoMetadataSetOption option);
 static void photo_real_set_exposure_time (Dateable* base, time_t time);
 gboolean photo_table_set_exposure_time (PhotoTable* self, PhotoID* photo_id, time_t time);
 void photo_set_exposure_time_persistent (Photo* self, time_t time, GError** error);
@@ -2874,14 +2875,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 2878 "Photo.c"
+#line 2879 "Photo.c"
 }
 
 
 static gpointer _thumbnails_ref0 (gpointer self) {
 #line 48 "/home/jens/Source/shotwell/src/Photo.vala"
 	return self ? thumbnails_ref (self) : NULL;
-#line 2885 "Photo.c"
+#line 2886 "Photo.c"
 }
 
 
@@ -2969,14 +2970,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 2973 "Photo.c"
+#line 2974 "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 2980 "Photo.c"
+#line 2981 "Photo.c"
 }
 
 
@@ -3023,21 +3024,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 3027 "Photo.c"
+#line 3028 "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 3034 "Photo.c"
+#line 3035 "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 3041 "Photo.c"
+#line 3042 "Photo.c"
 }
 
 
@@ -3046,7 +3047,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 3050 "Photo.c"
+#line 3051 "Photo.c"
 	}
 }
 
@@ -3056,11 +3057,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 3060 "Photo.c"
+#line 3061 "Photo.c"
 	} else {
 #line 21 "/home/jens/Source/shotwell/src/Photo.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 3064 "Photo.c"
+#line 3065 "Photo.c"
 	}
 }
 
@@ -3068,37 +3069,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 3072 "Photo.c"
+#line 3073 "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 3079 "Photo.c"
+#line 3080 "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 3086 "Photo.c"
+#line 3087 "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 3090 "Photo.c"
+#line 3091 "Photo.c"
 		}
 #line 21 "/home/jens/Source/shotwell/src/Photo.vala"
 		value->data[0].v_pointer = photo_import_params_ref (object);
-#line 3094 "Photo.c"
+#line 3095 "Photo.c"
 	} else {
 #line 21 "/home/jens/Source/shotwell/src/Photo.vala"
 		value->data[0].v_pointer = NULL;
-#line 3098 "Photo.c"
+#line 3099 "Photo.c"
 	}
 #line 21 "/home/jens/Source/shotwell/src/Photo.vala"
 	return NULL;
-#line 3102 "Photo.c"
+#line 3103 "Photo.c"
 }
 
 
@@ -3109,25 +3110,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 3113 "Photo.c"
+#line 3114 "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 3119 "Photo.c"
+#line 3120 "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 3123 "Photo.c"
+#line 3124 "Photo.c"
 	} else {
 #line 21 "/home/jens/Source/shotwell/src/Photo.vala"
 		*object_p = photo_import_params_ref (value->data[0].v_pointer);
-#line 3127 "Photo.c"
+#line 3128 "Photo.c"
 	}
 #line 21 "/home/jens/Source/shotwell/src/Photo.vala"
 	return NULL;
-#line 3131 "Photo.c"
+#line 3132 "Photo.c"
 }
 
 
@@ -3141,7 +3142,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 3145 "Photo.c"
+#line 3146 "Photo.c"
 }
 
 
@@ -3150,7 +3151,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 3154 "Photo.c"
+#line 3155 "Photo.c"
 }
 
 
@@ -3170,17 +3171,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 3174 "Photo.c"
+#line 3175 "Photo.c"
 	} else {
 #line 21 "/home/jens/Source/shotwell/src/Photo.vala"
 		value->data[0].v_pointer = NULL;
-#line 3178 "Photo.c"
+#line 3179 "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 3184 "Photo.c"
+#line 3185 "Photo.c"
 	}
 }
 
@@ -3199,17 +3200,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 3203 "Photo.c"
+#line 3204 "Photo.c"
 	} else {
 #line 21 "/home/jens/Source/shotwell/src/Photo.vala"
 		value->data[0].v_pointer = NULL;
-#line 3207 "Photo.c"
+#line 3208 "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 3213 "Photo.c"
+#line 3214 "Photo.c"
 	}
 }
 
@@ -3219,7 +3220,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 3223 "Photo.c"
+#line 3224 "Photo.c"
 }
 
 
@@ -3235,7 +3236,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 3239 "Photo.c"
+#line 3240 "Photo.c"
 }
 
 
@@ -3261,7 +3262,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 3265 "Photo.c"
+#line 3266 "Photo.c"
 }
 
 
@@ -3286,7 +3287,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 3290 "Photo.c"
+#line 3291 "Photo.c"
 }
 
 
@@ -3299,7 +3300,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 3303 "Photo.c"
+#line 3304 "Photo.c"
 	}
 }
 
@@ -3310,7 +3311,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 3314 "Photo.c"
+#line 3315 "Photo.c"
 }
 
 
@@ -3325,14 +3326,14 @@ gboolean photo_transformation_state_is_broken (PhotoTransformationState* self) {
 	result = _tmp0_;
 #line 76 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 3329 "Photo.c"
+#line 3330 "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 3336 "Photo.c"
+#line 3337 "Photo.c"
 }
 
 
@@ -3347,7 +3348,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 3351 "Photo.c"
+#line 3352 "Photo.c"
 }
 
 
@@ -3356,7 +3357,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 3360 "Photo.c"
+#line 3361 "Photo.c"
 }
 
 
@@ -3366,7 +3367,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 3370 "Photo.c"
+#line 3371 "Photo.c"
 }
 
 
@@ -3388,7 +3389,7 @@ gboolean rating_can_increase (Rating self) {
 	result = self < RATING_FIVE;
 #line 90 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 3392 "Photo.c"
+#line 3393 "Photo.c"
 }
 
 
@@ -3398,7 +3399,7 @@ gboolean rating_can_decrease (Rating self) {
 	result = self > RATING_REJECTED;
 #line 94 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 3402 "Photo.c"
+#line 3403 "Photo.c"
 }
 
 
@@ -3409,17 +3410,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 3413 "Photo.c"
+#line 3414 "Photo.c"
 	} else {
 #line 98 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = FALSE;
-#line 3417 "Photo.c"
+#line 3418 "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 3423 "Photo.c"
+#line 3424 "Photo.c"
 }
 
 
@@ -3433,17 +3434,17 @@ Rating rating_increase (Rating self) {
 	if (_tmp1_) {
 #line 102 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self + 1;
-#line 3437 "Photo.c"
+#line 3438 "Photo.c"
 	} else {
 #line 102 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self;
-#line 3441 "Photo.c"
+#line 3442 "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 3447 "Photo.c"
+#line 3448 "Photo.c"
 }
 
 
@@ -3457,17 +3458,17 @@ Rating rating_decrease (Rating self) {
 	if (_tmp1_) {
 #line 106 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self - 1;
-#line 3461 "Photo.c"
+#line 3462 "Photo.c"
 	} else {
 #line 106 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self;
-#line 3465 "Photo.c"
+#line 3466 "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 3471 "Photo.c"
+#line 3472 "Photo.c"
 }
 
 
@@ -3477,73 +3478,73 @@ gint rating_serialize (Rating self) {
 	switch (self) {
 #line 110 "/home/jens/Source/shotwell/src/Photo.vala"
 		case RATING_REJECTED:
-#line 3481 "Photo.c"
+#line 3482 "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 3487 "Photo.c"
+#line 3488 "Photo.c"
 		}
 #line 110 "/home/jens/Source/shotwell/src/Photo.vala"
 		case RATING_UNRATED:
-#line 3491 "Photo.c"
+#line 3492 "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 3497 "Photo.c"
+#line 3498 "Photo.c"
 		}
 #line 110 "/home/jens/Source/shotwell/src/Photo.vala"
 		case RATING_ONE:
-#line 3501 "Photo.c"
+#line 3502 "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 3507 "Photo.c"
+#line 3508 "Photo.c"
 		}
 #line 110 "/home/jens/Source/shotwell/src/Photo.vala"
 		case RATING_TWO:
-#line 3511 "Photo.c"
+#line 3512 "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 3517 "Photo.c"
+#line 3518 "Photo.c"
 		}
 #line 110 "/home/jens/Source/shotwell/src/Photo.vala"
 		case RATING_THREE:
-#line 3521 "Photo.c"
+#line 3522 "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 3527 "Photo.c"
+#line 3528 "Photo.c"
 		}
 #line 110 "/home/jens/Source/shotwell/src/Photo.vala"
 		case RATING_FOUR:
-#line 3531 "Photo.c"
+#line 3532 "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 3537 "Photo.c"
+#line 3538 "Photo.c"
 		}
 #line 110 "/home/jens/Source/shotwell/src/Photo.vala"
 		case RATING_FIVE:
-#line 3541 "Photo.c"
+#line 3542 "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 3547 "Photo.c"
+#line 3548 "Photo.c"
 		}
 		default:
 		{
@@ -3551,7 +3552,7 @@ gint rating_serialize (Rating self) {
 			result = 0;
 #line 126 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 3555 "Photo.c"
+#line 3556 "Photo.c"
 		}
 	}
 }
@@ -3569,7 +3570,7 @@ Rating rating_unserialize (gint value) {
 		result = RATING_FIVE;
 #line 132 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 3573 "Photo.c"
+#line 3574 "Photo.c"
 	} else {
 		gint _tmp1_ = 0;
 #line 133 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -3580,7 +3581,7 @@ Rating rating_unserialize (gint value) {
 			result = RATING_REJECTED;
 #line 134 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 3584 "Photo.c"
+#line 3585 "Photo.c"
 		}
 	}
 #line 136 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -3589,73 +3590,73 @@ Rating rating_unserialize (gint value) {
 	switch (_tmp2_) {
 #line 136 "/home/jens/Source/shotwell/src/Photo.vala"
 		case -1:
-#line 3593 "Photo.c"
+#line 3594 "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 3599 "Photo.c"
+#line 3600 "Photo.c"
 		}
 #line 136 "/home/jens/Source/shotwell/src/Photo.vala"
 		case 0:
-#line 3603 "Photo.c"
+#line 3604 "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 3609 "Photo.c"
+#line 3610 "Photo.c"
 		}
 #line 136 "/home/jens/Source/shotwell/src/Photo.vala"
 		case 1:
-#line 3613 "Photo.c"
+#line 3614 "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 3619 "Photo.c"
+#line 3620 "Photo.c"
 		}
 #line 136 "/home/jens/Source/shotwell/src/Photo.vala"
 		case 2:
-#line 3623 "Photo.c"
+#line 3624 "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 3629 "Photo.c"
+#line 3630 "Photo.c"
 		}
 #line 136 "/home/jens/Source/shotwell/src/Photo.vala"
 		case 3:
-#line 3633 "Photo.c"
+#line 3634 "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 3639 "Photo.c"
+#line 3640 "Photo.c"
 		}
 #line 136 "/home/jens/Source/shotwell/src/Photo.vala"
 		case 4:
-#line 3643 "Photo.c"
+#line 3644 "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 3649 "Photo.c"
+#line 3650 "Photo.c"
 		}
 #line 136 "/home/jens/Source/shotwell/src/Photo.vala"
 		case 5:
-#line 3653 "Photo.c"
+#line 3654 "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 3659 "Photo.c"
+#line 3660 "Photo.c"
 		}
 		default:
 		{
@@ -3663,7 +3664,7 @@ Rating rating_unserialize (gint value) {
 			result = RATING_UNRATED;
 #line 152 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 3667 "Photo.c"
+#line 3668 "Photo.c"
 		}
 	}
 }
@@ -3690,7 +3691,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 3694 "Photo.c"
+#line 3695 "Photo.c"
 }
 
 
@@ -3703,7 +3704,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 3707 "Photo.c"
+#line 3708 "Photo.c"
 }
 
 
@@ -3722,14 +3723,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 3726 "Photo.c"
+#line 3727 "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 3733 "Photo.c"
+#line 3734 "Photo.c"
 }
 
 
@@ -3846,7 +3847,7 @@ Photo* photo_construct (GType object_type, PhotoRow* row) {
 	_tmp22_ = basename;
 #line 412 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp22_ != NULL) {
-#line 3850 "Photo.c"
+#line 3851 "Photo.c"
 		const gchar* _tmp23_ = NULL;
 		gchar* _tmp24_ = NULL;
 #line 413 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -3857,7 +3858,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 3861 "Photo.c"
+#line 3862 "Photo.c"
 	}
 #line 415 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp25_ = self->priv->file_title;
@@ -3865,7 +3866,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 3869 "Photo.c"
+#line 3870 "Photo.c"
 		PhotoRow* _tmp27_ = NULL;
 		BackingPhotoRow* _tmp28_ = NULL;
 		const gchar* _tmp29_ = NULL;
@@ -3882,7 +3883,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 3886 "Photo.c"
+#line 3887 "Photo.c"
 	}
 #line 418 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp31_ = row;
@@ -3892,7 +3893,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 3896 "Photo.c"
+#line 3897 "Photo.c"
 		BackingPhotoRow* e = NULL;
 		PhotoRow* _tmp34_ = NULL;
 		BackingPhotoID _tmp35_ = {0};
@@ -3910,7 +3911,7 @@ Photo* photo_construct (GType object_type, PhotoRow* row) {
 		_tmp37_ = e;
 #line 420 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp37_ != NULL) {
-#line 3914 "Photo.c"
+#line 3915 "Photo.c"
 			BackingPhotoRow* _tmp38_ = NULL;
 			BackingPhotoRow* _tmp39_ = NULL;
 			PhotoBackingReaders* _tmp40_ = NULL;
@@ -3943,7 +3944,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 3947 "Photo.c"
+#line 3948 "Photo.c"
 		} else {
 			{
 				PhotoTable* _tmp46_ = NULL;
@@ -3963,8 +3964,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 3967 "Photo.c"
-						goto __catch243_database_error;
+#line 3968 "Photo.c"
+						goto __catch256_database_error;
 					}
 #line 425 "/home/jens/Source/shotwell/src/Photo.vala"
 					_backing_photo_row_unref0 (e);
@@ -3976,11 +3977,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 3980 "Photo.c"
+#line 3981 "Photo.c"
 				}
 			}
-			goto __finally243;
-			__catch243_database_error:
+			goto __finally256;
+			__catch256_database_error:
 			{
 				GError* err = NULL;
 #line 424 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -3989,9 +3990,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 3993 "Photo.c"
+#line 3994 "Photo.c"
 			}
-			__finally243:
+			__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"
@@ -4004,15 +4005,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 4008 "Photo.c"
+#line 4009 "Photo.c"
 			}
 #line 432 "/home/jens/Source/shotwell/src/Photo.vala"
 			photo_internal_remove_all_transformations (self, FALSE);
-#line 4012 "Photo.c"
+#line 4013 "Photo.c"
 		}
 #line 418 "/home/jens/Source/shotwell/src/Photo.vala"
 		_backing_photo_row_unref0 (e);
-#line 4016 "Photo.c"
+#line 4017 "Photo.c"
 	}
 #line 436 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp49_ = row;
@@ -4022,7 +4023,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 4026 "Photo.c"
+#line 4027 "Photo.c"
 		GeeHashMap* _tmp52_ = NULL;
 		gint _tmp53_ = 0;
 		RawDeveloper* _tmp54_ = NULL;
@@ -4034,7 +4035,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 4038 "Photo.c"
+#line 4039 "Photo.c"
 		{
 			RawDeveloper* d_collection = NULL;
 			gint d_collection_length1 = 0;
@@ -4046,11 +4047,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 4050 "Photo.c"
+#line 4051 "Photo.c"
 				RawDeveloper d = 0;
 #line 439 "/home/jens/Source/shotwell/src/Photo.vala"
 				d = d_collection[d_it];
-#line 4054 "Photo.c"
+#line 4055 "Photo.c"
 				{
 					BackingPhotoID id = {0};
 					PhotoRow* _tmp55_ = NULL;
@@ -4078,7 +4079,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 4082 "Photo.c"
+#line 4083 "Photo.c"
 						BackingPhotoRow* bpr = NULL;
 						BackingPhotoID _tmp61_ = {0};
 						BackingPhotoRow* _tmp62_ = NULL;
@@ -4093,7 +4094,7 @@ Photo* photo_construct (GType object_type, PhotoRow* row) {
 						_tmp63_ = bpr;
 #line 443 "/home/jens/Source/shotwell/src/Photo.vala"
 						if (_tmp63_ != NULL) {
-#line 4097 "Photo.c"
+#line 4098 "Photo.c"
 							GeeHashMap* _tmp64_ = NULL;
 							RawDeveloper _tmp65_ = 0;
 							BackingPhotoRow* _tmp66_ = NULL;
@@ -4105,17 +4106,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 4109 "Photo.c"
+#line 4110 "Photo.c"
 						}
 #line 441 "/home/jens/Source/shotwell/src/Photo.vala"
 						_backing_photo_row_unref0 (bpr);
-#line 4113 "Photo.c"
+#line 4114 "Photo.c"
 					}
 				}
 			}
 #line 439 "/home/jens/Source/shotwell/src/Photo.vala"
 			d_collection = (g_free (d_collection), NULL);
-#line 4119 "Photo.c"
+#line 4120 "Photo.c"
 		}
 	}
 #line 450 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -4126,7 +4127,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 4130 "Photo.c"
+#line 4131 "Photo.c"
 		GeeHashMap* _tmp71_ = NULL;
 		PhotoRow* _tmp72_ = NULL;
 		RawDeveloper _tmp73_ = 0;
@@ -4141,15 +4142,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 4145 "Photo.c"
+#line 4146 "Photo.c"
 	} else {
 #line 450 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp67_ = FALSE;
-#line 4149 "Photo.c"
+#line 4150 "Photo.c"
 	}
 #line 450 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp67_) {
-#line 4153 "Photo.c"
+#line 4154 "Photo.c"
 		BackingPhotoRow* r = NULL;
 		GeeHashMap* _tmp75_ = NULL;
 		PhotoRow* _tmp76_ = NULL;
@@ -4189,7 +4190,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 4193 "Photo.c"
+#line 4194 "Photo.c"
 	}
 #line 456 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp85_ = self->priv->readers;
@@ -4197,7 +4198,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 4201 "Photo.c"
+#line 4202 "Photo.c"
 		BackingPhotoRow* _tmp87_ = NULL;
 		BackingPhotoRow* _tmp88_ = NULL;
 #line 457 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -4208,7 +4209,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 4212 "Photo.c"
+#line 4213 "Photo.c"
 	} else {
 		PhotoRow* _tmp89_ = NULL;
 		BackingPhotoRow* _tmp90_ = NULL;
@@ -4221,7 +4222,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 4225 "Photo.c"
+#line 4226 "Photo.c"
 			PhotoRow* _tmp92_ = NULL;
 			BackingPhotoRow* _tmp93_ = NULL;
 			BackingPhotoRow* _tmp94_ = NULL;
@@ -4235,7 +4236,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 4239 "Photo.c"
+#line 4240 "Photo.c"
 		} else {
 			GeeHashMap* _tmp95_ = NULL;
 			PhotoRow* _tmp96_ = NULL;
@@ -4251,7 +4252,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 4255 "Photo.c"
+#line 4256 "Photo.c"
 				GeeHashMap* _tmp99_ = NULL;
 				PhotoRow* _tmp100_ = NULL;
 				RawDeveloper _tmp101_ = 0;
@@ -4268,7 +4269,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 4272 "Photo.c"
+#line 4273 "Photo.c"
 			} else {
 				PhotoRow* _tmp103_ = NULL;
 				BackingPhotoRow* _tmp104_ = NULL;
@@ -4283,7 +4284,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 4287 "Photo.c"
+#line 4288 "Photo.c"
 			}
 		}
 	}
@@ -4297,7 +4298,7 @@ Photo* photo_construct (GType object_type, PhotoRow* row) {
 	_g_free0 (basename);
 #line 399 "/home/jens/Source/shotwell/src/Photo.vala"
 	return self;
-#line 4301 "Photo.c"
+#line 4302 "Photo.c"
 }
 
 
@@ -4309,7 +4310,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 4313 "Photo.c"
+#line 4314 "Photo.c"
 }
 
 
@@ -4323,7 +4324,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 4327 "Photo.c"
+#line 4328 "Photo.c"
 		guint _tmp1_ = 0U;
 #line 482 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp1_ = photo_discard_source_id;
@@ -4331,7 +4332,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 4335 "Photo.c"
+#line 4336 "Photo.c"
 	}
 }
 
@@ -4349,7 +4350,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 4353 "Photo.c"
+#line 4354 "Photo.c"
 }
 
 
@@ -4358,14 +4359,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 4362 "Photo.c"
+#line 4363 "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 4369 "Photo.c"
+#line 4370 "Photo.c"
 }
 
 
@@ -4374,14 +4375,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 4378 "Photo.c"
+#line 4379 "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 4385 "Photo.c"
+#line 4386 "Photo.c"
 }
 
 
@@ -4390,7 +4391,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 4394 "Photo.c"
+#line 4395 "Photo.c"
 }
 
 
@@ -4402,7 +4403,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 4406 "Photo.c"
+#line 4407 "Photo.c"
 }
 
 
@@ -4411,7 +4412,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 4415 "Photo.c"
+#line 4416 "Photo.c"
 }
 
 
@@ -4423,7 +4424,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 4427 "Photo.c"
+#line 4428 "Photo.c"
 }
 
 
@@ -4432,7 +4433,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 4436 "Photo.c"
+#line 4437 "Photo.c"
 }
 
 
@@ -4444,7 +4445,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 4448 "Photo.c"
+#line 4449 "Photo.c"
 }
 
 
@@ -4453,7 +4454,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 4457 "Photo.c"
+#line 4458 "Photo.c"
 }
 
 
@@ -4465,7 +4466,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 4469 "Photo.c"
+#line 4470 "Photo.c"
 }
 
 
@@ -4474,7 +4475,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 4478 "Photo.c"
+#line 4479 "Photo.c"
 }
 
 
@@ -4495,14 +4496,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 4499 "Photo.c"
+#line 4500 "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 4506 "Photo.c"
+#line 4507 "Photo.c"
 		{
 			PhotoBackingReaders* _tmp1_ = NULL;
 			PhotoFileReader* _tmp2_ = NULL;
@@ -4512,7 +4513,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 4516 "Photo.c"
+#line 4517 "Photo.c"
 				PhotoBackingReaders* _tmp3_ = NULL;
 				PhotoFileReader* _tmp4_ = NULL;
 				GFile* _tmp5_ = NULL;
@@ -4526,17 +4527,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 4530 "Photo.c"
+#line 4531 "Photo.c"
 			}
 		}
-		__finally244:
+		__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 4540 "Photo.c"
+#line 4541 "Photo.c"
 		}
 #line 518 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -4546,7 +4547,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 4550 "Photo.c"
+#line 4551 "Photo.c"
 		}
 	}
 #line 523 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -4555,12 +4556,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 4559 "Photo.c"
+#line 4560 "Photo.c"
 		gint _tmp8_ = 0;
 		RawDeveloper* _tmp9_ = NULL;
 #line 526 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp9_ = raw_developer_as_array (&_tmp8_);
-#line 4564 "Photo.c"
+#line 4565 "Photo.c"
 		{
 			RawDeveloper* d_collection = NULL;
 			gint d_collection_length1 = 0;
@@ -4572,30 +4573,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 4576 "Photo.c"
+#line 4577 "Photo.c"
 				RawDeveloper d = 0;
 #line 526 "/home/jens/Source/shotwell/src/Photo.vala"
 				d = d_collection[d_it];
-#line 4580 "Photo.c"
+#line 4581 "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 4587 "Photo.c"
+#line 4588 "Photo.c"
 				}
 			}
 #line 526 "/home/jens/Source/shotwell/src/Photo.vala"
 			d_collection = (g_free (d_collection), NULL);
-#line 4592 "Photo.c"
+#line 4593 "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 4599 "Photo.c"
+#line 4600 "Photo.c"
 		{
 			gboolean _tmp12_ = FALSE;
 			GFile* _tmp13_ = NULL;
@@ -4608,15 +4609,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 4612 "Photo.c"
-				goto __catch245_g_error;
+#line 4613 "Photo.c"
+				goto __catch258_g_error;
 			}
 #line 533 "/home/jens/Source/shotwell/src/Photo.vala"
 			ret = _tmp12_;
-#line 4617 "Photo.c"
+#line 4618 "Photo.c"
 		}
-		goto __finally245;
-		__catch245_g_error:
+		goto __finally258;
+		__catch258_g_error:
 		{
 			GError* err = NULL;
 			GFile* _tmp15_ = NULL;
@@ -4654,9 +4655,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 4658 "Photo.c"
+#line 4659 "Photo.c"
 		}
-		__finally245:
+		__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"
@@ -4665,7 +4666,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 4669 "Photo.c"
+#line 4670 "Photo.c"
 		}
 	}
 #line 542 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -4680,21 +4681,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 4684 "Photo.c"
+#line 4685 "Photo.c"
 	}
 #line 542 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp23_) {
-#line 4688 "Photo.c"
+#line 4689 "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 4694 "Photo.c"
+#line 4695 "Photo.c"
 	} else {
 #line 542 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp22_ = FALSE;
-#line 4698 "Photo.c"
+#line 4699 "Photo.c"
 	}
 #line 542 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp22_;
@@ -4702,7 +4703,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 4706 "Photo.c"
+#line 4707 "Photo.c"
 }
 
 
@@ -4727,11 +4728,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 4731 "Photo.c"
+#line 4732 "Photo.c"
 	}
 #line 551 "/home/jens/Source/shotwell/src/Photo.vala"
 	backing_row = NULL;
-#line 4735 "Photo.c"
+#line 4736 "Photo.c"
 	{
 		BackingPhotoRow* _tmp2_ = NULL;
 		BackingPhotoTable* _tmp3_ = NULL;
@@ -4758,8 +4759,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 4762 "Photo.c"
-				goto __catch246_database_error;
+#line 4763 "Photo.c"
+				goto __catch259_database_error;
 			}
 #line 553 "/home/jens/Source/shotwell/src/Photo.vala"
 			_backing_photo_row_unref0 (backing_row);
@@ -4769,7 +4770,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 4773 "Photo.c"
+#line 4774 "Photo.c"
 		}
 #line 553 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp8_ = _tmp2_;
@@ -4781,10 +4782,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 4785 "Photo.c"
+#line 4786 "Photo.c"
 	}
-	goto __finally246;
-	__catch246_database_error:
+	goto __finally259;
+	__catch259_database_error:
 	{
 		GError* err = NULL;
 		gchar* _tmp9_ = NULL;
@@ -4809,9 +4810,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 4813 "Photo.c"
+#line 4814 "Photo.c"
 	}
-	__finally246:
+	__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"
@@ -4822,13 +4823,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 4826 "Photo.c"
+#line 4827 "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 4832 "Photo.c"
+#line 4833 "Photo.c"
 		{
 			BackingPhotoTable* _tmp14_ = NULL;
 			BackingPhotoTable* _tmp15_ = NULL;
@@ -4847,8 +4848,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 4851 "Photo.c"
-					goto __catch247_database_error;
+#line 4852 "Photo.c"
+					goto __catch260_database_error;
 				}
 #line 560 "/home/jens/Source/shotwell/src/Photo.vala"
 				_backing_photo_row_unref0 (backing_row);
@@ -4858,11 +4859,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 4862 "Photo.c"
+#line 4863 "Photo.c"
 			}
 		}
-		goto __finally247;
-		__catch247_database_error:
+		goto __finally260;
+		__catch260_database_error:
 		{
 			GError* err = NULL;
 #line 559 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -4871,9 +4872,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 4875 "Photo.c"
+#line 4876 "Photo.c"
 		}
-		__finally247:
+		__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"
@@ -4884,7 +4885,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 4888 "Photo.c"
+#line 4889 "Photo.c"
 		}
 #line 564 "/home/jens/Source/shotwell/src/Photo.vala"
 		result = NULL;
@@ -4892,13 +4893,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 4896 "Photo.c"
+#line 4897 "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 4902 "Photo.c"
+#line 4903 "Photo.c"
 }
 
 
@@ -4907,14 +4908,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 4911 "Photo.c"
+#line 4912 "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 4918 "Photo.c"
+#line 4919 "Photo.c"
 		{
 			gboolean _tmp1_ = FALSE;
 			GeeHashMap* _tmp2_ = NULL;
@@ -4928,7 +4929,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 4932 "Photo.c"
+#line 4933 "Photo.c"
 				GeeHashMap* _tmp5_ = NULL;
 				RawDeveloper _tmp6_ = 0;
 				gpointer _tmp7_ = NULL;
@@ -4951,35 +4952,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 4955 "Photo.c"
+#line 4956 "Photo.c"
 			} else {
 #line 574 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp1_ = FALSE;
-#line 4959 "Photo.c"
+#line 4960 "Photo.c"
 			}
 #line 574 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp1_;
-#line 4963 "Photo.c"
+#line 4964 "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 4970 "Photo.c"
+#line 4971 "Photo.c"
 			}
 #line 574 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 4974 "Photo.c"
+#line 4975 "Photo.c"
 		}
-		__finally248:
+		__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 4983 "Photo.c"
+#line 4984 "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);
@@ -4987,7 +4988,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 4991 "Photo.c"
+#line 4992 "Photo.c"
 	}
 }
 
@@ -4998,14 +4999,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 5002 "Photo.c"
+#line 5003 "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 5009 "Photo.c"
+#line 5010 "Photo.c"
 		{
 			GeeHashMap* _tmp1_ = NULL;
 			RawDeveloper _tmp2_ = 0;
@@ -5020,28 +5021,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 5024 "Photo.c"
+#line 5025 "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 5031 "Photo.c"
+#line 5032 "Photo.c"
 				}
 #line 583 "/home/jens/Source/shotwell/src/Photo.vala"
 				return result;
-#line 5035 "Photo.c"
+#line 5036 "Photo.c"
 			}
 		}
-		__finally249:
+		__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 5045 "Photo.c"
+#line 5046 "Photo.c"
 		}
 #line 581 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -5051,7 +5052,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 5055 "Photo.c"
+#line 5056 "Photo.c"
 		}
 	}
 #line 586 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -5060,27 +5061,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 5064 "Photo.c"
+#line 5065 "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 5070 "Photo.c"
+#line 5071 "Photo.c"
 		}
 #line 586 "/home/jens/Source/shotwell/src/Photo.vala"
 		case RAW_DEVELOPER_CAMERA:
-#line 5074 "Photo.c"
+#line 5075 "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 5080 "Photo.c"
+#line 5081 "Photo.c"
 		}
 #line 586 "/home/jens/Source/shotwell/src/Photo.vala"
 		case RAW_DEVELOPER_EMBEDDED:
-#line 5084 "Photo.c"
+#line 5085 "Photo.c"
 		{
 			{
 				PhotoMetadata* meta = NULL;
@@ -5095,8 +5096,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 5099 "Photo.c"
-					goto __catch250_g_error;
+#line 5100 "Photo.c"
+					goto __catch263_g_error;
 				}
 #line 596 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp8_ = meta;
@@ -5108,7 +5109,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 5112 "Photo.c"
+#line 5113 "Photo.c"
 					PhotoPreview* prev = NULL;
 					PhotoMetadata* _tmp11_ = NULL;
 					guint _tmp12_ = 0U;
@@ -5144,7 +5145,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 5148 "Photo.c"
+#line 5149 "Photo.c"
 					}
 #line 605 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp15_ = prev;
@@ -5162,7 +5163,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 5166 "Photo.c"
+#line 5167 "Photo.c"
 						Dimensions _tmp22_ = {0};
 						gint _tmp23_ = 0;
 #line 608 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -5171,7 +5172,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 5175 "Photo.c"
+#line 5176 "Photo.c"
 					} else {
 						Dimensions _tmp24_ = {0};
 						gint _tmp25_ = 0;
@@ -5181,7 +5182,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 5185 "Photo.c"
+#line 5186 "Photo.c"
 					}
 #line 608 "/home/jens/Source/shotwell/src/Photo.vala"
 					preview_major_axis = _tmp17_;
@@ -5197,7 +5198,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 5201 "Photo.c"
+#line 5202 "Photo.c"
 					}
 #line 613 "/home/jens/Source/shotwell/src/Photo.vala"
 					result = TRUE;
@@ -5207,7 +5208,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 5211 "Photo.c"
+#line 5212 "Photo.c"
 				}
 #line 617 "/home/jens/Source/shotwell/src/Photo.vala"
 				result = FALSE;
@@ -5215,10 +5216,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 5219 "Photo.c"
+#line 5220 "Photo.c"
 			}
-			goto __finally250;
-			__catch250_g_error:
+			goto __finally263;
+			__catch263_g_error:
 			{
 				GError* e = NULL;
 				GError* _tmp27_ = NULL;
@@ -5235,9 +5236,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 5239 "Photo.c"
+#line 5240 "Photo.c"
 			}
-			__finally250:
+			__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"
@@ -5246,19 +5247,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 5250 "Photo.c"
+#line 5251 "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 5256 "Photo.c"
+#line 5257 "Photo.c"
 		}
 		default:
 		{
 #line 624 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_assert_not_reached ();
-#line 5262 "Photo.c"
+#line 5263 "Photo.c"
 		}
 	}
 }
@@ -5289,7 +5290,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 5293 "Photo.c"
+#line 5294 "Photo.c"
 	}
 	{
 		GeeHashMap* _tmp3_ = NULL;
@@ -5297,7 +5298,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 5301 "Photo.c"
+#line 5302 "Photo.c"
 		{
 			GeeHashMap* _tmp4_ = NULL;
 			RawDeveloper _tmp5_ = 0;
@@ -5310,16 +5311,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 5314 "Photo.c"
+#line 5315 "Photo.c"
 		}
-		__finally251:
+		__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 5323 "Photo.c"
+#line 5324 "Photo.c"
 		}
 #line 633 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -5327,7 +5328,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 5331 "Photo.c"
+#line 5332 "Photo.c"
 		}
 	}
 #line 636 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -5338,7 +5339,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 5342 "Photo.c"
+#line 5343 "Photo.c"
 }
 
 
@@ -5411,7 +5412,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 5415 "Photo.c"
+#line 5416 "Photo.c"
 	}
 #line 644 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp5_ = info;
@@ -5441,7 +5442,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 5445 "Photo.c"
+#line 5446 "Photo.c"
 	}
 #line 650 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp10_ = interrogator;
@@ -5455,7 +5456,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 5459 "Photo.c"
+#line 5460 "Photo.c"
 	} else {
 		PhotoFileInterrogator* _tmp14_ = NULL;
 		gboolean _tmp15_ = FALSE;
@@ -5465,7 +5466,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 5469 "Photo.c"
+#line 5470 "Photo.c"
 	}
 #line 651 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp12_) {
@@ -5479,7 +5480,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 5483 "Photo.c"
+#line 5484 "Photo.c"
 	}
 #line 657 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp16_ = bpr;
@@ -5511,7 +5512,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 5515 "Photo.c"
+#line 5516 "Photo.c"
 		DetectedPhotoInformation* _tmp28_ = NULL;
 		PhotoMetadata* _tmp29_ = NULL;
 		Orientation _tmp30_ = 0;
@@ -5523,11 +5524,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 5527 "Photo.c"
+#line 5528 "Photo.c"
 	} else {
 #line 661 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp25_ = ORIENTATION_TOP_LEFT;
-#line 5531 "Photo.c"
+#line 5532 "Photo.c"
 	}
 #line 660 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp31_ = bpr;
@@ -5557,7 +5558,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 5561 "Photo.c"
+#line 5562 "Photo.c"
 	}
 #line 665 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp35_ = photo_table_get_instance ();
@@ -5589,7 +5590,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 5593 "Photo.c"
+#line 5594 "Photo.c"
 	}
 #line 639 "/home/jens/Source/shotwell/src/Photo.vala"
 	_detected_photo_information_unref0 (detected);
@@ -5599,7 +5600,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 5603 "Photo.c"
+#line 5604 "Photo.c"
 }
 
 
@@ -5620,7 +5621,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 5624 "Photo.c"
+#line 5625 "Photo.c"
 		{
 			{
 				BackingPhotoRow* _tmp1_ = NULL;
@@ -5660,8 +5661,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 5664 "Photo.c"
-					goto __catch252_g_error;
+#line 5665 "Photo.c"
+					goto __catch265_g_error;
 				}
 #line 678 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp7_ = _tmp1_;
@@ -5673,14 +5674,14 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
 				bps = _tmp7_;
 #line 679 "/home/jens/Source/shotwell/src/Photo.vala"
 				pix = NULL;
-#line 5677 "Photo.c"
+#line 5678 "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 5684 "Photo.c"
+#line 5685 "Photo.c"
 					{
 						GdkPixbuf* _tmp9_ = NULL;
 						Scaling _tmp10_ = {0};
@@ -5694,8 +5695,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 5698 "Photo.c"
-							goto __finally253;
+#line 5699 "Photo.c"
+							goto __finally266;
 						}
 #line 685 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp12_ = _tmp9_;
@@ -5707,16 +5708,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 5711 "Photo.c"
+#line 5712 "Photo.c"
 					}
-					__finally253:
+					__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 5720 "Photo.c"
+#line 5721 "Photo.c"
 					}
 #line 680 "/home/jens/Source/shotwell/src/Photo.vala"
 					if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -5724,8 +5725,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 5728 "Photo.c"
-						goto __catch252_g_error;
+#line 5729 "Photo.c"
+						goto __catch265_g_error;
 					}
 				}
 #line 688 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -5738,14 +5739,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 5742 "Photo.c"
+#line 5743 "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 5749 "Photo.c"
+#line 5750 "Photo.c"
 							{
 								RawDeveloper _tmp16_ = 0;
 								BackingPhotoRow* _tmp17_ = NULL;
@@ -5757,15 +5758,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 5761 "Photo.c"
-									goto __catch254_g_error;
+#line 5762 "Photo.c"
+									goto __catch267_g_error;
 								}
 #line 719 "/home/jens/Source/shotwell/src/Photo.vala"
 								photo_notify_raw_development_modified (self);
-#line 5766 "Photo.c"
+#line 5767 "Photo.c"
 							}
-							goto __finally254;
-							__catch254_g_error:
+							goto __finally267;
+							__catch267_g_error:
 							{
 								GError* e = NULL;
 								GError* _tmp18_ = NULL;
@@ -5782,13 +5783,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 5786 "Photo.c"
+#line 5787 "Photo.c"
 							}
-							__finally254:
+							__finally267:
 #line 715 "/home/jens/Source/shotwell/src/Photo.vala"
 							if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 5791 "Photo.c"
-								goto __catch252_g_error;
+#line 5792 "Photo.c"
+								goto __catch265_g_error;
 							}
 						}
 					}
@@ -5796,7 +5797,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 5800 "Photo.c"
+#line 5801 "Photo.c"
 				}
 #line 694 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp20_ = bps;
@@ -5812,8 +5813,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 5816 "Photo.c"
-					goto __catch252_g_error;
+#line 5817 "Photo.c"
+					goto __catch265_g_error;
 				}
 #line 695 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp23_ = writer;
@@ -5829,8 +5830,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 5833 "Photo.c"
-					goto __catch252_g_error;
+#line 5834 "Photo.c"
+					goto __catch265_g_error;
 				}
 #line 703 "/home/jens/Source/shotwell/src/Photo.vala"
 				wrote_img_to_disk = TRUE;
@@ -5846,8 +5847,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 5850 "Photo.c"
-					goto __catch252_g_error;
+#line 5851 "Photo.c"
+					goto __catch265_g_error;
 				}
 #line 709 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp26_ = bps;
@@ -5867,8 +5868,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 5871 "Photo.c"
-					goto __catch252_g_error;
+#line 5872 "Photo.c"
+					goto __catch265_g_error;
 				}
 #line 710 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp29_ = mwriter;
@@ -5888,8 +5889,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 5892 "Photo.c"
-					goto __catch252_g_error;
+#line 5893 "Photo.c"
+					goto __catch265_g_error;
 				}
 #line 676 "/home/jens/Source/shotwell/src/Photo.vala"
 				_photo_file_adapter_unref0 (mwriter);
@@ -5901,10 +5902,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 5905 "Photo.c"
+#line 5906 "Photo.c"
 			}
-			goto __finally252;
-			__catch252_g_error:
+			goto __finally265;
+			__catch265_g_error:
 			{
 				GError* err = NULL;
 				GError* _tmp31_ = NULL;
@@ -5921,16 +5922,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 5925 "Photo.c"
+#line 5926 "Photo.c"
 			}
-			__finally252:
+			__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 5934 "Photo.c"
+#line 5935 "Photo.c"
 					{
 						RawDeveloper _tmp34_ = 0;
 						BackingPhotoRow* _tmp35_ = NULL;
@@ -5942,15 +5943,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 5946 "Photo.c"
-							goto __catch255_g_error;
+#line 5947 "Photo.c"
+							goto __catch268_g_error;
 						}
 #line 719 "/home/jens/Source/shotwell/src/Photo.vala"
 						photo_notify_raw_development_modified (self);
-#line 5951 "Photo.c"
+#line 5952 "Photo.c"
 					}
-					goto __finally255;
-					__catch255_g_error:
+					goto __finally268;
+					__catch268_g_error:
 					{
 						GError* e = NULL;
 						GError* _tmp36_ = NULL;
@@ -5967,9 +5968,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 5971 "Photo.c"
+#line 5972 "Photo.c"
 					}
-					__finally255:
+					__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"
@@ -5980,7 +5981,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 5984 "Photo.c"
+#line 5985 "Photo.c"
 					}
 				}
 			}
@@ -5994,23 +5995,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 5998 "Photo.c"
+#line 5999 "Photo.c"
 			}
 #line 727 "/home/jens/Source/shotwell/src/Photo.vala"
 			break;
-#line 6002 "Photo.c"
+#line 6003 "Photo.c"
 		}
 #line 674 "/home/jens/Source/shotwell/src/Photo.vala"
 		case RAW_DEVELOPER_CAMERA:
-#line 6006 "Photo.c"
+#line 6007 "Photo.c"
 		{
 #line 731 "/home/jens/Source/shotwell/src/Photo.vala"
 			break;
-#line 6010 "Photo.c"
+#line 6011 "Photo.c"
 		}
 #line 674 "/home/jens/Source/shotwell/src/Photo.vala"
 		case RAW_DEVELOPER_EMBEDDED:
-#line 6014 "Photo.c"
+#line 6015 "Photo.c"
 		{
 			{
 				PhotoMetadata* meta = NULL;
@@ -6053,8 +6054,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 6057 "Photo.c"
-					goto __catch256_g_error;
+#line 6058 "Photo.c"
+					goto __catch269_g_error;
 				}
 #line 737 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp39_ = meta;
@@ -6068,14 +6069,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 6072 "Photo.c"
+#line 6073 "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 6079 "Photo.c"
+#line 6080 "Photo.c"
 							{
 								RawDeveloper _tmp43_ = 0;
 								BackingPhotoRow* _tmp44_ = NULL;
@@ -6087,15 +6088,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 6091 "Photo.c"
-									goto __catch257_g_error;
+#line 6092 "Photo.c"
+									goto __catch270_g_error;
 								}
 #line 773 "/home/jens/Source/shotwell/src/Photo.vala"
 								photo_notify_raw_development_modified (self);
-#line 6096 "Photo.c"
+#line 6097 "Photo.c"
 							}
-							goto __finally257;
-							__catch257_g_error:
+							goto __finally270;
+							__catch270_g_error:
 							{
 								GError* e = NULL;
 								GError* _tmp45_ = NULL;
@@ -6112,13 +6113,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 6116 "Photo.c"
+#line 6117 "Photo.c"
 							}
-							__finally257:
+							__finally270:
 #line 769 "/home/jens/Source/shotwell/src/Photo.vala"
 							if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 6121 "Photo.c"
-								goto __catch256_g_error;
+#line 6122 "Photo.c"
+								goto __catch269_g_error;
 							}
 						}
 					}
@@ -6126,7 +6127,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 6130 "Photo.c"
+#line 6131 "Photo.c"
 				}
 #line 740 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp47_ = meta;
@@ -6146,14 +6147,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 6150 "Photo.c"
+#line 6151 "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 6157 "Photo.c"
+#line 6158 "Photo.c"
 							{
 								RawDeveloper _tmp52_ = 0;
 								BackingPhotoRow* _tmp53_ = NULL;
@@ -6165,15 +6166,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 6169 "Photo.c"
-									goto __catch258_g_error;
+#line 6170 "Photo.c"
+									goto __catch271_g_error;
 								}
 #line 773 "/home/jens/Source/shotwell/src/Photo.vala"
 								photo_notify_raw_development_modified (self);
-#line 6174 "Photo.c"
+#line 6175 "Photo.c"
 							}
-							goto __finally258;
-							__catch258_g_error:
+							goto __finally271;
+							__catch271_g_error:
 							{
 								GError* e = NULL;
 								GError* _tmp54_ = NULL;
@@ -6190,13 +6191,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 6194 "Photo.c"
+#line 6195 "Photo.c"
 							}
-							__finally258:
+							__finally271:
 #line 769 "/home/jens/Source/shotwell/src/Photo.vala"
 							if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 6199 "Photo.c"
-								goto __catch256_g_error;
+#line 6200 "Photo.c"
+								goto __catch269_g_error;
 							}
 						}
 					}
@@ -6204,7 +6205,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 6208 "Photo.c"
+#line 6209 "Photo.c"
 				}
 #line 746 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp56_ = prev;
@@ -6218,8 +6219,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 6222 "Photo.c"
-					goto __catch256_g_error;
+#line 6223 "Photo.c"
+					goto __catch269_g_error;
 				}
 #line 747 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp58_ = pix;
@@ -6233,14 +6234,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 6237 "Photo.c"
+#line 6238 "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 6244 "Photo.c"
+#line 6245 "Photo.c"
 							{
 								RawDeveloper _tmp60_ = 0;
 								BackingPhotoRow* _tmp61_ = NULL;
@@ -6252,15 +6253,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 6256 "Photo.c"
-									goto __catch259_g_error;
+#line 6257 "Photo.c"
+									goto __catch272_g_error;
 								}
 #line 773 "/home/jens/Source/shotwell/src/Photo.vala"
 								photo_notify_raw_development_modified (self);
-#line 6261 "Photo.c"
+#line 6262 "Photo.c"
 							}
-							goto __finally259;
-							__catch259_g_error:
+							goto __finally272;
+							__catch272_g_error:
 							{
 								GError* e = NULL;
 								GError* _tmp62_ = NULL;
@@ -6277,13 +6278,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 6281 "Photo.c"
+#line 6282 "Photo.c"
 							}
-							__finally259:
+							__finally272:
 #line 769 "/home/jens/Source/shotwell/src/Photo.vala"
 							if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 6286 "Photo.c"
-								goto __catch256_g_error;
+#line 6287 "Photo.c"
+								goto __catch269_g_error;
 							}
 						}
 					}
@@ -6291,7 +6292,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 6295 "Photo.c"
+#line 6296 "Photo.c"
 				}
 #line 753 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp65_ = d;
@@ -6313,8 +6314,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 6317 "Photo.c"
-					goto __catch256_g_error;
+#line 6318 "Photo.c"
+					goto __catch269_g_error;
 				}
 #line 753 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp70_ = _tmp64_;
@@ -6342,8 +6343,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 6346 "Photo.c"
-					goto __catch256_g_error;
+#line 6347 "Photo.c"
+					goto __catch269_g_error;
 				}
 #line 755 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp74_ = writer;
@@ -6363,8 +6364,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 6367 "Photo.c"
-					goto __catch256_g_error;
+#line 6368 "Photo.c"
+					goto __catch269_g_error;
 				}
 #line 759 "/home/jens/Source/shotwell/src/Photo.vala"
 				wrote_img_to_disk = TRUE;
@@ -6388,8 +6389,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 6392 "Photo.c"
-					goto __catch256_g_error;
+#line 6393 "Photo.c"
+					goto __catch269_g_error;
 				}
 #line 763 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp79_ = mwriter;
@@ -6411,8 +6412,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 6415 "Photo.c"
-					goto __catch256_g_error;
+#line 6416 "Photo.c"
+					goto __catch269_g_error;
 				}
 #line 734 "/home/jens/Source/shotwell/src/Photo.vala"
 				_photo_file_adapter_unref0 (mwriter);
@@ -6426,10 +6427,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 6430 "Photo.c"
+#line 6431 "Photo.c"
 			}
-			goto __finally256;
-			__catch256_g_error:
+			goto __finally269;
+			__catch269_g_error:
 			{
 				GError* e = NULL;
 				GError* _tmp81_ = NULL;
@@ -6446,14 +6447,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 6450 "Photo.c"
+#line 6451 "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 6457 "Photo.c"
+#line 6458 "Photo.c"
 						{
 							RawDeveloper _tmp84_ = 0;
 							BackingPhotoRow* _tmp85_ = NULL;
@@ -6465,15 +6466,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 6469 "Photo.c"
-								goto __catch260_g_error;
+#line 6470 "Photo.c"
+								goto __catch273_g_error;
 							}
 #line 773 "/home/jens/Source/shotwell/src/Photo.vala"
 							photo_notify_raw_development_modified (self);
-#line 6474 "Photo.c"
+#line 6475 "Photo.c"
 						}
-						goto __finally260;
-						__catch260_g_error:
+						goto __finally273;
+						__catch273_g_error:
 						{
 							GError* e = NULL;
 							GError* _tmp86_ = NULL;
@@ -6490,14 +6491,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 6494 "Photo.c"
+#line 6495 "Photo.c"
 						}
-						__finally260:
+						__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 6501 "Photo.c"
+#line 6502 "Photo.c"
 						}
 					}
 				}
@@ -6505,16 +6506,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 6509 "Photo.c"
+#line 6510 "Photo.c"
 			}
-			__finally256:
+			__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 6518 "Photo.c"
+#line 6519 "Photo.c"
 					{
 						RawDeveloper _tmp89_ = 0;
 						BackingPhotoRow* _tmp90_ = NULL;
@@ -6526,15 +6527,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 6530 "Photo.c"
-							goto __catch261_g_error;
+#line 6531 "Photo.c"
+							goto __catch274_g_error;
 						}
 #line 773 "/home/jens/Source/shotwell/src/Photo.vala"
 						photo_notify_raw_development_modified (self);
-#line 6535 "Photo.c"
+#line 6536 "Photo.c"
 					}
-					goto __finally261;
-					__catch261_g_error:
+					goto __finally274;
+					__catch274_g_error:
 					{
 						GError* e = NULL;
 						GError* _tmp91_ = NULL;
@@ -6551,9 +6552,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 6555 "Photo.c"
+#line 6556 "Photo.c"
 					}
-					__finally261:
+					__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"
@@ -6564,7 +6565,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 6568 "Photo.c"
+#line 6569 "Photo.c"
 					}
 				}
 			}
@@ -6578,22 +6579,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 6582 "Photo.c"
+#line 6583 "Photo.c"
 			}
 #line 780 "/home/jens/Source/shotwell/src/Photo.vala"
 			break;
-#line 6586 "Photo.c"
+#line 6587 "Photo.c"
 		}
 		default:
 		{
 #line 783 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_assert_not_reached ();
-#line 6592 "Photo.c"
+#line 6593 "Photo.c"
 		}
 	}
 #line 670 "/home/jens/Source/shotwell/src/Photo.vala"
 	_backing_photo_row_unref0 (bps);
-#line 6597 "Photo.c"
+#line 6598 "Photo.c"
 }
 
 
@@ -6601,14 +6602,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 6605 "Photo.c"
+#line 6606 "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 6612 "Photo.c"
+#line 6613 "Photo.c"
 		{
 			PhotoRow* _tmp1_ = NULL;
 			RawDeveloper _tmp2_ = 0;
@@ -6618,16 +6619,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 6622 "Photo.c"
+#line 6623 "Photo.c"
 		}
-		__finally262:
+		__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 6631 "Photo.c"
+#line 6632 "Photo.c"
 		}
 #line 789 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -6637,7 +6638,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 6641 "Photo.c"
+#line 6642 "Photo.c"
 		}
 	}
 }
@@ -6659,29 +6660,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 6663 "Photo.c"
+#line 6664 "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 6669 "Photo.c"
+#line 6670 "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 6675 "Photo.c"
+#line 6676 "Photo.c"
 	} else {
 #line 802 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp1_ = FALSE;
-#line 6679 "Photo.c"
+#line 6680 "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 6685 "Photo.c"
+#line 6686 "Photo.c"
 	}
 #line 807 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = photo_is_raw_developer_available (self, RAW_DEVELOPER_EMBEDDED);
@@ -6689,7 +6690,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 6693 "Photo.c"
+#line 6694 "Photo.c"
 	}
 	{
 		GeeHashMap* _tmp5_ = NULL;
@@ -6697,7 +6698,7 @@ void photo_set_raw_developer (Photo* self, RawDeveloper d) {
 		_tmp5_ = self->priv->developments;
 #line 810 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_developments);
-#line 6701 "Photo.c"
+#line 6702 "Photo.c"
 		{
 			RawDeveloper stale_raw_developer = 0;
 			PhotoRow* _tmp6_ = NULL;
@@ -6734,13 +6735,13 @@ void photo_set_raw_developer (Photo* self, RawDeveloper d) {
 			_tmp9_ = photo_is_raw_developer_complete (self, _tmp8_);
 #line 814 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (!_tmp9_) {
-#line 6738 "Photo.c"
+#line 6739 "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 6744 "Photo.c"
+#line 6745 "Photo.c"
 				{
 					GdkPixbuf* _tmp11_ = NULL;
 					GdkPixbuf* _tmp12_ = NULL;
@@ -6752,12 +6753,12 @@ void photo_set_raw_developer (Photo* self, RawDeveloper d) {
 					_g_object_unref0 (_tmp12_);
 #line 817 "/home/jens/Source/shotwell/src/Photo.vala"
 					if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 6756 "Photo.c"
-						goto __catch264_g_error;
+#line 6757 "Photo.c"
+						goto __catch277_g_error;
 					}
 				}
-				goto __finally264;
-				__catch264_g_error:
+				goto __finally277;
+				__catch277_g_error:
 				{
 					GError* e = NULL;
 #line 816 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -6766,30 +6767,30 @@ void photo_set_raw_developer (Photo* self, RawDeveloper d) {
 					_inner_error_ = NULL;
 #line 820 "/home/jens/Source/shotwell/src/Photo.vala"
 					_g_error_free0 (e);
-#line 6770 "Photo.c"
+#line 6771 "Photo.c"
 					{
 						GeeHashMap* _tmp13_ = NULL;
 #line 810 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp13_ = self->priv->developments;
 #line 810 "/home/jens/Source/shotwell/src/Photo.vala"
 						g_rec_mutex_unlock (&self->priv->__lock_developments);
-#line 6777 "Photo.c"
+#line 6778 "Photo.c"
 					}
 #line 820 "/home/jens/Source/shotwell/src/Photo.vala"
 					return;
-#line 6781 "Photo.c"
+#line 6782 "Photo.c"
 				}
-				__finally264:
+				__finally277:
 #line 816 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 6786 "Photo.c"
+#line 6787 "Photo.c"
 					{
 						GeeHashMap* _tmp14_ = NULL;
 #line 810 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp14_ = self->priv->developments;
 #line 810 "/home/jens/Source/shotwell/src/Photo.vala"
 						g_rec_mutex_unlock (&self->priv->__lock_developments);
-#line 6793 "Photo.c"
+#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);
@@ -6797,7 +6798,7 @@ void photo_set_raw_developer (Photo* self, RawDeveloper d) {
 					g_clear_error (&_inner_error_);
 #line 816 "/home/jens/Source/shotwell/src/Photo.vala"
 					return;
-#line 6801 "Photo.c"
+#line 6802 "Photo.c"
 				}
 			}
 #line 823 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -6808,18 +6809,18 @@ void photo_set_raw_developer (Photo* self, RawDeveloper d) {
 			_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 6812 "Photo.c"
+#line 6813 "Photo.c"
 				{
 					GeeHashMap* _tmp18_ = NULL;
 #line 810 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp18_ = self->priv->developments;
 #line 810 "/home/jens/Source/shotwell/src/Photo.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_developments);
-#line 6819 "Photo.c"
+#line 6820 "Photo.c"
 				}
 #line 824 "/home/jens/Source/shotwell/src/Photo.vala"
 				return;
-#line 6823 "Photo.c"
+#line 6824 "Photo.c"
 			}
 #line 827 "/home/jens/Source/shotwell/src/Photo.vala"
 			photo_revert_to_master (self, FALSE);
@@ -6861,7 +6862,7 @@ void photo_set_raw_developer (Photo* self, RawDeveloper d) {
 			_tmp31_ = _tmp30_->original_orientation;
 #line 834 "/home/jens/Source/shotwell/src/Photo.vala"
 			photo_set_orientation (self, _tmp31_);
-#line 6865 "Photo.c"
+#line 6866 "Photo.c"
 			{
 				PhotoTable* _tmp32_ = NULL;
 				PhotoTable* _tmp33_ = NULL;
@@ -6887,12 +6888,12 @@ void photo_set_raw_developer (Photo* self, RawDeveloper d) {
 				_database_table_unref0 (_tmp33_);
 #line 837 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 6891 "Photo.c"
-					goto __catch265_g_error;
+#line 6892 "Photo.c"
+					goto __catch278_g_error;
 				}
 			}
-			goto __finally265;
-			__catch265_g_error:
+			goto __finally278;
+			__catch278_g_error:
 			{
 				GError* e = NULL;
 				GError* _tmp38_ = NULL;
@@ -6909,19 +6910,19 @@ void photo_set_raw_developer (Photo* self, RawDeveloper d) {
 				g_warning ("Photo.vala:839: Error updating database: %s", _tmp39_);
 #line 836 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_error_free0 (e);
-#line 6913 "Photo.c"
+#line 6914 "Photo.c"
 			}
-			__finally265:
+			__finally278:
 #line 836 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 6918 "Photo.c"
+#line 6919 "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 6925 "Photo.c"
+#line 6926 "Photo.c"
 				}
 #line 836 "/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);
@@ -6929,13 +6930,13 @@ void photo_set_raw_developer (Photo* self, RawDeveloper d) {
 				g_clear_error (&_inner_error_);
 #line 836 "/home/jens/Source/shotwell/src/Photo.vala"
 				return;
-#line 6933 "Photo.c"
+#line 6934 "Photo.c"
 			}
 #line 846 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp42_ = stale_raw_developer;
 #line 846 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp42_ != RAW_DEVELOPER_CAMERA) {
-#line 6939 "Photo.c"
+#line 6940 "Photo.c"
 				RawDeveloper _tmp43_ = 0;
 				PhotoRow* _tmp44_ = NULL;
 				RawDeveloper _tmp45_ = 0;
@@ -6947,31 +6948,31 @@ void photo_set_raw_developer (Photo* self, RawDeveloper d) {
 				_tmp45_ = _tmp44_->developer;
 #line 847 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp41_ = _tmp43_ != _tmp45_;
-#line 6951 "Photo.c"
+#line 6952 "Photo.c"
 			} else {
 #line 846 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp41_ = FALSE;
-#line 6955 "Photo.c"
+#line 6956 "Photo.c"
 			}
 #line 846 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp41_) {
-#line 6959 "Photo.c"
+#line 6960 "Photo.c"
 				RawDeveloper _tmp46_ = 0;
 #line 850 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp46_ = stale_raw_developer;
 #line 850 "/home/jens/Source/shotwell/src/Photo.vala"
 				photo_delete_raw_development (self, _tmp46_);
-#line 6965 "Photo.c"
+#line 6966 "Photo.c"
 			}
 		}
-		__finally263:
+		__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 6975 "Photo.c"
+#line 6976 "Photo.c"
 		}
 #line 810 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -6981,7 +6982,7 @@ void photo_set_raw_developer (Photo* self, RawDeveloper d) {
 			g_clear_error (&_inner_error_);
 #line 810 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 6985 "Photo.c"
+#line 6986 "Photo.c"
 		}
 	}
 #line 857 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -6994,7 +6995,7 @@ void photo_set_raw_developer (Photo* self, RawDeveloper d) {
 	_alteration_unref0 (_tmp49_);
 #line 858 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_discard_prefetched (self);
-#line 6998 "Photo.c"
+#line 6999 "Photo.c"
 }
 
 
@@ -7012,7 +7013,7 @@ RawDeveloper photo_get_raw_developer (Photo* self) {
 	result = _tmp1_;
 #line 862 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 7016 "Photo.c"
+#line 7017 "Photo.c"
 }
 
 
@@ -7024,14 +7025,14 @@ static gboolean photo_delete_raw_development (Photo* self, RawDeveloper d) {
 	g_return_val_if_fail (IS_PHOTO (self), FALSE);
 #line 868 "/home/jens/Source/shotwell/src/Photo.vala"
 	ret = FALSE;
-#line 7028 "Photo.c"
+#line 7029 "Photo.c"
 	{
 		GeeHashMap* _tmp0_ = NULL;
 #line 870 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->priv->developments;
 #line 870 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_developments);
-#line 7035 "Photo.c"
+#line 7036 "Photo.c"
 		{
 			GeeHashMap* _tmp1_ = NULL;
 			RawDeveloper _tmp2_ = 0;
@@ -7060,18 +7061,18 @@ static gboolean photo_delete_raw_development (Photo* self, RawDeveloper d) {
 			if (!_tmp3_) {
 #line 872 "/home/jens/Source/shotwell/src/Photo.vala"
 				result = FALSE;
-#line 7064 "Photo.c"
+#line 7065 "Photo.c"
 				{
 					GeeHashMap* _tmp4_ = NULL;
 #line 870 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp4_ = self->priv->developments;
 #line 870 "/home/jens/Source/shotwell/src/Photo.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_developments);
-#line 7071 "Photo.c"
+#line 7072 "Photo.c"
 				}
 #line 872 "/home/jens/Source/shotwell/src/Photo.vala"
 				return result;
-#line 7075 "Photo.c"
+#line 7076 "Photo.c"
 			}
 #line 876 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp5_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject));
@@ -7103,7 +7104,7 @@ static gboolean photo_delete_raw_development (Photo* self, RawDeveloper d) {
 			_tmp14_ = _tmp13_->filepath;
 #line 878 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp14_ != NULL) {
-#line 7107 "Photo.c"
+#line 7108 "Photo.c"
 				GFile* f = NULL;
 				BackingPhotoRow* _tmp15_ = NULL;
 				const gchar* _tmp16_ = NULL;
@@ -7116,14 +7117,14 @@ static gboolean photo_delete_raw_development (Photo* self, RawDeveloper d) {
 				_tmp17_ = g_file_new_for_path (_tmp16_);
 #line 879 "/home/jens/Source/shotwell/src/Photo.vala"
 				f = _tmp17_;
-#line 7120 "Photo.c"
+#line 7121 "Photo.c"
 				{
 					RawDeveloper _tmp18_ = 0;
 #line 881 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp18_ = d;
 #line 881 "/home/jens/Source/shotwell/src/Photo.vala"
 					if (_tmp18_ == RAW_DEVELOPER_CAMERA) {
-#line 7127 "Photo.c"
+#line 7128 "Photo.c"
 						GFile* _tmp19_ = NULL;
 #line 882 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp19_ = f;
@@ -7131,8 +7132,8 @@ static gboolean photo_delete_raw_development (Photo* self, RawDeveloper d) {
 						g_file_trash (_tmp19_, NULL, &_inner_error_);
 #line 882 "/home/jens/Source/shotwell/src/Photo.vala"
 						if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 7135 "Photo.c"
-							goto __catch267_g_error;
+#line 7136 "Photo.c"
+							goto __catch280_g_error;
 						}
 					} else {
 						GFile* _tmp20_ = NULL;
@@ -7142,13 +7143,13 @@ static gboolean photo_delete_raw_development (Photo* self, RawDeveloper d) {
 						g_file_delete (_tmp20_, NULL, &_inner_error_);
 #line 884 "/home/jens/Source/shotwell/src/Photo.vala"
 						if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 7146 "Photo.c"
-							goto __catch267_g_error;
+#line 7147 "Photo.c"
+							goto __catch280_g_error;
 						}
 					}
 				}
-				goto __finally267;
-				__catch267_g_error:
+				goto __finally280;
+				__catch280_g_error:
 				{
 					GError* e = NULL;
 					BackingPhotoRow* _tmp21_ = NULL;
@@ -7171,9 +7172,9 @@ static gboolean photo_delete_raw_development (Photo* self, RawDeveloper d) {
 					g_warning ("Photo.vala:886: Unable to delete RAW development: %s error: %s", _tmp22_, _tmp24_);
 #line 880 "/home/jens/Source/shotwell/src/Photo.vala"
 					_g_error_free0 (e);
-#line 7175 "Photo.c"
+#line 7176 "Photo.c"
 				}
-				__finally267:
+				__finally280:
 #line 880 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 880 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -7184,14 +7185,14 @@ static gboolean photo_delete_raw_development (Photo* self, RawDeveloper d) {
 					_g_object_unref0 (f);
 #line 880 "/home/jens/Source/shotwell/src/Photo.vala"
 					_backing_photo_row_unref0 (bpr);
-#line 7188 "Photo.c"
+#line 7189 "Photo.c"
 					{
 						GeeHashMap* _tmp25_ = NULL;
 #line 870 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp25_ = self->priv->developments;
 #line 870 "/home/jens/Source/shotwell/src/Photo.vala"
 						g_rec_mutex_unlock (&self->priv->__lock_developments);
-#line 7195 "Photo.c"
+#line 7196 "Photo.c"
 					}
 #line 880 "/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);
@@ -7199,11 +7200,11 @@ static gboolean photo_delete_raw_development (Photo* self, RawDeveloper d) {
 					g_clear_error (&_inner_error_);
 #line 880 "/home/jens/Source/shotwell/src/Photo.vala"
 					return FALSE;
-#line 7203 "Photo.c"
+#line 7204 "Photo.c"
 				}
 #line 878 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (f);
-#line 7207 "Photo.c"
+#line 7208 "Photo.c"
 			}
 			{
 				PhotoTable* _tmp26_ = NULL;
@@ -7228,8 +7229,8 @@ static gboolean photo_delete_raw_development (Photo* self, RawDeveloper d) {
 				_database_table_unref0 (_tmp27_);
 #line 892 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 7232 "Photo.c"
-					goto __catch268_g_error;
+#line 7233 "Photo.c"
+					goto __catch281_g_error;
 				}
 #line 893 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp30_ = backing_photo_table_get_instance ();
@@ -7245,12 +7246,12 @@ static gboolean photo_delete_raw_development (Photo* self, RawDeveloper d) {
 				_database_table_unref0 (_tmp31_);
 #line 893 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 7249 "Photo.c"
-					goto __catch268_g_error;
+#line 7250 "Photo.c"
+					goto __catch281_g_error;
 				}
 			}
-			goto __finally268;
-			__catch268_g_error:
+			goto __finally281;
+			__catch281_g_error:
 			{
 				GError* e = NULL;
 				GError* _tmp34_ = NULL;
@@ -7267,23 +7268,23 @@ static gboolean photo_delete_raw_development (Photo* self, RawDeveloper d) {
 				g_warning ("Photo.vala:895: Database error while deleting RAW development: %s", _tmp35_);
 #line 891 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_error_free0 (e);
-#line 7271 "Photo.c"
+#line 7272 "Photo.c"
 			}
-			__finally268:
+			__finally281:
 #line 891 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 891 "/home/jens/Source/shotwell/src/Photo.vala"
 				_backing_photo_row_unref0 (bpr);
 #line 891 "/home/jens/Source/shotwell/src/Photo.vala"
 				_backing_photo_row_unref0 (bpr);
-#line 7280 "Photo.c"
+#line 7281 "Photo.c"
 				{
 					GeeHashMap* _tmp36_ = NULL;
 #line 870 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp36_ = self->priv->developments;
 #line 870 "/home/jens/Source/shotwell/src/Photo.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_developments);
-#line 7287 "Photo.c"
+#line 7288 "Photo.c"
 				}
 #line 891 "/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);
@@ -7291,7 +7292,7 @@ static gboolean photo_delete_raw_development (Photo* self, RawDeveloper d) {
 				g_clear_error (&_inner_error_);
 #line 891 "/home/jens/Source/shotwell/src/Photo.vala"
 				return FALSE;
-#line 7295 "Photo.c"
+#line 7296 "Photo.c"
 			}
 #line 898 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp37_ = self->priv->developments;
@@ -7303,16 +7304,16 @@ static gboolean photo_delete_raw_development (Photo* self, RawDeveloper d) {
 			ret = _tmp39_;
 #line 870 "/home/jens/Source/shotwell/src/Photo.vala"
 			_backing_photo_row_unref0 (bpr);
-#line 7307 "Photo.c"
+#line 7308 "Photo.c"
 		}
-		__finally266:
+		__finally279:
 		{
 			GeeHashMap* _tmp40_ = NULL;
 #line 870 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp40_ = self->priv->developments;
 #line 870 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_developments);
-#line 7316 "Photo.c"
+#line 7317 "Photo.c"
 		}
 #line 870 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -7322,7 +7323,7 @@ static gboolean photo_delete_raw_development (Photo* self, RawDeveloper d) {
 			g_clear_error (&_inner_error_);
 #line 870 "/home/jens/Source/shotwell/src/Photo.vala"
 			return FALSE;
-#line 7326 "Photo.c"
+#line 7327 "Photo.c"
 		}
 	}
 #line 901 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -7331,7 +7332,7 @@ static gboolean photo_delete_raw_development (Photo* self, RawDeveloper d) {
 	result = ret;
 #line 902 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 7335 "Photo.c"
+#line 7336 "Photo.c"
 }
 
 
@@ -7339,14 +7340,14 @@ void photo_redevelop_raw (Photo* self, RawDeveloper d) {
 	GError * _inner_error_ = NULL;
 #line 906 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
-#line 7343 "Photo.c"
+#line 7344 "Photo.c"
 	{
 		GeeHashMap* _tmp0_ = NULL;
 #line 907 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->priv->developments;
 #line 907 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_developments);
-#line 7350 "Photo.c"
+#line 7351 "Photo.c"
 		{
 			RawDeveloper _tmp1_ = 0;
 			RawDeveloper dev = 0;
@@ -7367,22 +7368,22 @@ void photo_redevelop_raw (Photo* self, RawDeveloper d) {
 			if (_tmp3_ == RAW_DEVELOPER_CAMERA) {
 #line 911 "/home/jens/Source/shotwell/src/Photo.vala"
 				dev = RAW_DEVELOPER_EMBEDDED;
-#line 7371 "Photo.c"
+#line 7372 "Photo.c"
 			}
 #line 913 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp4_ = dev;
 #line 913 "/home/jens/Source/shotwell/src/Photo.vala"
 			photo_set_raw_developer (self, _tmp4_);
-#line 7377 "Photo.c"
+#line 7378 "Photo.c"
 		}
-		__finally269:
+		__finally282:
 		{
 			GeeHashMap* _tmp5_ = NULL;
 #line 907 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp5_ = self->priv->developments;
 #line 907 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_developments);
-#line 7386 "Photo.c"
+#line 7387 "Photo.c"
 		}
 #line 907 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -7392,7 +7393,7 @@ void photo_redevelop_raw (Photo* self, RawDeveloper d) {
 			g_clear_error (&_inner_error_);
 #line 907 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 7396 "Photo.c"
+#line 7397 "Photo.c"
 		}
 	}
 }
@@ -7405,13 +7406,13 @@ static void _vala_array_add251 (BackingFileState*** array, int* length, int* siz
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 920 "/home/jens/Source/shotwell/src/Photo.vala"
 		*array = g_renew (BackingFileState*, *array, (*size) + 1);
-#line 7409 "Photo.c"
+#line 7410 "Photo.c"
 	}
 #line 920 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[(*length)++] = value;
 #line 920 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[*length] = NULL;
-#line 7415 "Photo.c"
+#line 7416 "Photo.c"
 }
 
 
@@ -7422,13 +7423,13 @@ static void _vala_array_add252 (BackingFileState*** array, int* length, int* siz
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 922 "/home/jens/Source/shotwell/src/Photo.vala"
 		*array = g_renew (BackingFileState*, *array, (*size) + 1);
-#line 7426 "Photo.c"
+#line 7427 "Photo.c"
 	}
 #line 922 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[(*length)++] = value;
 #line 922 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[*length] = NULL;
-#line 7432 "Photo.c"
+#line 7433 "Photo.c"
 }
 
 
@@ -7439,13 +7440,13 @@ static void _vala_array_add253 (BackingFileState*** array, int* length, int* siz
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 929 "/home/jens/Source/shotwell/src/Photo.vala"
 		*array = g_renew (BackingFileState*, *array, (*size) + 1);
-#line 7443 "Photo.c"
+#line 7444 "Photo.c"
 	}
 #line 929 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[(*length)++] = value;
 #line 929 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[*length] = NULL;
-#line 7449 "Photo.c"
+#line 7450 "Photo.c"
 }
 
 
@@ -7469,14 +7470,14 @@ static BackingFileState** photo_real_get_backing_files_state (MediaSource* base,
 	backing_length1 = 0;
 #line 918 "/home/jens/Source/shotwell/src/Photo.vala"
 	_backing_size_ = backing_length1;
-#line 7473 "Photo.c"
+#line 7474 "Photo.c"
 	{
 		PhotoRow* _tmp1_ = NULL;
 #line 919 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp1_ = self->row;
 #line 919 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 7480 "Photo.c"
+#line 7481 "Photo.c"
 		{
 			BackingFileState** _tmp2_ = NULL;
 			gint _tmp2__length1 = 0;
@@ -7507,7 +7508,7 @@ static BackingFileState** photo_real_get_backing_files_state (MediaSource* base,
 			_tmp8_ = photo_has_editable (self);
 #line 921 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp8_) {
-#line 7511 "Photo.c"
+#line 7512 "Photo.c"
 				BackingFileState** _tmp9_ = NULL;
 				gint _tmp9__length1 = 0;
 				BackingPhotoRow* _tmp10_ = NULL;
@@ -7522,13 +7523,13 @@ static BackingFileState** photo_real_get_backing_files_state (MediaSource* base,
 				_tmp11_ = backing_file_state_new_from_photo_row (_tmp10_, NULL);
 #line 922 "/home/jens/Source/shotwell/src/Photo.vala"
 				_vala_array_add252 (&backing, &backing_length1, &_backing_size_, _tmp11_);
-#line 7526 "Photo.c"
+#line 7527 "Photo.c"
 			}
 #line 924 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp12_ = photo_is_developed (self);
 #line 924 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp12_) {
-#line 7532 "Photo.c"
+#line 7533 "Photo.c"
 				GeeCollection* dev_rows = NULL;
 				GeeCollection* _tmp13_ = NULL;
 				GeeCollection* _tmp14_ = NULL;
@@ -7540,7 +7541,7 @@ static BackingFileState** photo_real_get_backing_files_state (MediaSource* base,
 				_tmp14_ = dev_rows;
 #line 926 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp14_ != NULL) {
-#line 7544 "Photo.c"
+#line 7545 "Photo.c"
 					{
 						GeeIterator* _r_it = NULL;
 						GeeCollection* _tmp15_ = NULL;
@@ -7553,7 +7554,7 @@ static BackingFileState** photo_real_get_backing_files_state (MediaSource* base,
 						_r_it = _tmp16_;
 #line 927 "/home/jens/Source/shotwell/src/Photo.vala"
 						while (TRUE) {
-#line 7557 "Photo.c"
+#line 7558 "Photo.c"
 							GeeIterator* _tmp17_ = NULL;
 							gboolean _tmp18_ = FALSE;
 							BackingPhotoRow* r = NULL;
@@ -7573,7 +7574,7 @@ static BackingFileState** photo_real_get_backing_files_state (MediaSource* base,
 							if (!_tmp18_) {
 #line 927 "/home/jens/Source/shotwell/src/Photo.vala"
 								break;
-#line 7577 "Photo.c"
+#line 7578 "Photo.c"
 							}
 #line 927 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp19_ = _r_it;
@@ -7599,26 +7600,26 @@ static BackingFileState** photo_real_get_backing_files_state (MediaSource* base,
 							_vala_array_add253 (&backing, &backing_length1, &_backing_size_, _tmp25_);
 #line 927 "/home/jens/Source/shotwell/src/Photo.vala"
 							_backing_photo_row_unref0 (r);
-#line 7603 "Photo.c"
+#line 7604 "Photo.c"
 						}
 #line 927 "/home/jens/Source/shotwell/src/Photo.vala"
 						_g_object_unref0 (_r_it);
-#line 7607 "Photo.c"
+#line 7608 "Photo.c"
 					}
 				}
 #line 924 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (dev_rows);
-#line 7612 "Photo.c"
+#line 7613 "Photo.c"
 			}
 		}
-		__finally270:
+		__finally283:
 		{
 			PhotoRow* _tmp26_ = NULL;
 #line 919 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp26_ = self->row;
 #line 919 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 7622 "Photo.c"
+#line 7623 "Photo.c"
 		}
 #line 919 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -7630,7 +7631,7 @@ static BackingFileState** photo_real_get_backing_files_state (MediaSource* base,
 			g_clear_error (&_inner_error_);
 #line 919 "/home/jens/Source/shotwell/src/Photo.vala"
 			return NULL;
-#line 7634 "Photo.c"
+#line 7635 "Photo.c"
 		}
 	}
 #line 935 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -7641,13 +7642,13 @@ static BackingFileState** photo_real_get_backing_files_state (MediaSource* base,
 	if (result_length1) {
 #line 935 "/home/jens/Source/shotwell/src/Photo.vala"
 		*result_length1 = _tmp27__length1;
-#line 7645 "Photo.c"
+#line 7646 "Photo.c"
 	}
 #line 935 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp27_;
 #line 935 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 7651 "Photo.c"
+#line 7652 "Photo.c"
 }
 
 
@@ -7662,7 +7663,7 @@ static PhotoFileReader* photo_get_backing_reader (Photo* self, BackingFetchMode
 	switch (_tmp0_) {
 #line 939 "/home/jens/Source/shotwell/src/Photo.vala"
 		case BACKING_FETCH_MODE_MASTER:
-#line 7666 "Photo.c"
+#line 7667 "Photo.c"
 		{
 			PhotoFileReader* _tmp1_ = NULL;
 #line 941 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -7671,11 +7672,11 @@ static PhotoFileReader* photo_get_backing_reader (Photo* self, BackingFetchMode
 			result = _tmp1_;
 #line 941 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 7675 "Photo.c"
+#line 7676 "Photo.c"
 		}
 #line 939 "/home/jens/Source/shotwell/src/Photo.vala"
 		case BACKING_FETCH_MODE_BASELINE:
-#line 7679 "Photo.c"
+#line 7680 "Photo.c"
 		{
 			PhotoFileReader* _tmp2_ = NULL;
 #line 944 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -7684,11 +7685,11 @@ static PhotoFileReader* photo_get_backing_reader (Photo* self, BackingFetchMode
 			result = _tmp2_;
 #line 944 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 7688 "Photo.c"
+#line 7689 "Photo.c"
 		}
 #line 939 "/home/jens/Source/shotwell/src/Photo.vala"
 		case BACKING_FETCH_MODE_SOURCE:
-#line 7692 "Photo.c"
+#line 7693 "Photo.c"
 		{
 			PhotoFileReader* _tmp3_ = NULL;
 #line 947 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -7697,18 +7698,18 @@ static PhotoFileReader* photo_get_backing_reader (Photo* self, BackingFetchMode
 			result = _tmp3_;
 #line 947 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 7701 "Photo.c"
+#line 7702 "Photo.c"
 		}
 #line 939 "/home/jens/Source/shotwell/src/Photo.vala"
 		case BACKING_FETCH_MODE_UNMODIFIED:
-#line 7705 "Photo.c"
+#line 7706 "Photo.c"
 		{
 			PhotoFileFormat _tmp4_ = 0;
 #line 950 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp4_ = photo_get_master_file_format (self);
 #line 950 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp4_ == PHOTO_FILE_FORMAT_RAW) {
-#line 7712 "Photo.c"
+#line 7713 "Photo.c"
 				PhotoFileReader* _tmp5_ = NULL;
 #line 951 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp5_ = photo_get_raw_developer_reader (self);
@@ -7716,7 +7717,7 @@ static PhotoFileReader* photo_get_backing_reader (Photo* self, BackingFetchMode
 				result = _tmp5_;
 #line 951 "/home/jens/Source/shotwell/src/Photo.vala"
 				return result;
-#line 7720 "Photo.c"
+#line 7721 "Photo.c"
 			} else {
 				PhotoFileReader* _tmp6_ = NULL;
 #line 953 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -7725,7 +7726,7 @@ static PhotoFileReader* photo_get_backing_reader (Photo* self, BackingFetchMode
 				result = _tmp6_;
 #line 953 "/home/jens/Source/shotwell/src/Photo.vala"
 				return result;
-#line 7729 "Photo.c"
+#line 7730 "Photo.c"
 			}
 		}
 		default:
@@ -7738,7 +7739,7 @@ static PhotoFileReader* photo_get_backing_reader (Photo* self, BackingFetchMode
 			_tmp8_ = g_enum_get_value (g_type_class_ref (TYPE_BACKING_FETCH_MODE), _tmp7_);
 #line 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 7742 "Photo.c"
+#line 7743 "Photo.c"
 		}
 	}
 }
@@ -7747,7 +7748,7 @@ static PhotoFileReader* photo_get_backing_reader (Photo* self, BackingFetchMode
 static gpointer _photo_file_adapter_ref0 (gpointer self) {
 #line 962 "/home/jens/Source/shotwell/src/Photo.vala"
 	return self ? photo_file_adapter_ref (self) : NULL;
-#line 7751 "Photo.c"
+#line 7752 "Photo.c"
 }
 
 
@@ -7756,14 +7757,14 @@ static PhotoFileReader* photo_get_master_reader (Photo* self) {
 	GError * _inner_error_ = NULL;
 #line 960 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), NULL);
-#line 7760 "Photo.c"
+#line 7761 "Photo.c"
 	{
 		PhotoBackingReaders* _tmp0_ = NULL;
 #line 961 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->priv->readers;
 #line 961 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_readers);
-#line 7767 "Photo.c"
+#line 7768 "Photo.c"
 		{
 			PhotoBackingReaders* _tmp1_ = NULL;
 			PhotoFileReader* _tmp2_ = NULL;
@@ -7776,27 +7777,27 @@ static PhotoFileReader* photo_get_master_reader (Photo* self) {
 			_tmp3_ = _photo_file_adapter_ref0 (_tmp2_);
 #line 962 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp3_;
-#line 7780 "Photo.c"
+#line 7781 "Photo.c"
 			{
 				PhotoBackingReaders* _tmp4_ = NULL;
 #line 961 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp4_ = self->priv->readers;
 #line 961 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 7787 "Photo.c"
+#line 7788 "Photo.c"
 			}
 #line 962 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 7791 "Photo.c"
+#line 7792 "Photo.c"
 		}
-		__finally271:
+		__finally284:
 		{
 			PhotoBackingReaders* _tmp5_ = NULL;
 #line 961 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp5_ = self->priv->readers;
 #line 961 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 7800 "Photo.c"
+#line 7801 "Photo.c"
 		}
 #line 961 "/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);
@@ -7804,7 +7805,7 @@ static PhotoFileReader* photo_get_master_reader (Photo* self) {
 		g_clear_error (&_inner_error_);
 #line 961 "/home/jens/Source/shotwell/src/Photo.vala"
 		return NULL;
-#line 7808 "Photo.c"
+#line 7809 "Photo.c"
 	}
 }
 
@@ -7814,14 +7815,14 @@ PhotoFileReader* photo_get_editable_reader (Photo* self) {
 	GError * _inner_error_ = NULL;
 #line 966 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), NULL);
-#line 7818 "Photo.c"
+#line 7819 "Photo.c"
 	{
 		PhotoBackingReaders* _tmp0_ = NULL;
 #line 967 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->priv->readers;
 #line 967 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_readers);
-#line 7825 "Photo.c"
+#line 7826 "Photo.c"
 		{
 			PhotoBackingReaders* _tmp1_ = NULL;
 			PhotoFileReader* _tmp2_ = NULL;
@@ -7834,27 +7835,27 @@ PhotoFileReader* photo_get_editable_reader (Photo* self) {
 			_tmp3_ = _photo_file_adapter_ref0 (_tmp2_);
 #line 968 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp3_;
-#line 7838 "Photo.c"
+#line 7839 "Photo.c"
 			{
 				PhotoBackingReaders* _tmp4_ = NULL;
 #line 967 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp4_ = self->priv->readers;
 #line 967 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 7845 "Photo.c"
+#line 7846 "Photo.c"
 			}
 #line 968 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 7849 "Photo.c"
+#line 7850 "Photo.c"
 		}
-		__finally272:
+		__finally285:
 		{
 			PhotoBackingReaders* _tmp5_ = NULL;
 #line 967 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp5_ = self->priv->readers;
 #line 967 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 7858 "Photo.c"
+#line 7859 "Photo.c"
 		}
 #line 967 "/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);
@@ -7862,7 +7863,7 @@ PhotoFileReader* photo_get_editable_reader (Photo* self) {
 		g_clear_error (&_inner_error_);
 #line 967 "/home/jens/Source/shotwell/src/Photo.vala"
 		return NULL;
-#line 7866 "Photo.c"
+#line 7867 "Photo.c"
 	}
 }
 
@@ -7872,14 +7873,14 @@ static PhotoFileReader* photo_get_baseline_reader (Photo* self) {
 	GError * _inner_error_ = NULL;
 #line 973 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), NULL);
-#line 7876 "Photo.c"
+#line 7877 "Photo.c"
 	{
 		PhotoBackingReaders* _tmp0_ = NULL;
 #line 974 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->priv->readers;
 #line 974 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_readers);
-#line 7883 "Photo.c"
+#line 7884 "Photo.c"
 		{
 			PhotoBackingReaders* _tmp1_ = NULL;
 			PhotoFileReader* _tmp2_ = NULL;
@@ -7894,7 +7895,7 @@ static PhotoFileReader* photo_get_baseline_reader (Photo* self) {
 			_tmp2_ = _tmp1_->editable;
 #line 975 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp2_ != NULL) {
-#line 7898 "Photo.c"
+#line 7899 "Photo.c"
 				PhotoBackingReaders* _tmp3_ = NULL;
 				PhotoFileReader* _tmp4_ = NULL;
 				PhotoFileReader* _tmp5_ = NULL;
@@ -7906,18 +7907,18 @@ static PhotoFileReader* photo_get_baseline_reader (Photo* self) {
 				_tmp5_ = _photo_file_adapter_ref0 (_tmp4_);
 #line 976 "/home/jens/Source/shotwell/src/Photo.vala"
 				result = _tmp5_;
-#line 7910 "Photo.c"
+#line 7911 "Photo.c"
 				{
 					PhotoBackingReaders* _tmp6_ = NULL;
 #line 974 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp6_ = self->priv->readers;
 #line 974 "/home/jens/Source/shotwell/src/Photo.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 7917 "Photo.c"
+#line 7918 "Photo.c"
 				}
 #line 976 "/home/jens/Source/shotwell/src/Photo.vala"
 				return result;
-#line 7921 "Photo.c"
+#line 7922 "Photo.c"
 			}
 #line 978 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp7_ = self->priv->readers;
@@ -7925,7 +7926,7 @@ static PhotoFileReader* photo_get_baseline_reader (Photo* self) {
 			_tmp8_ = _tmp7_->developer;
 #line 978 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp8_ != NULL) {
-#line 7929 "Photo.c"
+#line 7930 "Photo.c"
 				PhotoBackingReaders* _tmp9_ = NULL;
 				PhotoFileReader* _tmp10_ = NULL;
 				PhotoFileReader* _tmp11_ = NULL;
@@ -7937,18 +7938,18 @@ static PhotoFileReader* photo_get_baseline_reader (Photo* self) {
 				_tmp11_ = _photo_file_adapter_ref0 (_tmp10_);
 #line 979 "/home/jens/Source/shotwell/src/Photo.vala"
 				result = _tmp11_;
-#line 7941 "Photo.c"
+#line 7942 "Photo.c"
 				{
 					PhotoBackingReaders* _tmp12_ = NULL;
 #line 974 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp12_ = self->priv->readers;
 #line 974 "/home/jens/Source/shotwell/src/Photo.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 7948 "Photo.c"
+#line 7949 "Photo.c"
 				}
 #line 979 "/home/jens/Source/shotwell/src/Photo.vala"
 				return result;
-#line 7952 "Photo.c"
+#line 7953 "Photo.c"
 			}
 #line 981 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp13_ = self->priv->readers;
@@ -7958,27 +7959,27 @@ static PhotoFileReader* photo_get_baseline_reader (Photo* self) {
 			_tmp15_ = _photo_file_adapter_ref0 (_tmp14_);
 #line 981 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp15_;
-#line 7962 "Photo.c"
+#line 7963 "Photo.c"
 			{
 				PhotoBackingReaders* _tmp16_ = NULL;
 #line 974 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp16_ = self->priv->readers;
 #line 974 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 7969 "Photo.c"
+#line 7970 "Photo.c"
 			}
 #line 981 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 7973 "Photo.c"
+#line 7974 "Photo.c"
 		}
-		__finally273:
+		__finally286:
 		{
 			PhotoBackingReaders* _tmp17_ = NULL;
 #line 974 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp17_ = self->priv->readers;
 #line 974 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 7982 "Photo.c"
+#line 7983 "Photo.c"
 		}
 #line 974 "/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);
@@ -7986,7 +7987,7 @@ static PhotoFileReader* photo_get_baseline_reader (Photo* self) {
 		g_clear_error (&_inner_error_);
 #line 974 "/home/jens/Source/shotwell/src/Photo.vala"
 		return NULL;
-#line 7990 "Photo.c"
+#line 7991 "Photo.c"
 	}
 }
 
@@ -7996,14 +7997,14 @@ static PhotoFileReader* photo_get_source_reader (Photo* self) {
 	GError * _inner_error_ = NULL;
 #line 986 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), NULL);
-#line 8000 "Photo.c"
+#line 8001 "Photo.c"
 	{
 		PhotoBackingReaders* _tmp0_ = NULL;
 #line 987 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->priv->readers;
 #line 987 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_readers);
-#line 8007 "Photo.c"
+#line 8008 "Photo.c"
 		{
 			PhotoBackingReaders* _tmp1_ = NULL;
 			PhotoFileReader* _tmp2_ = NULL;
@@ -8018,7 +8019,7 @@ static PhotoFileReader* photo_get_source_reader (Photo* self) {
 			_tmp2_ = _tmp1_->editable;
 #line 988 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp2_ != NULL) {
-#line 8022 "Photo.c"
+#line 8023 "Photo.c"
 				PhotoBackingReaders* _tmp3_ = NULL;
 				PhotoFileReader* _tmp4_ = NULL;
 				PhotoFileReader* _tmp5_ = NULL;
@@ -8030,18 +8031,18 @@ static PhotoFileReader* photo_get_source_reader (Photo* self) {
 				_tmp5_ = _photo_file_adapter_ref0 (_tmp4_);
 #line 989 "/home/jens/Source/shotwell/src/Photo.vala"
 				result = _tmp5_;
-#line 8034 "Photo.c"
+#line 8035 "Photo.c"
 				{
 					PhotoBackingReaders* _tmp6_ = NULL;
 #line 987 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp6_ = self->priv->readers;
 #line 987 "/home/jens/Source/shotwell/src/Photo.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 8041 "Photo.c"
+#line 8042 "Photo.c"
 				}
 #line 989 "/home/jens/Source/shotwell/src/Photo.vala"
 				return result;
-#line 8045 "Photo.c"
+#line 8046 "Photo.c"
 			}
 #line 991 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp7_ = self->priv->readers;
@@ -8049,7 +8050,7 @@ static PhotoFileReader* photo_get_source_reader (Photo* self) {
 			_tmp8_ = _tmp7_->developer;
 #line 991 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp8_ != NULL) {
-#line 8053 "Photo.c"
+#line 8054 "Photo.c"
 				PhotoBackingReaders* _tmp9_ = NULL;
 				PhotoFileReader* _tmp10_ = NULL;
 				PhotoFileReader* _tmp11_ = NULL;
@@ -8061,18 +8062,18 @@ static PhotoFileReader* photo_get_source_reader (Photo* self) {
 				_tmp11_ = _photo_file_adapter_ref0 (_tmp10_);
 #line 992 "/home/jens/Source/shotwell/src/Photo.vala"
 				result = _tmp11_;
-#line 8065 "Photo.c"
+#line 8066 "Photo.c"
 				{
 					PhotoBackingReaders* _tmp12_ = NULL;
 #line 987 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp12_ = self->priv->readers;
 #line 987 "/home/jens/Source/shotwell/src/Photo.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 8072 "Photo.c"
+#line 8073 "Photo.c"
 				}
 #line 992 "/home/jens/Source/shotwell/src/Photo.vala"
 				return result;
-#line 8076 "Photo.c"
+#line 8077 "Photo.c"
 			}
 #line 994 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp13_ = self->priv->readers;
@@ -8082,27 +8083,27 @@ static PhotoFileReader* photo_get_source_reader (Photo* self) {
 			_tmp15_ = _photo_file_adapter_ref0 (_tmp14_);
 #line 994 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp15_;
-#line 8086 "Photo.c"
+#line 8087 "Photo.c"
 			{
 				PhotoBackingReaders* _tmp16_ = NULL;
 #line 987 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp16_ = self->priv->readers;
 #line 987 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 8093 "Photo.c"
+#line 8094 "Photo.c"
 			}
 #line 994 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 8097 "Photo.c"
+#line 8098 "Photo.c"
 		}
-		__finally274:
+		__finally287:
 		{
 			PhotoBackingReaders* _tmp17_ = NULL;
 #line 987 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp17_ = self->priv->readers;
 #line 987 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 8106 "Photo.c"
+#line 8107 "Photo.c"
 		}
 #line 987 "/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);
@@ -8110,7 +8111,7 @@ static PhotoFileReader* photo_get_source_reader (Photo* self) {
 		g_clear_error (&_inner_error_);
 #line 987 "/home/jens/Source/shotwell/src/Photo.vala"
 		return NULL;
-#line 8114 "Photo.c"
+#line 8115 "Photo.c"
 	}
 }
 
@@ -8120,14 +8121,14 @@ static PhotoFileReader* photo_get_raw_developer_reader (Photo* self) {
 	GError * _inner_error_ = NULL;
 #line 999 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), NULL);
-#line 8124 "Photo.c"
+#line 8125 "Photo.c"
 	{
 		PhotoBackingReaders* _tmp0_ = NULL;
 #line 1000 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->priv->readers;
 #line 1000 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_readers);
-#line 8131 "Photo.c"
+#line 8132 "Photo.c"
 		{
 			PhotoBackingReaders* _tmp1_ = NULL;
 			PhotoFileReader* _tmp2_ = NULL;
@@ -8140,27 +8141,27 @@ static PhotoFileReader* photo_get_raw_developer_reader (Photo* self) {
 			_tmp3_ = _photo_file_adapter_ref0 (_tmp2_);
 #line 1001 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp3_;
-#line 8144 "Photo.c"
+#line 8145 "Photo.c"
 			{
 				PhotoBackingReaders* _tmp4_ = NULL;
 #line 1000 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp4_ = self->priv->readers;
 #line 1000 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 8151 "Photo.c"
+#line 8152 "Photo.c"
 			}
 #line 1001 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 8155 "Photo.c"
+#line 8156 "Photo.c"
 		}
-		__finally275:
+		__finally288:
 		{
 			PhotoBackingReaders* _tmp5_ = NULL;
 #line 1000 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp5_ = self->priv->readers;
 #line 1000 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 8164 "Photo.c"
+#line 8165 "Photo.c"
 		}
 #line 1000 "/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);
@@ -8168,7 +8169,7 @@ static PhotoFileReader* photo_get_raw_developer_reader (Photo* self) {
 		g_clear_error (&_inner_error_);
 #line 1000 "/home/jens/Source/shotwell/src/Photo.vala"
 		return NULL;
-#line 8172 "Photo.c"
+#line 8173 "Photo.c"
 	}
 }
 
@@ -8178,14 +8179,14 @@ gboolean photo_is_developed (Photo* self) {
 	GError * _inner_error_ = NULL;
 #line 1005 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), FALSE);
-#line 8182 "Photo.c"
+#line 8183 "Photo.c"
 	{
 		PhotoBackingReaders* _tmp0_ = NULL;
 #line 1006 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->priv->readers;
 #line 1006 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_readers);
-#line 8189 "Photo.c"
+#line 8190 "Photo.c"
 		{
 			PhotoBackingReaders* _tmp1_ = NULL;
 			PhotoFileReader* _tmp2_ = NULL;
@@ -8195,27 +8196,27 @@ gboolean photo_is_developed (Photo* self) {
 			_tmp2_ = _tmp1_->developer;
 #line 1007 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp2_ != NULL;
-#line 8199 "Photo.c"
+#line 8200 "Photo.c"
 			{
 				PhotoBackingReaders* _tmp3_ = NULL;
 #line 1006 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp3_ = self->priv->readers;
 #line 1006 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 8206 "Photo.c"
+#line 8207 "Photo.c"
 			}
 #line 1007 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 8210 "Photo.c"
+#line 8211 "Photo.c"
 		}
-		__finally276:
+		__finally289:
 		{
 			PhotoBackingReaders* _tmp4_ = NULL;
 #line 1006 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp4_ = self->priv->readers;
 #line 1006 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 8219 "Photo.c"
+#line 8220 "Photo.c"
 		}
 #line 1006 "/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);
@@ -8223,7 +8224,7 @@ gboolean photo_is_developed (Photo* self) {
 		g_clear_error (&_inner_error_);
 #line 1006 "/home/jens/Source/shotwell/src/Photo.vala"
 		return FALSE;
-#line 8227 "Photo.c"
+#line 8228 "Photo.c"
 	}
 }
 
@@ -8233,14 +8234,14 @@ gboolean photo_has_editable (Photo* self) {
 	GError * _inner_error_ = NULL;
 #line 1011 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), FALSE);
-#line 8237 "Photo.c"
+#line 8238 "Photo.c"
 	{
 		PhotoBackingReaders* _tmp0_ = NULL;
 #line 1012 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->priv->readers;
 #line 1012 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_readers);
-#line 8244 "Photo.c"
+#line 8245 "Photo.c"
 		{
 			PhotoBackingReaders* _tmp1_ = NULL;
 			PhotoFileReader* _tmp2_ = NULL;
@@ -8250,27 +8251,27 @@ gboolean photo_has_editable (Photo* self) {
 			_tmp2_ = _tmp1_->editable;
 #line 1013 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp2_ != NULL;
-#line 8254 "Photo.c"
+#line 8255 "Photo.c"
 			{
 				PhotoBackingReaders* _tmp3_ = NULL;
 #line 1012 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp3_ = self->priv->readers;
 #line 1012 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 8261 "Photo.c"
+#line 8262 "Photo.c"
 			}
 #line 1013 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 8265 "Photo.c"
+#line 8266 "Photo.c"
 		}
-		__finally277:
+		__finally290:
 		{
 			PhotoBackingReaders* _tmp4_ = NULL;
 #line 1012 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp4_ = self->priv->readers;
 #line 1012 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 8274 "Photo.c"
+#line 8275 "Photo.c"
 		}
 #line 1012 "/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);
@@ -8278,7 +8279,7 @@ gboolean photo_has_editable (Photo* self) {
 		g_clear_error (&_inner_error_);
 #line 1012 "/home/jens/Source/shotwell/src/Photo.vala"
 		return FALSE;
-#line 8282 "Photo.c"
+#line 8283 "Photo.c"
 	}
 }
 
@@ -8288,14 +8289,14 @@ gboolean photo_does_master_exist (Photo* self) {
 	GError * _inner_error_ = NULL;
 #line 1017 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), FALSE);
-#line 8292 "Photo.c"
+#line 8293 "Photo.c"
 	{
 		PhotoBackingReaders* _tmp0_ = NULL;
 #line 1018 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->priv->readers;
 #line 1018 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_readers);
-#line 8299 "Photo.c"
+#line 8300 "Photo.c"
 		{
 			PhotoBackingReaders* _tmp1_ = NULL;
 			PhotoFileReader* _tmp2_ = NULL;
@@ -8308,27 +8309,27 @@ gboolean photo_does_master_exist (Photo* self) {
 			_tmp3_ = photo_file_adapter_file_exists (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter));
 #line 1019 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp3_;
-#line 8312 "Photo.c"
+#line 8313 "Photo.c"
 			{
 				PhotoBackingReaders* _tmp4_ = NULL;
 #line 1018 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp4_ = self->priv->readers;
 #line 1018 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 8319 "Photo.c"
+#line 8320 "Photo.c"
 			}
 #line 1019 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 8323 "Photo.c"
+#line 8324 "Photo.c"
 		}
-		__finally278:
+		__finally291:
 		{
 			PhotoBackingReaders* _tmp5_ = NULL;
 #line 1018 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp5_ = self->priv->readers;
 #line 1018 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 8332 "Photo.c"
+#line 8333 "Photo.c"
 		}
 #line 1018 "/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);
@@ -8336,7 +8337,7 @@ gboolean photo_does_master_exist (Photo* self) {
 		g_clear_error (&_inner_error_);
 #line 1018 "/home/jens/Source/shotwell/src/Photo.vala"
 		return FALSE;
-#line 8340 "Photo.c"
+#line 8341 "Photo.c"
 	}
 }
 
@@ -8346,14 +8347,14 @@ gboolean photo_does_editable_exist (Photo* self) {
 	GError * _inner_error_ = NULL;
 #line 1024 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), FALSE);
-#line 8350 "Photo.c"
+#line 8351 "Photo.c"
 	{
 		PhotoBackingReaders* _tmp0_ = NULL;
 #line 1025 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->priv->readers;
 #line 1025 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_readers);
-#line 8357 "Photo.c"
+#line 8358 "Photo.c"
 		{
 			gboolean _tmp1_ = FALSE;
 			PhotoBackingReaders* _tmp2_ = NULL;
@@ -8364,7 +8365,7 @@ gboolean photo_does_editable_exist (Photo* self) {
 			_tmp3_ = _tmp2_->editable;
 #line 1026 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp3_ != NULL) {
-#line 8368 "Photo.c"
+#line 8369 "Photo.c"
 				PhotoBackingReaders* _tmp4_ = NULL;
 				PhotoFileReader* _tmp5_ = NULL;
 				gboolean _tmp6_ = FALSE;
@@ -8376,35 +8377,35 @@ gboolean photo_does_editable_exist (Photo* self) {
 				_tmp6_ = photo_file_adapter_file_exists (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter));
 #line 1026 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp1_ = _tmp6_;
-#line 8380 "Photo.c"
+#line 8381 "Photo.c"
 			} else {
 #line 1026 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp1_ = FALSE;
-#line 8384 "Photo.c"
+#line 8385 "Photo.c"
 			}
 #line 1026 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp1_;
-#line 8388 "Photo.c"
+#line 8389 "Photo.c"
 			{
 				PhotoBackingReaders* _tmp7_ = NULL;
 #line 1025 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp7_ = self->priv->readers;
 #line 1025 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 8395 "Photo.c"
+#line 8396 "Photo.c"
 			}
 #line 1026 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 8399 "Photo.c"
+#line 8400 "Photo.c"
 		}
-		__finally279:
+		__finally292:
 		{
 			PhotoBackingReaders* _tmp8_ = NULL;
 #line 1025 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp8_ = self->priv->readers;
 #line 1025 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 8408 "Photo.c"
+#line 8409 "Photo.c"
 		}
 #line 1025 "/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);
@@ -8412,7 +8413,7 @@ gboolean photo_does_editable_exist (Photo* self) {
 		g_clear_error (&_inner_error_);
 #line 1025 "/home/jens/Source/shotwell/src/Photo.vala"
 		return FALSE;
-#line 8416 "Photo.c"
+#line 8417 "Photo.c"
 	}
 }
 
@@ -8422,14 +8423,14 @@ gboolean photo_is_master_baseline (Photo* self) {
 	GError * _inner_error_ = NULL;
 #line 1030 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), FALSE);
-#line 8426 "Photo.c"
+#line 8427 "Photo.c"
 	{
 		PhotoBackingReaders* _tmp0_ = NULL;
 #line 1031 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->priv->readers;
 #line 1031 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_readers);
-#line 8433 "Photo.c"
+#line 8434 "Photo.c"
 		{
 			PhotoBackingReaders* _tmp1_ = NULL;
 			PhotoFileReader* _tmp2_ = NULL;
@@ -8439,27 +8440,27 @@ gboolean photo_is_master_baseline (Photo* self) {
 			_tmp2_ = _tmp1_->editable;
 #line 1032 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp2_ == NULL;
-#line 8443 "Photo.c"
+#line 8444 "Photo.c"
 			{
 				PhotoBackingReaders* _tmp3_ = NULL;
 #line 1031 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp3_ = self->priv->readers;
 #line 1031 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 8450 "Photo.c"
+#line 8451 "Photo.c"
 			}
 #line 1032 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 8454 "Photo.c"
+#line 8455 "Photo.c"
 		}
-		__finally280:
+		__finally293:
 		{
 			PhotoBackingReaders* _tmp4_ = NULL;
 #line 1031 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp4_ = self->priv->readers;
 #line 1031 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 8463 "Photo.c"
+#line 8464 "Photo.c"
 		}
 #line 1031 "/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);
@@ -8467,7 +8468,7 @@ gboolean photo_is_master_baseline (Photo* self) {
 		g_clear_error (&_inner_error_);
 #line 1031 "/home/jens/Source/shotwell/src/Photo.vala"
 		return FALSE;
-#line 8471 "Photo.c"
+#line 8472 "Photo.c"
 	}
 }
 
@@ -8483,7 +8484,7 @@ gboolean photo_is_master_source (Photo* self) {
 	result = !_tmp0_;
 #line 1037 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 8487 "Photo.c"
+#line 8488 "Photo.c"
 }
 
 
@@ -8492,14 +8493,14 @@ gboolean photo_is_editable_baseline (Photo* self) {
 	GError * _inner_error_ = NULL;
 #line 1040 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), FALSE);
-#line 8496 "Photo.c"
+#line 8497 "Photo.c"
 	{
 		PhotoBackingReaders* _tmp0_ = NULL;
 #line 1041 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->priv->readers;
 #line 1041 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_readers);
-#line 8503 "Photo.c"
+#line 8504 "Photo.c"
 		{
 			PhotoBackingReaders* _tmp1_ = NULL;
 			PhotoFileReader* _tmp2_ = NULL;
@@ -8509,27 +8510,27 @@ gboolean photo_is_editable_baseline (Photo* self) {
 			_tmp2_ = _tmp1_->editable;
 #line 1042 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp2_ != NULL;
-#line 8513 "Photo.c"
+#line 8514 "Photo.c"
 			{
 				PhotoBackingReaders* _tmp3_ = NULL;
 #line 1041 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp3_ = self->priv->readers;
 #line 1041 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 8520 "Photo.c"
+#line 8521 "Photo.c"
 			}
 #line 1042 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 8524 "Photo.c"
+#line 8525 "Photo.c"
 		}
-		__finally281:
+		__finally294:
 		{
 			PhotoBackingReaders* _tmp4_ = NULL;
 #line 1041 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp4_ = self->priv->readers;
 #line 1041 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 8533 "Photo.c"
+#line 8534 "Photo.c"
 		}
 #line 1041 "/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);
@@ -8537,7 +8538,7 @@ gboolean photo_is_editable_baseline (Photo* self) {
 		g_clear_error (&_inner_error_);
 #line 1041 "/home/jens/Source/shotwell/src/Photo.vala"
 		return FALSE;
-#line 8541 "Photo.c"
+#line 8542 "Photo.c"
 	}
 }
 
@@ -8553,7 +8554,7 @@ gboolean photo_is_editable_source (Photo* self) {
 	result = _tmp0_;
 #line 1047 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 8557 "Photo.c"
+#line 8558 "Photo.c"
 }
 
 
@@ -8562,14 +8563,14 @@ BackingPhotoRow* photo_get_master_photo_row (Photo* self) {
 	GError * _inner_error_ = NULL;
 #line 1050 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), NULL);
-#line 8566 "Photo.c"
+#line 8567 "Photo.c"
 	{
 		PhotoRow* _tmp0_ = NULL;
 #line 1051 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
 #line 1051 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 8573 "Photo.c"
+#line 8574 "Photo.c"
 		{
 			PhotoRow* _tmp1_ = NULL;
 			BackingPhotoRow* _tmp2_ = NULL;
@@ -8582,27 +8583,27 @@ BackingPhotoRow* photo_get_master_photo_row (Photo* self) {
 			_tmp3_ = _backing_photo_row_ref0 (_tmp2_);
 #line 1052 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp3_;
-#line 8586 "Photo.c"
+#line 8587 "Photo.c"
 			{
 				PhotoRow* _tmp4_ = NULL;
 #line 1051 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp4_ = self->row;
 #line 1051 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 8593 "Photo.c"
+#line 8594 "Photo.c"
 			}
 #line 1052 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 8597 "Photo.c"
+#line 8598 "Photo.c"
 		}
-		__finally282:
+		__finally295:
 		{
 			PhotoRow* _tmp5_ = NULL;
 #line 1051 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp5_ = self->row;
 #line 1051 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 8606 "Photo.c"
+#line 8607 "Photo.c"
 		}
 #line 1051 "/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);
@@ -8610,7 +8611,7 @@ BackingPhotoRow* photo_get_master_photo_row (Photo* self) {
 		g_clear_error (&_inner_error_);
 #line 1051 "/home/jens/Source/shotwell/src/Photo.vala"
 		return NULL;
-#line 8614 "Photo.c"
+#line 8615 "Photo.c"
 	}
 }
 
@@ -8620,14 +8621,14 @@ BackingPhotoRow* photo_get_editable_photo_row (Photo* self) {
 	GError * _inner_error_ = NULL;
 #line 1056 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), NULL);
-#line 8624 "Photo.c"
+#line 8625 "Photo.c"
 	{
 		PhotoRow* _tmp0_ = NULL;
 #line 1057 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
 #line 1057 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 8631 "Photo.c"
+#line 8632 "Photo.c"
 		{
 			PhotoRow* _tmp1_ = NULL;
 			gboolean _tmp2_ = FALSE;
@@ -8637,7 +8638,7 @@ BackingPhotoRow* photo_get_editable_photo_row (Photo* self) {
 			_tmp2_ = backing_photo_id_is_valid (&_tmp1_->editable_id);
 #line 1059 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp2_) {
-#line 8641 "Photo.c"
+#line 8642 "Photo.c"
 				BackingPhotoRow* _tmp3_ = NULL;
 				BackingPhotoRow* _tmp4_ = NULL;
 #line 1060 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -8646,43 +8647,43 @@ BackingPhotoRow* photo_get_editable_photo_row (Photo* self) {
 				_tmp4_ = _backing_photo_row_ref0 (_tmp3_);
 #line 1060 "/home/jens/Source/shotwell/src/Photo.vala"
 				result = _tmp4_;
-#line 8650 "Photo.c"
+#line 8651 "Photo.c"
 				{
 					PhotoRow* _tmp5_ = NULL;
 #line 1057 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp5_ = self->row;
 #line 1057 "/home/jens/Source/shotwell/src/Photo.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 8657 "Photo.c"
+#line 8658 "Photo.c"
 				}
 #line 1060 "/home/jens/Source/shotwell/src/Photo.vala"
 				return result;
-#line 8661 "Photo.c"
+#line 8662 "Photo.c"
 			} else {
 #line 1062 "/home/jens/Source/shotwell/src/Photo.vala"
 				result = NULL;
-#line 8665 "Photo.c"
+#line 8666 "Photo.c"
 				{
 					PhotoRow* _tmp6_ = NULL;
 #line 1057 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp6_ = self->row;
 #line 1057 "/home/jens/Source/shotwell/src/Photo.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 8672 "Photo.c"
+#line 8673 "Photo.c"
 				}
 #line 1062 "/home/jens/Source/shotwell/src/Photo.vala"
 				return result;
-#line 8676 "Photo.c"
+#line 8677 "Photo.c"
 			}
 		}
-		__finally283:
+		__finally296:
 		{
 			PhotoRow* _tmp7_ = NULL;
 #line 1057 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp7_ = self->row;
 #line 1057 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 8686 "Photo.c"
+#line 8687 "Photo.c"
 		}
 #line 1057 "/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);
@@ -8690,7 +8691,7 @@ BackingPhotoRow* photo_get_editable_photo_row (Photo* self) {
 		g_clear_error (&_inner_error_);
 #line 1057 "/home/jens/Source/shotwell/src/Photo.vala"
 		return NULL;
-#line 8694 "Photo.c"
+#line 8695 "Photo.c"
 	}
 }
 
@@ -8700,14 +8701,14 @@ GeeCollection* photo_get_raw_development_photo_rows (Photo* self) {
 	GError * _inner_error_ = NULL;
 #line 1066 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), NULL);
-#line 8704 "Photo.c"
+#line 8705 "Photo.c"
 	{
 		PhotoRow* _tmp0_ = NULL;
 #line 1067 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
 #line 1067 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 8711 "Photo.c"
+#line 8712 "Photo.c"
 		{
 			GeeCollection* _tmp1_ = NULL;
 			GeeHashMap* _tmp2_ = NULL;
@@ -8715,7 +8716,7 @@ GeeCollection* photo_get_raw_development_photo_rows (Photo* self) {
 			_tmp2_ = self->priv->developments;
 #line 1068 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp2_ != NULL) {
-#line 8719 "Photo.c"
+#line 8720 "Photo.c"
 				GeeHashMap* _tmp3_ = NULL;
 				GeeCollection* _tmp4_ = NULL;
 				GeeCollection* _tmp5_ = NULL;
@@ -8729,37 +8730,37 @@ GeeCollection* photo_get_raw_development_photo_rows (Photo* self) {
 				_g_object_unref0 (_tmp1_);
 #line 1068 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp1_ = _tmp5_;
-#line 8733 "Photo.c"
+#line 8734 "Photo.c"
 			} else {
 #line 1068 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (_tmp1_);
 #line 1068 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp1_ = NULL;
-#line 8739 "Photo.c"
+#line 8740 "Photo.c"
 			}
 #line 1068 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp1_;
-#line 8743 "Photo.c"
+#line 8744 "Photo.c"
 			{
 				PhotoRow* _tmp6_ = NULL;
 #line 1067 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp6_ = self->row;
 #line 1067 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 8750 "Photo.c"
+#line 8751 "Photo.c"
 			}
 #line 1068 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 8754 "Photo.c"
+#line 8755 "Photo.c"
 		}
-		__finally284:
+		__finally297:
 		{
 			PhotoRow* _tmp7_ = NULL;
 #line 1067 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp7_ = self->row;
 #line 1067 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 8763 "Photo.c"
+#line 8764 "Photo.c"
 		}
 #line 1067 "/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);
@@ -8767,7 +8768,7 @@ GeeCollection* photo_get_raw_development_photo_rows (Photo* self) {
 		g_clear_error (&_inner_error_);
 #line 1067 "/home/jens/Source/shotwell/src/Photo.vala"
 		return NULL;
-#line 8771 "Photo.c"
+#line 8772 "Photo.c"
 	}
 }
 
@@ -8777,14 +8778,14 @@ BackingPhotoRow* photo_get_raw_development_photo_row (Photo* self, RawDeveloper
 	GError * _inner_error_ = NULL;
 #line 1072 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), NULL);
-#line 8781 "Photo.c"
+#line 8782 "Photo.c"
 	{
 		PhotoRow* _tmp0_ = NULL;
 #line 1073 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
 #line 1073 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 8788 "Photo.c"
+#line 8789 "Photo.c"
 		{
 			BackingPhotoRow* _tmp1_ = NULL;
 			GeeHashMap* _tmp2_ = NULL;
@@ -8792,7 +8793,7 @@ BackingPhotoRow* photo_get_raw_development_photo_row (Photo* self, RawDeveloper
 			_tmp2_ = self->priv->developments;
 #line 1074 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp2_ != NULL) {
-#line 8796 "Photo.c"
+#line 8797 "Photo.c"
 				GeeHashMap* _tmp3_ = NULL;
 				RawDeveloper _tmp4_ = 0;
 				gpointer _tmp5_ = NULL;
@@ -8806,37 +8807,37 @@ BackingPhotoRow* photo_get_raw_development_photo_row (Photo* self, RawDeveloper
 				_backing_photo_row_unref0 (_tmp1_);
 #line 1074 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp1_ = (BackingPhotoRow*) _tmp5_;
-#line 8810 "Photo.c"
+#line 8811 "Photo.c"
 			} else {
 #line 1074 "/home/jens/Source/shotwell/src/Photo.vala"
 				_backing_photo_row_unref0 (_tmp1_);
 #line 1074 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp1_ = NULL;
-#line 8816 "Photo.c"
+#line 8817 "Photo.c"
 			}
 #line 1074 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp1_;
-#line 8820 "Photo.c"
+#line 8821 "Photo.c"
 			{
 				PhotoRow* _tmp6_ = NULL;
 #line 1073 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp6_ = self->row;
 #line 1073 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 8827 "Photo.c"
+#line 8828 "Photo.c"
 			}
 #line 1074 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 8831 "Photo.c"
+#line 8832 "Photo.c"
 		}
-		__finally285:
+		__finally298:
 		{
 			PhotoRow* _tmp7_ = NULL;
 #line 1073 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp7_ = self->row;
 #line 1073 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 8840 "Photo.c"
+#line 8841 "Photo.c"
 		}
 #line 1073 "/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);
@@ -8844,7 +8845,7 @@ BackingPhotoRow* photo_get_raw_development_photo_row (Photo* self, RawDeveloper
 		g_clear_error (&_inner_error_);
 #line 1073 "/home/jens/Source/shotwell/src/Photo.vala"
 		return NULL;
-#line 8848 "Photo.c"
+#line 8849 "Photo.c"
 	}
 }
 
@@ -8857,14 +8858,14 @@ static PhotoFileFormat* _photo_file_format_dup (PhotoFileFormat* self) {
 	memcpy (dup, self, sizeof (PhotoFileFormat));
 #line 1084 "/home/jens/Source/shotwell/src/Photo.vala"
 	return dup;
-#line 8861 "Photo.c"
+#line 8862 "Photo.c"
 }
 
 
 static gpointer __photo_file_format_dup0 (gpointer self) {
 #line 1084 "/home/jens/Source/shotwell/src/Photo.vala"
 	return self ? _photo_file_format_dup (self) : NULL;
-#line 8868 "Photo.c"
+#line 8869 "Photo.c"
 }
 
 
@@ -8892,7 +8893,7 @@ PhotoFileFormat* photo_get_editable_file_format (Photo* self) {
 		_photo_file_adapter_unref0 (reader);
 #line 1081 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 8896 "Photo.c"
+#line 8897 "Photo.c"
 	}
 #line 1084 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = reader;
@@ -8906,7 +8907,7 @@ PhotoFileFormat* photo_get_editable_file_format (Photo* self) {
 	_photo_file_adapter_unref0 (reader);
 #line 1084 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 8910 "Photo.c"
+#line 8911 "Photo.c"
 }
 
 
@@ -8932,7 +8933,7 @@ PhotoFileFormat photo_get_export_format_for_parameters (Photo* self, ExportForma
 	switch (_tmp2_) {
 #line 1090 "/home/jens/Source/shotwell/src/Photo.vala"
 		case EXPORT_FORMAT_MODE_UNMODIFIED:
-#line 8936 "Photo.c"
+#line 8937 "Photo.c"
 		{
 			PhotoFileFormat _tmp3_ = 0;
 #line 1092 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -8941,11 +8942,11 @@ PhotoFileFormat photo_get_export_format_for_parameters (Photo* self, ExportForma
 			_result_ = _tmp3_;
 #line 1093 "/home/jens/Source/shotwell/src/Photo.vala"
 			break;
-#line 8945 "Photo.c"
+#line 8946 "Photo.c"
 		}
 #line 1090 "/home/jens/Source/shotwell/src/Photo.vala"
 		case EXPORT_FORMAT_MODE_CURRENT:
-#line 8949 "Photo.c"
+#line 8950 "Photo.c"
 		{
 			PhotoFileFormat _tmp4_ = 0;
 #line 1096 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -8954,11 +8955,11 @@ PhotoFileFormat photo_get_export_format_for_parameters (Photo* self, ExportForma
 			_result_ = _tmp4_;
 #line 1097 "/home/jens/Source/shotwell/src/Photo.vala"
 			break;
-#line 8958 "Photo.c"
+#line 8959 "Photo.c"
 		}
 #line 1090 "/home/jens/Source/shotwell/src/Photo.vala"
 		case EXPORT_FORMAT_MODE_SPECIFIED:
-#line 8962 "Photo.c"
+#line 8963 "Photo.c"
 		{
 			ExportFormatParameters _tmp5_ = {0};
 			PhotoFileFormat _tmp6_ = 0;
@@ -8970,21 +8971,21 @@ PhotoFileFormat photo_get_export_format_for_parameters (Photo* self, ExportForma
 			_result_ = _tmp6_;
 #line 1101 "/home/jens/Source/shotwell/src/Photo.vala"
 			break;
-#line 8974 "Photo.c"
+#line 8975 "Photo.c"
 		}
 		default:
 		{
 #line 1104 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_error ("Photo.vala:1104: get_export_format_for_parameters: unsupported export " \
 "format mode");
-#line 8980 "Photo.c"
+#line 8981 "Photo.c"
 		}
 	}
 #line 1107 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _result_;
 #line 1107 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 8987 "Photo.c"
+#line 8988 "Photo.c"
 }
 
 
@@ -9008,7 +9009,7 @@ gchar* photo_get_export_basename_for_parameters (Photo* self, ExportFormatParame
 	switch (_tmp1_) {
 #line 1113 "/home/jens/Source/shotwell/src/Photo.vala"
 		case EXPORT_FORMAT_MODE_UNMODIFIED:
-#line 9011 "Photo.c"
+#line 9012 "Photo.c"
 		{
 			GFile* _tmp2_ = NULL;
 			GFile* _tmp3_ = NULL;
@@ -9027,13 +9028,13 @@ gchar* photo_get_export_basename_for_parameters (Photo* self, ExportFormatParame
 			_g_object_unref0 (_tmp3_);
 #line 1116 "/home/jens/Source/shotwell/src/Photo.vala"
 			break;
-#line 9030 "Photo.c"
+#line 9031 "Photo.c"
 		}
 #line 1113 "/home/jens/Source/shotwell/src/Photo.vala"
 		case EXPORT_FORMAT_MODE_CURRENT:
 #line 1113 "/home/jens/Source/shotwell/src/Photo.vala"
 		case EXPORT_FORMAT_MODE_SPECIFIED:
-#line 9036 "Photo.c"
+#line 9037 "Photo.c"
 		{
 			ExportFormatParameters _tmp5_ = {0};
 			PhotoFileFormat _tmp6_ = 0;
@@ -9050,14 +9051,14 @@ gchar* photo_get_export_basename_for_parameters (Photo* self, ExportFormatParame
 			_g_free0 (_result_);
 #line 1120 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 9053 "Photo.c"
+#line 9054 "Photo.c"
 		}
 		default:
 		{
 #line 1123 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_error ("Photo.vala:1123: get_export_basename_for_parameters: unsupported expor" \
 "t format mode");
-#line 9059 "Photo.c"
+#line 9060 "Photo.c"
 		}
 	}
 #line 1126 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -9068,7 +9069,7 @@ gchar* photo_get_export_basename_for_parameters (Photo* self, ExportFormatParame
 	result = _result_;
 #line 1127 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 9070 "Photo.c"
+#line 9071 "Photo.c"
 }
 
 
@@ -9209,7 +9210,7 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) {
 	file = _tmp2_;
 #line 1148 "/home/jens/Source/shotwell/src/Photo.vala"
 	info = NULL;
-#line 9211 "Photo.c"
+#line 9212 "Photo.c"
 	{
 		GFileInfo* _tmp3_ = NULL;
 		GFile* _tmp4_ = NULL;
@@ -9223,8 +9224,8 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) {
 		_tmp3_ = _tmp5_;
 #line 1150 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 9225 "Photo.c"
-			goto __catch286_g_error;
+#line 9226 "Photo.c"
+			goto __catch299_g_error;
 		}
 #line 1150 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp6_ = _tmp3_;
@@ -9236,10 +9237,10 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) {
 		info = _tmp6_;
 #line 1149 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_tmp3_);
-#line 9238 "Photo.c"
+#line 9239 "Photo.c"
 	}
-	goto __finally286;
-	__catch286_g_error:
+	goto __finally299;
+	__catch299_g_error:
 	{
 		GError* err = NULL;
 #line 1149 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -9256,9 +9257,9 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) {
 		_g_object_unref0 (file);
 #line 1153 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 9258 "Photo.c"
+#line 9259 "Photo.c"
 	}
-	__finally286:
+	__finally299:
 #line 1149 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1149 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -9271,7 +9272,7 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) {
 		g_clear_error (&_inner_error_);
 #line 1149 "/home/jens/Source/shotwell/src/Photo.vala"
 		return 0;
-#line 9273 "Photo.c"
+#line 9274 "Photo.c"
 	}
 #line 1156 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp7_ = info;
@@ -9287,7 +9288,7 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) {
 		_g_object_unref0 (file);
 #line 1157 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 9289 "Photo.c"
+#line 9290 "Photo.c"
 	}
 #line 1159 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp9_ = file;
@@ -9295,7 +9296,7 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) {
 	_tmp10_ = photo_is_file_image (_tmp9_);
 #line 1159 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (!_tmp10_) {
-#line 9297 "Photo.c"
+#line 9298 "Photo.c"
 		GFile* _tmp11_ = NULL;
 		gchar* _tmp12_ = NULL;
 		gchar* _tmp13_ = NULL;
@@ -9317,7 +9318,7 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) {
 		_g_object_unref0 (file);
 #line 1162 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 9319 "Photo.c"
+#line 9320 "Photo.c"
 	}
 #line 1165 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp14_ = file;
@@ -9325,7 +9326,7 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) {
 	_tmp15_ = photo_file_format_is_file_supported (_tmp14_);
 #line 1165 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (!_tmp15_) {
-#line 9327 "Photo.c"
+#line 9328 "Photo.c"
 		GFile* _tmp16_ = NULL;
 		gchar* _tmp17_ = NULL;
 		gchar* _tmp18_ = NULL;
@@ -9347,7 +9348,7 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) {
 		_g_object_unref0 (file);
 #line 1168 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 9349 "Photo.c"
+#line 9350 "Photo.c"
 	}
 #line 1171 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp19_ = info;
@@ -9361,7 +9362,7 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) {
 	_tmp24_ = _tmp23_->exif_md5;
 #line 1174 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp24_ != NULL) {
-#line 9363 "Photo.c"
+#line 9364 "Photo.c"
 		PhotoImportParams* _tmp25_ = NULL;
 		const gchar* _tmp26_ = NULL;
 #line 1174 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -9370,15 +9371,15 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) {
 		_tmp26_ = _tmp25_->thumbnail_md5;
 #line 1174 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp22_ = _tmp26_ != NULL;
-#line 9372 "Photo.c"
+#line 9373 "Photo.c"
 	} else {
 #line 1174 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp22_ = FALSE;
-#line 9376 "Photo.c"
+#line 9377 "Photo.c"
 	}
 #line 1174 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp22_) {
-#line 9380 "Photo.c"
+#line 9381 "Photo.c"
 		PhotoImportParams* _tmp27_ = NULL;
 		const gchar* _tmp28_ = NULL;
 #line 1174 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -9387,15 +9388,15 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) {
 		_tmp28_ = _tmp27_->full_md5;
 #line 1174 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp21_ = _tmp28_ != NULL;
-#line 9389 "Photo.c"
+#line 9390 "Photo.c"
 	} else {
 #line 1174 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp21_ = FALSE;
-#line 9393 "Photo.c"
+#line 9394 "Photo.c"
 	}
 #line 1174 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp21_) {
-#line 9397 "Photo.c"
+#line 9398 "Photo.c"
 		PhotoImportParams* _tmp29_ = NULL;
 		PhotoImportParams* _tmp30_ = NULL;
 		PhotoFileSnifferOptions _tmp31_ = 0;
@@ -9407,7 +9408,7 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) {
 		_tmp31_ = _tmp30_->sniffer_options;
 #line 1175 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp30_->sniffer_options = _tmp31_ | PHOTO_FILE_SNIFFER_OPTIONS_NO_MD5;
-#line 9409 "Photo.c"
+#line 9410 "Photo.c"
 	}
 #line 1178 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp32_ = file;
@@ -9419,7 +9420,7 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) {
 	_tmp35_ = photo_file_interrogator_new (_tmp32_, _tmp34_);
 #line 1178 "/home/jens/Source/shotwell/src/Photo.vala"
 	interrogator = _tmp35_;
-#line 9421 "Photo.c"
+#line 9422 "Photo.c"
 	{
 		PhotoFileInterrogator* _tmp36_ = NULL;
 #line 1180 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -9428,12 +9429,12 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) {
 		photo_file_interrogator_interrogate (_tmp36_, &_inner_error_);
 #line 1180 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 9430 "Photo.c"
-			goto __catch287_g_error;
+#line 9431 "Photo.c"
+			goto __catch300_g_error;
 		}
 	}
-	goto __finally287;
-	__catch287_g_error:
+	goto __finally300;
+	__catch300_g_error:
 	{
 		GError* err = NULL;
 		GFile* _tmp37_ = NULL;
@@ -9471,9 +9472,9 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) {
 		_g_object_unref0 (file);
 #line 1184 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 9473 "Photo.c"
+#line 9474 "Photo.c"
 	}
-	__finally287:
+	__finally300:
 #line 1179 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1179 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -9488,7 +9489,7 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) {
 		g_clear_error (&_inner_error_);
 #line 1179 "/home/jens/Source/shotwell/src/Photo.vala"
 		return 0;
-#line 9490 "Photo.c"
+#line 9491 "Photo.c"
 	}
 #line 1187 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp42_ = interrogator;
@@ -9506,7 +9507,7 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) {
 		_g_object_unref0 (file);
 #line 1188 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 9508 "Photo.c"
+#line 9509 "Photo.c"
 	}
 #line 1191 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp44_ = interrogator;
@@ -9520,7 +9521,7 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) {
 	if (_tmp47_ == NULL) {
 #line 1192 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp46_ = TRUE;
-#line 9522 "Photo.c"
+#line 9523 "Photo.c"
 	} else {
 		DetectedPhotoInformation* _tmp48_ = NULL;
 		PhotoFileFormat _tmp49_ = 0;
@@ -9530,7 +9531,7 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) {
 		_tmp49_ = _tmp48_->file_format;
 #line 1192 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp46_ = _tmp49_ == PHOTO_FILE_FORMAT_UNKNOWN;
-#line 9532 "Photo.c"
+#line 9533 "Photo.c"
 	}
 #line 1192 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp46_) {
@@ -9546,7 +9547,7 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) {
 		_g_object_unref0 (file);
 #line 1193 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 9548 "Photo.c"
+#line 9549 "Photo.c"
 	}
 #line 1196 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp50_ = params;
@@ -9554,7 +9555,7 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) {
 	_tmp51_ = _tmp50_->sniffer_options;
 #line 1196 "/home/jens/Source/shotwell/src/Photo.vala"
 	if ((_tmp51_ & PHOTO_FILE_SNIFFER_OPTIONS_NO_MD5) != 0) {
-#line 9556 "Photo.c"
+#line 9557 "Photo.c"
 		DetectedPhotoInformation* _tmp52_ = NULL;
 		PhotoImportParams* _tmp53_ = NULL;
 		const gchar* _tmp54_ = NULL;
@@ -9603,7 +9604,7 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) {
 		_g_free0 (_tmp60_->md5);
 #line 1199 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp60_->md5 = _tmp63_;
-#line 9605 "Photo.c"
+#line 9606 "Photo.c"
 	}
 #line 1202 "/home/jens/Source/shotwell/src/Photo.vala"
 	orientation = ORIENTATION_TOP_LEFT;
@@ -9625,7 +9626,7 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) {
 	_tmp67_ = _tmp66_->metadata;
 #line 1213 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp67_ != NULL) {
-#line 9627 "Photo.c"
+#line 9628 "Photo.c"
 		MetadataDateTime* date_time = NULL;
 		DetectedPhotoInformation* _tmp68_ = NULL;
 		PhotoMetadata* _tmp69_ = NULL;
@@ -9659,7 +9660,7 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) {
 		_tmp71_ = date_time;
 #line 1215 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp71_ != NULL) {
-#line 9661 "Photo.c"
+#line 9662 "Photo.c"
 			MetadataDateTime* _tmp72_ = NULL;
 			time_t _tmp73_ = 0;
 #line 1216 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -9668,7 +9669,7 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) {
 			_tmp73_ = metadata_date_time_get_timestamp (_tmp72_);
 #line 1216 "/home/jens/Source/shotwell/src/Photo.vala"
 			exposure_time = _tmp73_;
-#line 9670 "Photo.c"
+#line 9671 "Photo.c"
 		}
 #line 1218 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp74_ = detected;
@@ -9720,7 +9721,7 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) {
 		rating = _tmp89_;
 #line 1213 "/home/jens/Source/shotwell/src/Photo.vala"
 		_metadata_date_time_unref0 (date_time);
-#line 9722 "Photo.c"
+#line 9723 "Photo.c"
 	}
 #line 1226 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp92_ = detected;
@@ -9730,7 +9731,7 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) {
 	if (_tmp93_ != GDK_COLORSPACE_RGB) {
 #line 1226 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp91_ = TRUE;
-#line 9732 "Photo.c"
+#line 9733 "Photo.c"
 	} else {
 		DetectedPhotoInformation* _tmp94_ = NULL;
 		gint _tmp95_ = 0;
@@ -9740,13 +9741,13 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) {
 		_tmp95_ = _tmp94_->channels;
 #line 1227 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp91_ = _tmp95_ < 3;
-#line 9742 "Photo.c"
+#line 9743 "Photo.c"
 	}
 #line 1226 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp91_) {
 #line 1226 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp90_ = TRUE;
-#line 9748 "Photo.c"
+#line 9749 "Photo.c"
 	} else {
 		DetectedPhotoInformation* _tmp96_ = NULL;
 		gint _tmp97_ = 0;
@@ -9756,11 +9757,11 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) {
 		_tmp97_ = _tmp96_->bits_per_channel;
 #line 1228 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp90_ = _tmp97_ != 8;
-#line 9758 "Photo.c"
+#line 9759 "Photo.c"
 	}
 #line 1226 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp90_) {
-#line 9762 "Photo.c"
+#line 9763 "Photo.c"
 		GFile* _tmp98_ = NULL;
 		gchar* _tmp99_ = NULL;
 		gchar* _tmp100_ = NULL;
@@ -9790,7 +9791,7 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) {
 		_g_object_unref0 (file);
 #line 1231 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 9792 "Photo.c"
+#line 9793 "Photo.c"
 	}
 #line 1237 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp101_ = params;
@@ -10002,7 +10003,7 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) {
 	_tmp177_ = _tmp176_->thumbnails;
 #line 1258 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp177_ != NULL) {
-#line 10004 "Photo.c"
+#line 10005 "Photo.c"
 		PhotoFileReader* reader = NULL;
 		PhotoImportParams* _tmp178_ = NULL;
 		PhotoRow* _tmp179_ = NULL;
@@ -10033,7 +10034,7 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) {
 		_tmp186_ = photo_file_format_create_reader (_tmp181_, _tmp185_);
 #line 1259 "/home/jens/Source/shotwell/src/Photo.vala"
 		reader = _tmp186_;
-#line 10035 "Photo.c"
+#line 10036 "Photo.c"
 		{
 			PhotoImportParams* _tmp187_ = NULL;
 			Thumbnails* _tmp188_ = NULL;
@@ -10069,12 +10070,12 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) {
 			thumbnail_cache_generate_for_photo (_tmp188_, _tmp189_, _tmp192_, &_tmp196_, &_inner_error_);
 #line 1262 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 10071 "Photo.c"
-				goto __catch288_g_error;
+#line 10072 "Photo.c"
+				goto __catch301_g_error;
 			}
 		}
-		goto __finally288;
-		__catch288_g_error:
+		goto __finally301;
+		__catch301_g_error:
 		{
 			GError* err = NULL;
 			GError* _tmp197_ = NULL;
@@ -10107,9 +10108,9 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) {
 			_g_object_unref0 (file);
 #line 1265 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 10109 "Photo.c"
+#line 10110 "Photo.c"
 		}
-		__finally288:
+		__finally301:
 #line 1261 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1261 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -10132,11 +10133,11 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) {
 			g_clear_error (&_inner_error_);
 #line 1261 "/home/jens/Source/shotwell/src/Photo.vala"
 			return 0;
-#line 10134 "Photo.c"
+#line 10135 "Photo.c"
 		}
 #line 1258 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_adapter_unref0 (reader);
-#line 10138 "Photo.c"
+#line 10139 "Photo.c"
 	}
 #line 1272 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = IMPORT_RESULT_SUCCESS;
@@ -10154,7 +10155,7 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) {
 	_g_object_unref0 (file);
 #line 1272 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 10156 "Photo.c"
+#line 10157 "Photo.c"
 }
 
 
@@ -10393,7 +10394,7 @@ void photo_create_pre_import (PhotoImportParams* params) {
 	_tmp56_ = photo_file_interrogator_new (_tmp53_, _tmp55_);
 #line 1298 "/home/jens/Source/shotwell/src/Photo.vala"
 	interrogator = _tmp56_;
-#line 10395 "Photo.c"
+#line 10396 "Photo.c"
 	{
 		DetectedPhotoInformation* detected = NULL;
 		DetectedPhotoInformation* _tmp57_ = NULL;
@@ -10404,8 +10405,8 @@ void photo_create_pre_import (PhotoImportParams* params) {
 		photo_file_interrogator_interrogate (interrogator, &_inner_error_);
 #line 1300 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 10406 "Photo.c"
-			goto __catch289_g_error;
+#line 10407 "Photo.c"
+			goto __catch302_g_error;
 		}
 #line 1301 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp57_ = photo_file_interrogator_get_detected_photo_information (interrogator);
@@ -10415,21 +10416,21 @@ void photo_create_pre_import (PhotoImportParams* params) {
 		_tmp60_ = detected;
 #line 1302 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp60_ != NULL) {
-#line 10417 "Photo.c"
+#line 10418 "Photo.c"
 			gboolean _tmp61_ = FALSE;
 #line 1302 "/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"
 			_tmp59_ = !_tmp61_;
-#line 10423 "Photo.c"
+#line 10424 "Photo.c"
 		} else {
 #line 1302 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp59_ = FALSE;
-#line 10427 "Photo.c"
+#line 10428 "Photo.c"
 		}
 #line 1302 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp59_) {
-#line 10431 "Photo.c"
+#line 10432 "Photo.c"
 			DetectedPhotoInformation* _tmp62_ = NULL;
 			PhotoFileFormat _tmp63_ = 0;
 #line 1302 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -10438,15 +10439,15 @@ void photo_create_pre_import (PhotoImportParams* params) {
 			_tmp63_ = _tmp62_->file_format;
 #line 1302 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp58_ = _tmp63_ != PHOTO_FILE_FORMAT_UNKNOWN;
-#line 10440 "Photo.c"
+#line 10441 "Photo.c"
 		} else {
 #line 1302 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp58_ = FALSE;
-#line 10444 "Photo.c"
+#line 10445 "Photo.c"
 		}
 #line 1302 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp58_) {
-#line 10448 "Photo.c"
+#line 10449 "Photo.c"
 			PhotoImportParams* _tmp64_ = NULL;
 			PhotoRow* _tmp65_ = NULL;
 			BackingPhotoRow* _tmp66_ = NULL;
@@ -10464,14 +10465,14 @@ void photo_create_pre_import (PhotoImportParams* params) {
 			_tmp68_ = _tmp67_->file_format;
 #line 1303 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp66_->file_format = _tmp68_;
-#line 10466 "Photo.c"
+#line 10467 "Photo.c"
 		}
 #line 1299 "/home/jens/Source/shotwell/src/Photo.vala"
 		_detected_photo_information_unref0 (detected);
-#line 10470 "Photo.c"
+#line 10471 "Photo.c"
 	}
-	goto __finally289;
-	__catch289_g_error:
+	goto __finally302;
+	__catch302_g_error:
 	{
 		GError* err = NULL;
 		gchar* _tmp69_ = NULL;
@@ -10496,9 +10497,9 @@ void photo_create_pre_import (PhotoImportParams* params) {
 		_g_free0 (_tmp70_);
 #line 1299 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_error_free0 (err);
-#line 10498 "Photo.c"
+#line 10499 "Photo.c"
 	}
-	__finally289:
+	__finally302:
 #line 1299 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1299 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -10511,13 +10512,13 @@ void photo_create_pre_import (PhotoImportParams* params) {
 		g_clear_error (&_inner_error_);
 #line 1299 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 10513 "Photo.c"
+#line 10514 "Photo.c"
 	}
 #line 1275 "/home/jens/Source/shotwell/src/Photo.vala"
 	_photo_file_interrogator_unref0 (interrogator);
 #line 1275 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (file);
-#line 10519 "Photo.c"
+#line 10520 "Photo.c"
 }
 
 
@@ -10573,7 +10574,7 @@ BackingPhotoRow* photo_query_backing_photo_row (Photo* self, GFile* file, PhotoF
 	backing = _tmp0_;
 #line 1315 "/home/jens/Source/shotwell/src/Photo.vala"
 	info = NULL;
-#line 10575 "Photo.c"
+#line 10576 "Photo.c"
 	{
 		GFileInfo* _tmp1_ = NULL;
 		GFile* _tmp2_ = NULL;
@@ -10587,8 +10588,8 @@ BackingPhotoRow* photo_query_backing_photo_row (Photo* self, GFile* file, PhotoF
 		_tmp1_ = _tmp3_;
 #line 1317 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 10589 "Photo.c"
-			goto __catch290_g_error;
+#line 10590 "Photo.c"
+			goto __catch303_g_error;
 		}
 #line 1317 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp4_ = _tmp1_;
@@ -10600,10 +10601,10 @@ BackingPhotoRow* photo_query_backing_photo_row (Photo* self, GFile* file, PhotoF
 		info = _tmp4_;
 #line 1316 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_tmp1_);
-#line 10602 "Photo.c"
+#line 10603 "Photo.c"
 	}
-	goto __finally290;
-	__catch290_g_error:
+	goto __finally303;
+	__catch303_g_error:
 	{
 		GError* err = NULL;
 		GFile* _tmp5_ = NULL;
@@ -10641,17 +10642,17 @@ BackingPhotoRow* photo_query_backing_photo_row (Photo* self, GFile* file, PhotoF
 		if (detected) {
 #line 1322 "/home/jens/Source/shotwell/src/Photo.vala"
 			*detected = _vala_detected;
-#line 10643 "Photo.c"
+#line 10644 "Photo.c"
 		} else {
 #line 1322 "/home/jens/Source/shotwell/src/Photo.vala"
 			_detected_photo_information_unref0 (_vala_detected);
-#line 10647 "Photo.c"
+#line 10648 "Photo.c"
 		}
 #line 1322 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 10651 "Photo.c"
+#line 10652 "Photo.c"
 	}
-	__finally290:
+	__finally303:
 #line 1316 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1316 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -10662,7 +10663,7 @@ BackingPhotoRow* photo_query_backing_photo_row (Photo* self, GFile* file, PhotoF
 		_backing_photo_row_unref0 (backing);
 #line 1316 "/home/jens/Source/shotwell/src/Photo.vala"
 		return NULL;
-#line 10664 "Photo.c"
+#line 10665 "Photo.c"
 	}
 #line 1326 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp10_ = file;
@@ -10688,7 +10689,7 @@ BackingPhotoRow* photo_query_backing_photo_row (Photo* self, GFile* file, PhotoF
 		_backing_photo_row_unref0 (backing);
 #line 1327 "/home/jens/Source/shotwell/src/Photo.vala"
 		return NULL;
-#line 10690 "Photo.c"
+#line 10691 "Photo.c"
 	}
 #line 1328 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp14_ = interrogator;
@@ -10704,7 +10705,7 @@ BackingPhotoRow* photo_query_backing_photo_row (Photo* self, GFile* file, PhotoF
 	if (_tmp17_ == NULL) {
 #line 1329 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp16_ = TRUE;
-#line 10706 "Photo.c"
+#line 10707 "Photo.c"
 	} else {
 		PhotoFileInterrogator* _tmp18_ = NULL;
 		gboolean _tmp19_ = FALSE;
@@ -10714,11 +10715,11 @@ BackingPhotoRow* photo_query_backing_photo_row (Photo* self, GFile* file, PhotoF
 		_tmp19_ = photo_file_interrogator_get_is_photo_corrupted (_tmp18_);
 #line 1329 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp16_ = _tmp19_;
-#line 10716 "Photo.c"
+#line 10717 "Photo.c"
 	}
 #line 1329 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp16_) {
-#line 10720 "Photo.c"
+#line 10721 "Photo.c"
 		gchar* _tmp20_ = NULL;
 		gchar* _tmp21_ = NULL;
 #line 1330 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -10741,15 +10742,15 @@ BackingPhotoRow* photo_query_backing_photo_row (Photo* self, GFile* file, PhotoF
 		if (detected) {
 #line 1332 "/home/jens/Source/shotwell/src/Photo.vala"
 			*detected = _vala_detected;
-#line 10743 "Photo.c"
+#line 10744 "Photo.c"
 		} else {
 #line 1332 "/home/jens/Source/shotwell/src/Photo.vala"
 			_detected_photo_information_unref0 (_vala_detected);
-#line 10747 "Photo.c"
+#line 10748 "Photo.c"
 		}
 #line 1332 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 10751 "Photo.c"
+#line 10752 "Photo.c"
 	}
 #line 1335 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp22_ = info;
@@ -10805,7 +10806,7 @@ BackingPhotoRow* photo_query_backing_photo_row (Photo* self, GFile* file, PhotoF
 	_tmp41_ = _tmp40_->metadata;
 #line 1342 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp41_ != NULL) {
-#line 10807 "Photo.c"
+#line 10808 "Photo.c"
 		DetectedPhotoInformation* _tmp42_ = NULL;
 		PhotoMetadata* _tmp43_ = NULL;
 		Orientation _tmp44_ = 0;
@@ -10817,11 +10818,11 @@ BackingPhotoRow* photo_query_backing_photo_row (Photo* self, GFile* file, PhotoF
 		_tmp44_ = photo_metadata_get_orientation (_tmp43_);
 #line 1343 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp39_ = _tmp44_;
-#line 10819 "Photo.c"
+#line 10820 "Photo.c"
 	} else {
 #line 1343 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp39_ = ORIENTATION_TOP_LEFT;
-#line 10823 "Photo.c"
+#line 10824 "Photo.c"
 	}
 #line 1342 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp45_ = backing;
@@ -10837,15 +10838,15 @@ BackingPhotoRow* photo_query_backing_photo_row (Photo* self, GFile* file, PhotoF
 	if (detected) {
 #line 1345 "/home/jens/Source/shotwell/src/Photo.vala"
 		*detected = _vala_detected;
-#line 10839 "Photo.c"
+#line 10840 "Photo.c"
 	} else {
 #line 1345 "/home/jens/Source/shotwell/src/Photo.vala"
 		_detected_photo_information_unref0 (_vala_detected);
-#line 10843 "Photo.c"
+#line 10844 "Photo.c"
 	}
 #line 1345 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 10847 "Photo.c"
+#line 10848 "Photo.c"
 }
 
 
@@ -10856,13 +10857,13 @@ static void _vala_array_add254 (gchar*** array, int* length, int* size, gchar* v
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 1441 "/home/jens/Source/shotwell/src/Photo.vala"
 		*array = g_renew (gchar*, *array, (*size) + 1);
-#line 10858 "Photo.c"
+#line 10859 "Photo.c"
 	}
 #line 1441 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[(*length)++] = value;
 #line 1441 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[*length] = NULL;
-#line 10864 "Photo.c"
+#line 10865 "Photo.c"
 }
 
 
@@ -10873,13 +10874,13 @@ static void _vala_array_add255 (gchar*** array, int* length, int* size, gchar* v
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 1444 "/home/jens/Source/shotwell/src/Photo.vala"
 		*array = g_renew (gchar*, *array, (*size) + 1);
-#line 10875 "Photo.c"
+#line 10876 "Photo.c"
 	}
 #line 1444 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[(*length)++] = value;
 #line 1444 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[*length] = NULL;
-#line 10881 "Photo.c"
+#line 10882 "Photo.c"
 }
 
 
@@ -10890,13 +10891,13 @@ static void _vala_array_add256 (gchar*** array, int* length, int* size, gchar* v
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 1451 "/home/jens/Source/shotwell/src/Photo.vala"
 		*array = g_renew (gchar*, *array, (*size) + 1);
-#line 10892 "Photo.c"
+#line 10893 "Photo.c"
 	}
 #line 1451 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[(*length)++] = value;
 #line 1451 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[*length] = NULL;
-#line 10898 "Photo.c"
+#line 10899 "Photo.c"
 }
 
 
@@ -10907,13 +10908,13 @@ static void _vala_array_add257 (gchar*** array, int* length, int* size, gchar* v
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 1454 "/home/jens/Source/shotwell/src/Photo.vala"
 		*array = g_renew (gchar*, *array, (*size) + 1);
-#line 10909 "Photo.c"
+#line 10910 "Photo.c"
 	}
 #line 1454 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[(*length)++] = value;
 #line 1454 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[*length] = NULL;
-#line 10915 "Photo.c"
+#line 10916 "Photo.c"
 }
 
 
@@ -10924,13 +10925,13 @@ static void _vala_array_add258 (gchar*** array, int* length, int* size, gchar* v
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 1457 "/home/jens/Source/shotwell/src/Photo.vala"
 		*array = g_renew (gchar*, *array, (*size) + 1);
-#line 10926 "Photo.c"
+#line 10927 "Photo.c"
 	}
 #line 1457 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[(*length)++] = value;
 #line 1457 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[*length] = NULL;
-#line 10932 "Photo.c"
+#line 10933 "Photo.c"
 }
 
 
@@ -10941,20 +10942,20 @@ static void _vala_array_add259 (gchar*** array, int* length, int* size, gchar* v
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 1460 "/home/jens/Source/shotwell/src/Photo.vala"
 		*array = g_renew (gchar*, *array, (*size) + 1);
-#line 10943 "Photo.c"
+#line 10944 "Photo.c"
 	}
 #line 1460 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[(*length)++] = value;
 #line 1460 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[*length] = NULL;
-#line 10949 "Photo.c"
+#line 10950 "Photo.c"
 }
 
 
 static gpointer _media_metadata_ref0 (gpointer self) {
 #line 1470 "/home/jens/Source/shotwell/src/Photo.vala"
 	return self ? media_metadata_ref (self) : NULL;
-#line 10956 "Photo.c"
+#line 10957 "Photo.c"
 }
 
 
@@ -11055,13 +11056,13 @@ gboolean photo_prepare_for_reimport_master (Photo* self, PhotoReimportMasterStat
 		_g_object_unref0 (file);
 #line 1415 "/home/jens/Source/shotwell/src/Photo.vala"
 		return FALSE;
-#line 11057 "Photo.c"
+#line 11058 "Photo.c"
 	}
 #line 1417 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp7_ = backing;
 #line 1417 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp7_ == NULL) {
-#line 11063 "Photo.c"
+#line 11064 "Photo.c"
 		GFile* _tmp8_ = NULL;
 		gchar* _tmp9_ = NULL;
 		gchar* _tmp10_ = NULL;
@@ -11087,15 +11088,15 @@ gboolean photo_prepare_for_reimport_master (Photo* self, PhotoReimportMasterStat
 		if (reimport_state) {
 #line 1419 "/home/jens/Source/shotwell/src/Photo.vala"
 			*reimport_state = _vala_reimport_state;
-#line 11089 "Photo.c"
+#line 11090 "Photo.c"
 		} else {
 #line 1419 "/home/jens/Source/shotwell/src/Photo.vala"
 			_photo_reimport_master_state_unref0 (_vala_reimport_state);
-#line 11093 "Photo.c"
+#line 11094 "Photo.c"
 		}
 #line 1419 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 11097 "Photo.c"
+#line 11098 "Photo.c"
 	}
 #line 1423 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp13_ = detected;
@@ -11105,7 +11106,7 @@ gboolean photo_prepare_for_reimport_master (Photo* self, PhotoReimportMasterStat
 	if (_tmp14_ != GDK_COLORSPACE_RGB) {
 #line 1423 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp12_ = TRUE;
-#line 11107 "Photo.c"
+#line 11108 "Photo.c"
 	} else {
 		DetectedPhotoInformation* _tmp15_ = NULL;
 		gint _tmp16_ = 0;
@@ -11115,13 +11116,13 @@ gboolean photo_prepare_for_reimport_master (Photo* self, PhotoReimportMasterStat
 		_tmp16_ = _tmp15_->channels;
 #line 1424 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp12_ = _tmp16_ < 3;
-#line 11117 "Photo.c"
+#line 11118 "Photo.c"
 	}
 #line 1423 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp12_) {
 #line 1423 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp11_ = TRUE;
-#line 11123 "Photo.c"
+#line 11124 "Photo.c"
 	} else {
 		DetectedPhotoInformation* _tmp17_ = NULL;
 		gint _tmp18_ = 0;
@@ -11131,11 +11132,11 @@ gboolean photo_prepare_for_reimport_master (Photo* self, PhotoReimportMasterStat
 		_tmp18_ = _tmp17_->bits_per_channel;
 #line 1425 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp11_ = _tmp18_ != 8;
-#line 11133 "Photo.c"
+#line 11134 "Photo.c"
 	}
 #line 1423 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp11_) {
-#line 11137 "Photo.c"
+#line 11138 "Photo.c"
 		GFile* _tmp19_ = NULL;
 		gchar* _tmp20_ = NULL;
 		gchar* _tmp21_ = NULL;
@@ -11161,28 +11162,28 @@ gboolean photo_prepare_for_reimport_master (Photo* self, PhotoReimportMasterStat
 		if (reimport_state) {
 #line 1428 "/home/jens/Source/shotwell/src/Photo.vala"
 			*reimport_state = _vala_reimport_state;
-#line 11163 "Photo.c"
+#line 11164 "Photo.c"
 		} else {
 #line 1428 "/home/jens/Source/shotwell/src/Photo.vala"
 			_photo_reimport_master_state_unref0 (_vala_reimport_state);
-#line 11167 "Photo.c"
+#line 11168 "Photo.c"
 		}
 #line 1428 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 11171 "Photo.c"
+#line 11172 "Photo.c"
 	}
 #line 1432 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp22_ = photo_row_new ();
 #line 1432 "/home/jens/Source/shotwell/src/Photo.vala"
 	updated_row = _tmp22_;
-#line 11177 "Photo.c"
+#line 11178 "Photo.c"
 	{
 		PhotoRow* _tmp23_ = NULL;
 #line 1433 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp23_ = self->row;
 #line 1433 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 11184 "Photo.c"
+#line 11185 "Photo.c"
 		{
 			PhotoRow* _tmp24_ = NULL;
 			PhotoRow* _tmp25_ = NULL;
@@ -11194,16 +11195,16 @@ gboolean photo_prepare_for_reimport_master (Photo* self, PhotoReimportMasterStat
 			_photo_row_unref0 (updated_row);
 #line 1434 "/home/jens/Source/shotwell/src/Photo.vala"
 			updated_row = _tmp25_;
-#line 11196 "Photo.c"
+#line 11197 "Photo.c"
 		}
-		__finally291:
+		__finally304:
 		{
 			PhotoRow* _tmp26_ = NULL;
 #line 1433 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp26_ = self->row;
 #line 1433 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 11205 "Photo.c"
+#line 11206 "Photo.c"
 		}
 #line 1433 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -11219,7 +11220,7 @@ gboolean photo_prepare_for_reimport_master (Photo* self, PhotoReimportMasterStat
 			_g_object_unref0 (file);
 #line 1433 "/home/jens/Source/shotwell/src/Photo.vala"
 			return FALSE;
-#line 11221 "Photo.c"
+#line 11222 "Photo.c"
 		}
 	}
 #line 1438 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -11240,7 +11241,7 @@ gboolean photo_prepare_for_reimport_master (Photo* self, PhotoReimportMasterStat
 	_tmp31_ = _tmp30_->md5;
 #line 1440 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (g_strcmp0 (_tmp29_, _tmp31_) != 0) {
-#line 11242 "Photo.c"
+#line 11243 "Photo.c"
 		gchar** _tmp32_ = NULL;
 		gint _tmp32__length1 = 0;
 		gchar* _tmp33_ = NULL;
@@ -11252,7 +11253,7 @@ gboolean photo_prepare_for_reimport_master (Photo* self, PhotoReimportMasterStat
 		_tmp33_ = g_strdup ("metadata:md5");
 #line 1441 "/home/jens/Source/shotwell/src/Photo.vala"
 		_vala_array_add254 (&list, &list_length1, &_list_size_, _tmp33_);
-#line 11254 "Photo.c"
+#line 11255 "Photo.c"
 	}
 #line 1443 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp34_ = updated_row;
@@ -11266,7 +11267,7 @@ gboolean photo_prepare_for_reimport_master (Photo* self, PhotoReimportMasterStat
 	_tmp38_ = _tmp37_->original_orientation;
 #line 1443 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp36_ != _tmp38_) {
-#line 11268 "Photo.c"
+#line 11269 "Photo.c"
 		gchar** _tmp39_ = NULL;
 		gint _tmp39__length1 = 0;
 		gchar* _tmp40_ = NULL;
@@ -11292,7 +11293,7 @@ gboolean photo_prepare_for_reimport_master (Photo* self, PhotoReimportMasterStat
 		_tmp44_ = _tmp43_->original_orientation;
 #line 1445 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp42_->original_orientation = _tmp44_;
-#line 11294 "Photo.c"
+#line 11295 "Photo.c"
 	}
 #line 1448 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp45_ = detected;
@@ -11300,7 +11301,7 @@ gboolean photo_prepare_for_reimport_master (Photo* self, PhotoReimportMasterStat
 	_tmp46_ = _tmp45_->metadata;
 #line 1448 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp46_ != NULL) {
-#line 11302 "Photo.c"
+#line 11303 "Photo.c"
 		MetadataDateTime* date_time = NULL;
 		DetectedPhotoInformation* _tmp47_ = NULL;
 		PhotoMetadata* _tmp48_ = NULL;
@@ -11338,7 +11339,7 @@ gboolean photo_prepare_for_reimport_master (Photo* self, PhotoReimportMasterStat
 		_tmp51_ = date_time;
 #line 1450 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp51_ != NULL) {
-#line 11340 "Photo.c"
+#line 11341 "Photo.c"
 			PhotoRow* _tmp52_ = NULL;
 			time_t _tmp53_ = 0;
 			MetadataDateTime* _tmp54_ = NULL;
@@ -11353,15 +11354,15 @@ gboolean photo_prepare_for_reimport_master (Photo* self, PhotoReimportMasterStat
 			_tmp55_ = metadata_date_time_get_timestamp (_tmp54_);
 #line 1450 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp50_ = _tmp53_ != _tmp55_;
-#line 11355 "Photo.c"
+#line 11356 "Photo.c"
 		} else {
 #line 1450 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp50_ = FALSE;
-#line 11359 "Photo.c"
+#line 11360 "Photo.c"
 		}
 #line 1450 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp50_) {
-#line 11363 "Photo.c"
+#line 11364 "Photo.c"
 			gchar** _tmp56_ = NULL;
 			gint _tmp56__length1 = 0;
 			gchar* _tmp57_ = NULL;
@@ -11373,7 +11374,7 @@ gboolean photo_prepare_for_reimport_master (Photo* self, PhotoReimportMasterStat
 			_tmp57_ = g_strdup ("metadata:exposure-time");
 #line 1451 "/home/jens/Source/shotwell/src/Photo.vala"
 			_vala_array_add256 (&list, &list_length1, &_list_size_, _tmp57_);
-#line 11375 "Photo.c"
+#line 11376 "Photo.c"
 		}
 #line 1453 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp58_ = updated_row;
@@ -11393,7 +11394,7 @@ gboolean photo_prepare_for_reimport_master (Photo* self, PhotoReimportMasterStat
 		_g_free0 (_tmp63_);
 #line 1453 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp64_) {
-#line 11395 "Photo.c"
+#line 11396 "Photo.c"
 			gchar** _tmp65_ = NULL;
 			gint _tmp65__length1 = 0;
 			gchar* _tmp66_ = NULL;
@@ -11405,7 +11406,7 @@ gboolean photo_prepare_for_reimport_master (Photo* self, PhotoReimportMasterStat
 			_tmp66_ = g_strdup ("metadata:name");
 #line 1454 "/home/jens/Source/shotwell/src/Photo.vala"
 			_vala_array_add257 (&list, &list_length1, &_list_size_, _tmp66_);
-#line 11407 "Photo.c"
+#line 11408 "Photo.c"
 		}
 #line 1456 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp67_ = updated_row;
@@ -11425,7 +11426,7 @@ gboolean photo_prepare_for_reimport_master (Photo* self, PhotoReimportMasterStat
 		_g_free0 (_tmp72_);
 #line 1456 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp73_) {
-#line 11427 "Photo.c"
+#line 11428 "Photo.c"
 			gchar** _tmp74_ = NULL;
 			gint _tmp74__length1 = 0;
 			gchar* _tmp75_ = NULL;
@@ -11437,7 +11438,7 @@ gboolean photo_prepare_for_reimport_master (Photo* self, PhotoReimportMasterStat
 			_tmp75_ = g_strdup ("metadata:comment");
 #line 1457 "/home/jens/Source/shotwell/src/Photo.vala"
 			_vala_array_add258 (&list, &list_length1, &_list_size_, _tmp75_);
-#line 11439 "Photo.c"
+#line 11440 "Photo.c"
 		}
 #line 1459 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp76_ = updated_row;
@@ -11451,7 +11452,7 @@ gboolean photo_prepare_for_reimport_master (Photo* self, PhotoReimportMasterStat
 		_tmp80_ = photo_metadata_get_rating (_tmp79_);
 #line 1459 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp77_ != _tmp80_) {
-#line 11453 "Photo.c"
+#line 11454 "Photo.c"
 			gchar** _tmp81_ = NULL;
 			gint _tmp81__length1 = 0;
 			gchar* _tmp82_ = NULL;
@@ -11463,11 +11464,11 @@ gboolean photo_prepare_for_reimport_master (Photo* self, PhotoReimportMasterStat
 			_tmp82_ = g_strdup ("metadata:rating");
 #line 1460 "/home/jens/Source/shotwell/src/Photo.vala"
 			_vala_array_add259 (&list, &list_length1, &_list_size_, _tmp82_);
-#line 11465 "Photo.c"
+#line 11466 "Photo.c"
 		}
 #line 1448 "/home/jens/Source/shotwell/src/Photo.vala"
 		_metadata_date_time_unref0 (date_time);
-#line 11469 "Photo.c"
+#line 11470 "Photo.c"
 	}
 #line 1463 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp83_ = updated_row;
@@ -11523,7 +11524,7 @@ gboolean photo_prepare_for_reimport_master (Photo* self, PhotoReimportMasterStat
 	_tmp99_ = _tmp98_->metadata;
 #line 1469 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp99_ != NULL) {
-#line 11525 "Photo.c"
+#line 11526 "Photo.c"
 		DetectedPhotoInformation* _tmp100_ = NULL;
 		PhotoMetadata* _tmp101_ = NULL;
 		PhotoMetadata* _tmp102_ = NULL;
@@ -11566,7 +11567,7 @@ gboolean photo_prepare_for_reimport_master (Photo* self, PhotoReimportMasterStat
 		_tmp106_ = date_time;
 #line 1473 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp106_ != NULL) {
-#line 11568 "Photo.c"
+#line 11569 "Photo.c"
 			PhotoRow* _tmp107_ = NULL;
 			MetadataDateTime* _tmp108_ = NULL;
 			time_t _tmp109_ = 0;
@@ -11578,7 +11579,7 @@ gboolean photo_prepare_for_reimport_master (Photo* self, PhotoReimportMasterStat
 			_tmp109_ = metadata_date_time_get_timestamp (_tmp108_);
 #line 1474 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp107_->exposure_time = _tmp109_;
-#line 11580 "Photo.c"
+#line 11581 "Photo.c"
 		}
 #line 1476 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp110_ = updated_row;
@@ -11616,7 +11617,7 @@ gboolean photo_prepare_for_reimport_master (Photo* self, PhotoReimportMasterStat
 		_tmp118_->rating = _tmp121_;
 #line 1469 "/home/jens/Source/shotwell/src/Photo.vala"
 		_metadata_date_time_unref0 (date_time);
-#line 11618 "Photo.c"
+#line 11619 "Photo.c"
 	}
 #line 1481 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp122_ = updated_row;
@@ -11650,15 +11651,15 @@ gboolean photo_prepare_for_reimport_master (Photo* self, PhotoReimportMasterStat
 	if (reimport_state) {
 #line 1483 "/home/jens/Source/shotwell/src/Photo.vala"
 		*reimport_state = _vala_reimport_state;
-#line 11652 "Photo.c"
+#line 11653 "Photo.c"
 	} else {
 #line 1483 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_reimport_master_state_unref0 (_vala_reimport_state);
-#line 11656 "Photo.c"
+#line 11657 "Photo.c"
 	}
 #line 1483 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 11660 "Photo.c"
+#line 11661 "Photo.c"
 }
 
 
@@ -11667,7 +11668,7 @@ static void photo_real_apply_user_metadata_for_reimport (Photo* self, PhotoMetad
 	g_critical ("Type `%s' does not implement abstract method `photo_apply_user_metadata_for_reimport'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
 #line 1486 "/home/jens/Source/shotwell/src/Photo.vala"
 	return;
-#line 11669 "Photo.c"
+#line 11670 "Photo.c"
 }
 
 
@@ -11676,14 +11677,14 @@ void photo_apply_user_metadata_for_reimport (Photo* self, PhotoMetadata* metadat
 	g_return_if_fail (IS_PHOTO (self));
 #line 1486 "/home/jens/Source/shotwell/src/Photo.vala"
 	PHOTO_GET_CLASS (self)->apply_user_metadata_for_reimport (self, metadata);
-#line 11678 "Photo.c"
+#line 11679 "Photo.c"
 }
 
 
 static gpointer _photo_reimport_master_state_ref0 (gpointer self) {
 #line 1490 "/home/jens/Source/shotwell/src/Photo.vala"
 	return self ? photo_reimport_master_state_ref (self) : NULL;
-#line 11685 "Photo.c"
+#line 11686 "Photo.c"
 }
 
 
@@ -11694,13 +11695,13 @@ static void _vala_array_add260 (gchar*** array, int* length, int* size, gchar* v
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 1508 "/home/jens/Source/shotwell/src/Photo.vala"
 		*array = g_renew (gchar*, *array, (*size) + 1);
-#line 11696 "Photo.c"
+#line 11697 "Photo.c"
 	}
 #line 1508 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[(*length)++] = value;
 #line 1508 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[*length] = NULL;
-#line 11702 "Photo.c"
+#line 11703 "Photo.c"
 }
 
 
@@ -11711,13 +11712,13 @@ static void _vala_array_add261 (gchar*** array, int* length, int* size, gchar* v
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 1510 "/home/jens/Source/shotwell/src/Photo.vala"
 		*array = g_renew (gchar*, *array, (*size) + 1);
-#line 11713 "Photo.c"
+#line 11714 "Photo.c"
 	}
 #line 1510 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[(*length)++] = value;
 #line 1510 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[*length] = NULL;
-#line 11719 "Photo.c"
+#line 11720 "Photo.c"
 }
 
 
@@ -11766,7 +11767,7 @@ void photo_finish_reimport_master (Photo* self, PhotoReimportMasterState* state,
 			_photo_reimport_master_state_unref0 (reimport_state);
 #line 1492 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 11768 "Photo.c"
+#line 11769 "Photo.c"
 		} else {
 #line 1492 "/home/jens/Source/shotwell/src/Photo.vala"
 			_photo_reimport_master_state_unref0 (reimport_state);
@@ -11776,7 +11777,7 @@ void photo_finish_reimport_master (Photo* self, PhotoReimportMasterState* state,
 			g_clear_error (&_inner_error_);
 #line 1492 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 11778 "Photo.c"
+#line 11779 "Photo.c"
 		}
 	}
 	{
@@ -11785,7 +11786,7 @@ void photo_finish_reimport_master (Photo* self, PhotoReimportMasterState* state,
 		_tmp5_ = self->row;
 #line 1494 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 11787 "Photo.c"
+#line 11788 "Photo.c"
 		{
 			BackingPhotoRow* original_master = NULL;
 			PhotoRow* _tmp6_ = NULL;
@@ -11843,20 +11844,20 @@ void photo_finish_reimport_master (Photo* self, PhotoReimportMasterState* state,
 			if (!_tmp18_) {
 #line 1501 "/home/jens/Source/shotwell/src/Photo.vala"
 				photo_internal_remove_all_transformations (self, FALSE);
-#line 11845 "Photo.c"
+#line 11846 "Photo.c"
 			}
 #line 1494 "/home/jens/Source/shotwell/src/Photo.vala"
 			_backing_photo_row_unref0 (original_master);
-#line 11849 "Photo.c"
+#line 11850 "Photo.c"
 		}
-		__finally292:
+		__finally305:
 		{
 			PhotoRow* _tmp19_ = NULL;
 #line 1494 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp19_ = self->row;
 #line 1494 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 11858 "Photo.c"
+#line 11859 "Photo.c"
 		}
 #line 1494 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -11868,7 +11869,7 @@ void photo_finish_reimport_master (Photo* self, PhotoReimportMasterState* state,
 				_photo_reimport_master_state_unref0 (reimport_state);
 #line 1494 "/home/jens/Source/shotwell/src/Photo.vala"
 				return;
-#line 11870 "Photo.c"
+#line 11871 "Photo.c"
 			} else {
 #line 1494 "/home/jens/Source/shotwell/src/Photo.vala"
 				_photo_reimport_master_state_unref0 (reimport_state);
@@ -11878,7 +11879,7 @@ void photo_finish_reimport_master (Photo* self, PhotoReimportMasterState* state,
 				g_clear_error (&_inner_error_);
 #line 1494 "/home/jens/Source/shotwell/src/Photo.vala"
 				return;
-#line 11880 "Photo.c"
+#line 11881 "Photo.c"
 			}
 		}
 	}
@@ -11886,19 +11887,19 @@ void photo_finish_reimport_master (Photo* self, PhotoReimportMasterState* state,
 	_tmp20_ = reimport_state->metadata;
 #line 1504 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp20_ != NULL) {
-#line 11888 "Photo.c"
+#line 11889 "Photo.c"
 		PhotoMetadata* _tmp21_ = NULL;
 #line 1505 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp21_ = reimport_state->metadata;
 #line 1505 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_apply_user_metadata_for_reimport (self, _tmp21_);
-#line 11894 "Photo.c"
+#line 11895 "Photo.c"
 	}
 #line 1507 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp22_ = reimport_state->metadata_only;
 #line 1507 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (!_tmp22_) {
-#line 11900 "Photo.c"
+#line 11901 "Photo.c"
 		gchar** _tmp23_ = NULL;
 		gint _tmp23__length1 = 0;
 		gchar* _tmp24_ = NULL;
@@ -11915,7 +11916,7 @@ void photo_finish_reimport_master (Photo* self, PhotoReimportMasterState* state,
 		_tmp25_ = photo_is_master_baseline (self);
 #line 1509 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp25_) {
-#line 11917 "Photo.c"
+#line 11918 "Photo.c"
 			gchar** _tmp26_ = NULL;
 			gint _tmp26__length1 = 0;
 			gchar* _tmp27_ = NULL;
@@ -11927,7 +11928,7 @@ void photo_finish_reimport_master (Photo* self, PhotoReimportMasterState* state,
 			_tmp27_ = g_strdup ("image:baseline");
 #line 1510 "/home/jens/Source/shotwell/src/Photo.vala"
 			_vala_array_add261 (&reimport_state->alterations, &reimport_state->alterations_length1, &reimport_state->_alterations_size_, _tmp27_);
-#line 11929 "Photo.c"
+#line 11930 "Photo.c"
 		}
 	}
 #line 1513 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -11936,7 +11937,7 @@ void photo_finish_reimport_master (Photo* self, PhotoReimportMasterState* state,
 	_tmp28__length1 = reimport_state->alterations_length1;
 #line 1513 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp28__length1 > 0) {
-#line 11938 "Photo.c"
+#line 11939 "Photo.c"
 		gchar** _tmp29_ = NULL;
 		gint _tmp29__length1 = 0;
 		Alteration* _tmp30_ = NULL;
@@ -11953,7 +11954,7 @@ void photo_finish_reimport_master (Photo* self, PhotoReimportMasterState* state,
 		data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp31_);
 #line 1514 "/home/jens/Source/shotwell/src/Photo.vala"
 		_alteration_unref0 (_tmp31_);
-#line 11955 "Photo.c"
+#line 11956 "Photo.c"
 	}
 #line 1516 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp32_ = reimport_state->metadata;
@@ -11963,29 +11964,29 @@ void photo_finish_reimport_master (Photo* self, PhotoReimportMasterState* state,
 	_tmp33_ = photo_is_master_baseline (self);
 #line 1518 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp33_) {
-#line 11965 "Photo.c"
+#line 11966 "Photo.c"
 		PhotoMetadata* _tmp34_ = NULL;
 #line 1519 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp34_ = reimport_state->metadata;
 #line 1519 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_notify_baseline_reimported (self, _tmp34_);
-#line 11971 "Photo.c"
+#line 11972 "Photo.c"
 	}
 #line 1521 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp35_ = photo_is_master_source (self);
 #line 1521 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp35_) {
-#line 11977 "Photo.c"
+#line 11978 "Photo.c"
 		PhotoMetadata* _tmp36_ = NULL;
 #line 1522 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp36_ = reimport_state->metadata;
 #line 1522 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_notify_source_reimported (self, _tmp36_);
-#line 11983 "Photo.c"
+#line 11984 "Photo.c"
 	}
 #line 1489 "/home/jens/Source/shotwell/src/Photo.vala"
 	_photo_reimport_master_state_unref0 (reimport_state);
-#line 11987 "Photo.c"
+#line 11988 "Photo.c"
 }
 
 
@@ -12024,7 +12025,7 @@ static gboolean photo_verify_file_for_reimport (Photo* self, GFile* file, Backin
 		g_propagate_error (error, _inner_error_);
 #line 1528 "/home/jens/Source/shotwell/src/Photo.vala"
 		return FALSE;
-#line 12026 "Photo.c"
+#line 12027 "Photo.c"
 	}
 #line 1528 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = _tmp0_;
@@ -12046,25 +12047,25 @@ static gboolean photo_verify_file_for_reimport (Photo* self, GFile* file, Backin
 		if (backing) {
 #line 1531 "/home/jens/Source/shotwell/src/Photo.vala"
 			*backing = _vala_backing;
-#line 12048 "Photo.c"
+#line 12049 "Photo.c"
 		} else {
 #line 1531 "/home/jens/Source/shotwell/src/Photo.vala"
 			_backing_photo_row_unref0 (_vala_backing);
-#line 12052 "Photo.c"
+#line 12053 "Photo.c"
 		}
 #line 1531 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (detected) {
 #line 1531 "/home/jens/Source/shotwell/src/Photo.vala"
 			*detected = _vala_detected;
-#line 12058 "Photo.c"
+#line 12059 "Photo.c"
 		} else {
 #line 1531 "/home/jens/Source/shotwell/src/Photo.vala"
 			_detected_photo_information_unref0 (_vala_detected);
-#line 12062 "Photo.c"
+#line 12063 "Photo.c"
 		}
 #line 1531 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 12066 "Photo.c"
+#line 12067 "Photo.c"
 	}
 #line 1535 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp8_ = _vala_detected;
@@ -12074,7 +12075,7 @@ static gboolean photo_verify_file_for_reimport (Photo* self, GFile* file, Backin
 	if (_tmp9_ != GDK_COLORSPACE_RGB) {
 #line 1535 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp7_ = TRUE;
-#line 12076 "Photo.c"
+#line 12077 "Photo.c"
 	} else {
 		DetectedPhotoInformation* _tmp10_ = NULL;
 		gint _tmp11_ = 0;
@@ -12084,13 +12085,13 @@ static gboolean photo_verify_file_for_reimport (Photo* self, GFile* file, Backin
 		_tmp11_ = _tmp10_->channels;
 #line 1536 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp7_ = _tmp11_ < 3;
-#line 12086 "Photo.c"
+#line 12087 "Photo.c"
 	}
 #line 1535 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp7_) {
 #line 1535 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp6_ = TRUE;
-#line 12092 "Photo.c"
+#line 12093 "Photo.c"
 	} else {
 		DetectedPhotoInformation* _tmp12_ = NULL;
 		gint _tmp13_ = 0;
@@ -12100,11 +12101,11 @@ static gboolean photo_verify_file_for_reimport (Photo* self, GFile* file, Backin
 		_tmp13_ = _tmp12_->bits_per_channel;
 #line 1537 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp6_ = _tmp13_ != 8;
-#line 12102 "Photo.c"
+#line 12103 "Photo.c"
 	}
 #line 1535 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp6_) {
-#line 12106 "Photo.c"
+#line 12107 "Photo.c"
 		GFile* _tmp14_ = NULL;
 		gchar* _tmp15_ = NULL;
 		gchar* _tmp16_ = NULL;
@@ -12126,25 +12127,25 @@ static gboolean photo_verify_file_for_reimport (Photo* self, GFile* file, Backin
 		if (backing) {
 #line 1540 "/home/jens/Source/shotwell/src/Photo.vala"
 			*backing = _vala_backing;
-#line 12128 "Photo.c"
+#line 12129 "Photo.c"
 		} else {
 #line 1540 "/home/jens/Source/shotwell/src/Photo.vala"
 			_backing_photo_row_unref0 (_vala_backing);
-#line 12132 "Photo.c"
+#line 12133 "Photo.c"
 		}
 #line 1540 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (detected) {
 #line 1540 "/home/jens/Source/shotwell/src/Photo.vala"
 			*detected = _vala_detected;
-#line 12138 "Photo.c"
+#line 12139 "Photo.c"
 		} else {
 #line 1540 "/home/jens/Source/shotwell/src/Photo.vala"
 			_detected_photo_information_unref0 (_vala_detected);
-#line 12142 "Photo.c"
+#line 12143 "Photo.c"
 		}
 #line 1540 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 12146 "Photo.c"
+#line 12147 "Photo.c"
 	}
 #line 1543 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = TRUE;
@@ -12154,25 +12155,25 @@ static gboolean photo_verify_file_for_reimport (Photo* self, GFile* file, Backin
 	if (backing) {
 #line 1543 "/home/jens/Source/shotwell/src/Photo.vala"
 		*backing = _vala_backing;
-#line 12156 "Photo.c"
+#line 12157 "Photo.c"
 	} else {
 #line 1543 "/home/jens/Source/shotwell/src/Photo.vala"
 		_backing_photo_row_unref0 (_vala_backing);
-#line 12160 "Photo.c"
+#line 12161 "Photo.c"
 	}
 #line 1543 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (detected) {
 #line 1543 "/home/jens/Source/shotwell/src/Photo.vala"
 		*detected = _vala_detected;
-#line 12166 "Photo.c"
+#line 12167 "Photo.c"
 	} else {
 #line 1543 "/home/jens/Source/shotwell/src/Photo.vala"
 		_detected_photo_information_unref0 (_vala_detected);
-#line 12170 "Photo.c"
+#line 12171 "Photo.c"
 	}
 #line 1543 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 12174 "Photo.c"
+#line 12175 "Photo.c"
 }
 
 
@@ -12216,15 +12217,15 @@ gboolean photo_prepare_for_reimport_editable (Photo* self, PhotoReimportEditable
 		if (state) {
 #line 1552 "/home/jens/Source/shotwell/src/Photo.vala"
 			*state = _vala_state;
-#line 12218 "Photo.c"
+#line 12219 "Photo.c"
 		} else {
 #line 1552 "/home/jens/Source/shotwell/src/Photo.vala"
 			_photo_reimport_editable_state_unref0 (_vala_state);
-#line 12222 "Photo.c"
+#line 12223 "Photo.c"
 		}
 #line 1552 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 12226 "Photo.c"
+#line 12227 "Photo.c"
 	}
 #line 1556 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = file;
@@ -12252,7 +12253,7 @@ gboolean photo_prepare_for_reimport_editable (Photo* self, PhotoReimportEditable
 		_g_object_unref0 (file);
 #line 1556 "/home/jens/Source/shotwell/src/Photo.vala"
 		return FALSE;
-#line 12254 "Photo.c"
+#line 12255 "Photo.c"
 	}
 #line 1556 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (!_tmp2_) {
@@ -12268,15 +12269,15 @@ gboolean photo_prepare_for_reimport_editable (Photo* self, PhotoReimportEditable
 		if (state) {
 #line 1557 "/home/jens/Source/shotwell/src/Photo.vala"
 			*state = _vala_state;
-#line 12270 "Photo.c"
+#line 12271 "Photo.c"
 		} else {
 #line 1557 "/home/jens/Source/shotwell/src/Photo.vala"
 			_photo_reimport_editable_state_unref0 (_vala_state);
-#line 12274 "Photo.c"
+#line 12275 "Photo.c"
 		}
 #line 1557 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 12278 "Photo.c"
+#line 12279 "Photo.c"
 	}
 #line 1559 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp7_ = backing;
@@ -12302,22 +12303,22 @@ gboolean photo_prepare_for_reimport_editable (Photo* self, PhotoReimportEditable
 	if (state) {
 #line 1561 "/home/jens/Source/shotwell/src/Photo.vala"
 		*state = _vala_state;
-#line 12304 "Photo.c"
+#line 12305 "Photo.c"
 	} else {
 #line 1561 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_reimport_editable_state_unref0 (_vala_state);
-#line 12308 "Photo.c"
+#line 12309 "Photo.c"
 	}
 #line 1561 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 12312 "Photo.c"
+#line 12313 "Photo.c"
 }
 
 
 static gpointer _photo_reimport_editable_state_ref0 (gpointer self) {
 #line 1570 "/home/jens/Source/shotwell/src/Photo.vala"
 	return self ? photo_reimport_editable_state_ref (self) : NULL;
-#line 12319 "Photo.c"
+#line 12320 "Photo.c"
 }
 
 
@@ -12358,7 +12359,7 @@ void photo_finish_reimport_editable (Photo* self, PhotoReimportEditableState* st
 	if (_tmp1_) {
 #line 1568 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 12360 "Photo.c"
+#line 12361 "Photo.c"
 	}
 #line 1570 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = state;
@@ -12372,7 +12373,7 @@ void photo_finish_reimport_editable (Photo* self, PhotoReimportEditableState* st
 	_tmp5_ = _tmp4_->metadata_only;
 #line 1572 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (!_tmp5_) {
-#line 12374 "Photo.c"
+#line 12375 "Photo.c"
 		BackingPhotoTable* _tmp6_ = NULL;
 		BackingPhotoTable* _tmp7_ = NULL;
 		PhotoReimportEditableStateImpl* _tmp8_ = NULL;
@@ -12399,7 +12400,7 @@ void photo_finish_reimport_editable (Photo* self, PhotoReimportEditableState* st
 				_photo_reimport_editable_state_unref0 (reimport_state);
 #line 1573 "/home/jens/Source/shotwell/src/Photo.vala"
 				return;
-#line 12401 "Photo.c"
+#line 12402 "Photo.c"
 			} else {
 #line 1573 "/home/jens/Source/shotwell/src/Photo.vala"
 				_photo_reimport_editable_state_unref0 (reimport_state);
@@ -12409,7 +12410,7 @@ void photo_finish_reimport_editable (Photo* self, PhotoReimportEditableState* st
 				g_clear_error (&_inner_error_);
 #line 1573 "/home/jens/Source/shotwell/src/Photo.vala"
 				return;
-#line 12411 "Photo.c"
+#line 12412 "Photo.c"
 			}
 		}
 		{
@@ -12418,7 +12419,7 @@ void photo_finish_reimport_editable (Photo* self, PhotoReimportEditableState* st
 			_tmp10_ = self->row;
 #line 1575 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_lock (&self->priv->__lock_row);
-#line 12420 "Photo.c"
+#line 12421 "Photo.c"
 			{
 				PhotoReimportEditableStateImpl* _tmp11_ = NULL;
 				BackingPhotoRow* _tmp12_ = NULL;
@@ -12446,16 +12447,16 @@ void photo_finish_reimport_editable (Photo* self, PhotoReimportEditableState* st
 				photo_set_orientation (self, _tmp16_);
 #line 1578 "/home/jens/Source/shotwell/src/Photo.vala"
 				photo_internal_remove_all_transformations (self, FALSE);
-#line 12448 "Photo.c"
+#line 12449 "Photo.c"
 			}
-			__finally293:
+			__finally306:
 			{
 				PhotoRow* _tmp17_ = NULL;
 #line 1575 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp17_ = self->row;
 #line 1575 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 12457 "Photo.c"
+#line 12458 "Photo.c"
 			}
 #line 1575 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -12467,7 +12468,7 @@ void photo_finish_reimport_editable (Photo* self, PhotoReimportEditableState* st
 					_photo_reimport_editable_state_unref0 (reimport_state);
 #line 1575 "/home/jens/Source/shotwell/src/Photo.vala"
 					return;
-#line 12469 "Photo.c"
+#line 12470 "Photo.c"
 				} else {
 #line 1575 "/home/jens/Source/shotwell/src/Photo.vala"
 					_photo_reimport_editable_state_unref0 (reimport_state);
@@ -12477,7 +12478,7 @@ void photo_finish_reimport_editable (Photo* self, PhotoReimportEditableState* st
 					g_clear_error (&_inner_error_);
 #line 1575 "/home/jens/Source/shotwell/src/Photo.vala"
 					return;
-#line 12479 "Photo.c"
+#line 12480 "Photo.c"
 				}
 			}
 		}
@@ -12493,7 +12494,7 @@ void photo_finish_reimport_editable (Photo* self, PhotoReimportEditableState* st
 		_tmp20_ = _tmp19_->original_orientation;
 #line 1581 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_set_orientation (self, _tmp20_);
-#line 12495 "Photo.c"
+#line 12496 "Photo.c"
 	}
 #line 1584 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp21_ = reimport_state;
@@ -12501,7 +12502,7 @@ void photo_finish_reimport_editable (Photo* self, PhotoReimportEditableState* st
 	_tmp22_ = _tmp21_->metadata;
 #line 1584 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp22_ != NULL) {
-#line 12503 "Photo.c"
+#line 12504 "Photo.c"
 		PhotoReimportEditableStateImpl* _tmp23_ = NULL;
 		PhotoMetadata* _tmp24_ = NULL;
 		gchar* _tmp25_ = NULL;
@@ -12553,7 +12554,7 @@ void photo_finish_reimport_editable (Photo* self, PhotoReimportEditableState* st
 		_tmp35_ = _tmp34_->metadata;
 #line 1588 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_apply_user_metadata_for_reimport (self, _tmp35_);
-#line 12555 "Photo.c"
+#line 12556 "Photo.c"
 	}
 #line 1591 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp36_ = g_strdup ("metadata:name,image:orientation,metadata:rating,metadata:exposure-time");
@@ -12565,7 +12566,7 @@ void photo_finish_reimport_editable (Photo* self, PhotoReimportEditableState* st
 	_tmp38_ = _tmp37_->metadata_only;
 #line 1592 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (!_tmp38_) {
-#line 12567 "Photo.c"
+#line 12568 "Photo.c"
 		const gchar* _tmp39_ = NULL;
 		gchar* _tmp40_ = NULL;
 #line 1593 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -12576,7 +12577,7 @@ void photo_finish_reimport_editable (Photo* self, PhotoReimportEditableState* st
 		_g_free0 (list);
 #line 1593 "/home/jens/Source/shotwell/src/Photo.vala"
 		list = _tmp40_;
-#line 12578 "Photo.c"
+#line 12579 "Photo.c"
 	}
 #line 1595 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp41_ = list;
@@ -12598,7 +12599,7 @@ void photo_finish_reimport_editable (Photo* self, PhotoReimportEditableState* st
 	_tmp46_ = photo_is_editable_baseline (self);
 #line 1599 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp46_) {
-#line 12600 "Photo.c"
+#line 12601 "Photo.c"
 		PhotoReimportEditableStateImpl* _tmp47_ = NULL;
 		PhotoMetadata* _tmp48_ = NULL;
 #line 1600 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -12607,13 +12608,13 @@ void photo_finish_reimport_editable (Photo* self, PhotoReimportEditableState* st
 		_tmp48_ = _tmp47_->metadata;
 #line 1600 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_notify_baseline_reimported (self, _tmp48_);
-#line 12609 "Photo.c"
+#line 12610 "Photo.c"
 	}
 #line 1602 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp49_ = photo_is_editable_source (self);
 #line 1602 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp49_) {
-#line 12615 "Photo.c"
+#line 12616 "Photo.c"
 		PhotoReimportEditableStateImpl* _tmp50_ = NULL;
 		PhotoMetadata* _tmp51_ = NULL;
 #line 1603 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -12622,20 +12623,20 @@ void photo_finish_reimport_editable (Photo* self, PhotoReimportEditableState* st
 		_tmp51_ = _tmp50_->metadata;
 #line 1603 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_notify_source_reimported (self, _tmp51_);
-#line 12624 "Photo.c"
+#line 12625 "Photo.c"
 	}
 #line 1565 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_free0 (list);
 #line 1565 "/home/jens/Source/shotwell/src/Photo.vala"
 	_photo_reimport_editable_state_unref0 (reimport_state);
-#line 12630 "Photo.c"
+#line 12631 "Photo.c"
 }
 
 
 static gpointer _photo_reimport_raw_development_state_ref0 (gpointer self) {
 #line 1625 "/home/jens/Source/shotwell/src/Photo.vala"
 	return self ? photo_reimport_raw_development_state_ref (self) : NULL;
-#line 12637 "Photo.c"
+#line 12638 "Photo.c"
 }
 
 
@@ -12674,21 +12675,21 @@ gboolean photo_prepare_for_reimport_raw_development (Photo* self, PhotoReimportR
 		if (state) {
 #line 1612 "/home/jens/Source/shotwell/src/Photo.vala"
 			*state = _vala_state;
-#line 12676 "Photo.c"
+#line 12677 "Photo.c"
 		} else {
 #line 1612 "/home/jens/Source/shotwell/src/Photo.vala"
 			_photo_reimport_raw_development_state_unref0 (_vala_state);
-#line 12680 "Photo.c"
+#line 12681 "Photo.c"
 		}
 #line 1612 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 12684 "Photo.c"
+#line 12685 "Photo.c"
 	}
 #line 1614 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = photo_reimport_raw_development_state_impl_new ();
 #line 1614 "/home/jens/Source/shotwell/src/Photo.vala"
 	reimport_state = _tmp2_;
-#line 12690 "Photo.c"
+#line 12691 "Photo.c"
 	{
 		GeeIterator* _file_it = NULL;
 		GeeCollection* _tmp3_ = NULL;
@@ -12701,7 +12702,7 @@ gboolean photo_prepare_for_reimport_raw_development (Photo* self, PhotoReimportR
 		_file_it = _tmp4_;
 #line 1616 "/home/jens/Source/shotwell/src/Photo.vala"
 		while (TRUE) {
-#line 12703 "Photo.c"
+#line 12704 "Photo.c"
 			GeeIterator* _tmp5_ = NULL;
 			gboolean _tmp6_ = FALSE;
 			GFile* file = NULL;
@@ -12726,7 +12727,7 @@ gboolean photo_prepare_for_reimport_raw_development (Photo* self, PhotoReimportR
 			if (!_tmp6_) {
 #line 1616 "/home/jens/Source/shotwell/src/Photo.vala"
 				break;
-#line 12728 "Photo.c"
+#line 12729 "Photo.c"
 			}
 #line 1616 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp7_ = _file_it;
@@ -12766,7 +12767,7 @@ gboolean photo_prepare_for_reimport_raw_development (Photo* self, PhotoReimportR
 				_g_object_unref0 (files);
 #line 1619 "/home/jens/Source/shotwell/src/Photo.vala"
 				return FALSE;
-#line 12768 "Photo.c"
+#line 12769 "Photo.c"
 			}
 #line 1619 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (!_tmp9_) {
@@ -12778,7 +12779,7 @@ gboolean photo_prepare_for_reimport_raw_development (Photo* self, PhotoReimportR
 				_g_object_unref0 (file);
 #line 1620 "/home/jens/Source/shotwell/src/Photo.vala"
 				continue;
-#line 12780 "Photo.c"
+#line 12781 "Photo.c"
 			}
 #line 1622 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp14_ = reimport_state;
@@ -12796,11 +12797,11 @@ gboolean photo_prepare_for_reimport_raw_development (Photo* self, PhotoReimportR
 			_detected_photo_information_unref0 (detected);
 #line 1616 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (file);
-#line 12798 "Photo.c"
+#line 12799 "Photo.c"
 		}
 #line 1616 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_file_it);
-#line 12802 "Photo.c"
+#line 12803 "Photo.c"
 	}
 #line 1625 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp18_ = reimport_state;
@@ -12824,15 +12825,15 @@ gboolean photo_prepare_for_reimport_raw_development (Photo* self, PhotoReimportR
 	if (state) {
 #line 1626 "/home/jens/Source/shotwell/src/Photo.vala"
 		*state = _vala_state;
-#line 12826 "Photo.c"
+#line 12827 "Photo.c"
 	} else {
 #line 1626 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_reimport_raw_development_state_unref0 (_vala_state);
-#line 12830 "Photo.c"
+#line 12831 "Photo.c"
 	}
 #line 1626 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 12834 "Photo.c"
+#line 12835 "Photo.c"
 }
 
 
@@ -12859,7 +12860,7 @@ void photo_finish_reimport_raw_development (Photo* self, PhotoReimportRawDevelop
 	if (_tmp0_ != PHOTO_FILE_FORMAT_RAW) {
 #line 1632 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 12861 "Photo.c"
+#line 12862 "Photo.c"
 	}
 #line 1634 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = state;
@@ -12867,7 +12868,7 @@ void photo_finish_reimport_raw_development (Photo* self, PhotoReimportRawDevelop
 	_tmp2_ = _photo_reimport_raw_development_state_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, PHOTO_TYPE_REIMPORT_RAW_DEVELOPMENT_STATE_IMPL, PhotoReimportRawDevelopmentStateImpl));
 #line 1634 "/home/jens/Source/shotwell/src/Photo.vala"
 	reimport_state = _tmp2_;
-#line 12869 "Photo.c"
+#line 12870 "Photo.c"
 	{
 		GeeIterator* _dev_it = NULL;
 		PhotoReimportRawDevelopmentStateImpl* _tmp3_ = NULL;
@@ -12883,7 +12884,7 @@ void photo_finish_reimport_raw_development (Photo* self, PhotoReimportRawDevelop
 		_dev_it = _tmp5_;
 #line 1636 "/home/jens/Source/shotwell/src/Photo.vala"
 		while (TRUE) {
-#line 12885 "Photo.c"
+#line 12886 "Photo.c"
 			GeeIterator* _tmp6_ = NULL;
 			gboolean _tmp7_ = FALSE;
 			PhotoReimportRawDevelopmentStateImplDevToReimport* dev = NULL;
@@ -12899,7 +12900,7 @@ void photo_finish_reimport_raw_development (Photo* self, PhotoReimportRawDevelop
 			if (!_tmp7_) {
 #line 1636 "/home/jens/Source/shotwell/src/Photo.vala"
 				break;
-#line 12901 "Photo.c"
+#line 12902 "Photo.c"
 			}
 #line 1636 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp8_ = _dev_it;
@@ -12913,7 +12914,7 @@ void photo_finish_reimport_raw_development (Photo* self, PhotoReimportRawDevelop
 			_tmp11_ = _tmp10_->metadata_only;
 #line 1637 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (!_tmp11_) {
-#line 12915 "Photo.c"
+#line 12916 "Photo.c"
 				BackingPhotoTable* _tmp12_ = NULL;
 				BackingPhotoTable* _tmp13_ = NULL;
 				PhotoReimportRawDevelopmentStateImplDevToReimport* _tmp14_ = NULL;
@@ -12944,7 +12945,7 @@ void photo_finish_reimport_raw_development (Photo* self, PhotoReimportRawDevelop
 						_photo_reimport_raw_development_state_unref0 (reimport_state);
 #line 1638 "/home/jens/Source/shotwell/src/Photo.vala"
 						return;
-#line 12946 "Photo.c"
+#line 12947 "Photo.c"
 					} else {
 #line 1638 "/home/jens/Source/shotwell/src/Photo.vala"
 						_photo_reimport_raw_development_state_impl_dev_to_reimport_unref0 (dev);
@@ -12958,7 +12959,7 @@ void photo_finish_reimport_raw_development (Photo* self, PhotoReimportRawDevelop
 						g_clear_error (&_inner_error_);
 #line 1638 "/home/jens/Source/shotwell/src/Photo.vala"
 						return;
-#line 12960 "Photo.c"
+#line 12961 "Photo.c"
 					}
 				}
 				{
@@ -12967,13 +12968,13 @@ void photo_finish_reimport_raw_development (Photo* self, PhotoReimportRawDevelop
 					_tmp16_ = self->row;
 #line 1640 "/home/jens/Source/shotwell/src/Photo.vala"
 					g_rec_mutex_lock (&self->priv->__lock_row);
-#line 12969 "Photo.c"
+#line 12970 "Photo.c"
 					{
 						gint _tmp17_ = 0;
 						RawDeveloper* _tmp18_ = NULL;
 #line 1642 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp18_ = raw_developer_as_array (&_tmp17_);
-#line 12975 "Photo.c"
+#line 12976 "Photo.c"
 						{
 							RawDeveloper* d_collection = NULL;
 							gint d_collection_length1 = 0;
@@ -12985,11 +12986,11 @@ void photo_finish_reimport_raw_development (Photo* self, PhotoReimportRawDevelop
 							d_collection_length1 = _tmp17_;
 #line 1642 "/home/jens/Source/shotwell/src/Photo.vala"
 							for (d_it = 0; d_it < _tmp17_; d_it = d_it + 1) {
-#line 12987 "Photo.c"
+#line 12988 "Photo.c"
 								RawDeveloper d = 0;
 #line 1642 "/home/jens/Source/shotwell/src/Photo.vala"
 								d = d_collection[d_it];
-#line 12991 "Photo.c"
+#line 12992 "Photo.c"
 								{
 									BackingPhotoID id = {0};
 									PhotoRow* _tmp19_ = NULL;
@@ -13017,7 +13018,7 @@ void photo_finish_reimport_raw_development (Photo* self, PhotoReimportRawDevelop
 									_tmp24_ = _tmp23_.id;
 #line 1644 "/home/jens/Source/shotwell/src/Photo.vala"
 									if (_tmp24_ != BACKING_PHOTO_ID_INVALID) {
-#line 13019 "Photo.c"
+#line 13020 "Photo.c"
 										BackingPhotoRow* bpr = NULL;
 										BackingPhotoID _tmp25_ = {0};
 										BackingPhotoRow* _tmp26_ = NULL;
@@ -13032,7 +13033,7 @@ void photo_finish_reimport_raw_development (Photo* self, PhotoReimportRawDevelop
 										_tmp27_ = bpr;
 #line 1646 "/home/jens/Source/shotwell/src/Photo.vala"
 										if (_tmp27_ != NULL) {
-#line 13034 "Photo.c"
+#line 13035 "Photo.c"
 											GeeHashMap* _tmp28_ = NULL;
 											RawDeveloper _tmp29_ = 0;
 											BackingPhotoRow* _tmp30_ = NULL;
@@ -13044,27 +13045,27 @@ void photo_finish_reimport_raw_development (Photo* self, PhotoReimportRawDevelop
 											_tmp30_ = bpr;
 #line 1647 "/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 13046 "Photo.c"
+#line 13047 "Photo.c"
 										}
 #line 1644 "/home/jens/Source/shotwell/src/Photo.vala"
 										_backing_photo_row_unref0 (bpr);
-#line 13050 "Photo.c"
+#line 13051 "Photo.c"
 									}
 								}
 							}
 #line 1642 "/home/jens/Source/shotwell/src/Photo.vala"
 							d_collection = (g_free (d_collection), NULL);
-#line 13056 "Photo.c"
+#line 13057 "Photo.c"
 						}
 					}
-					__finally294:
+					__finally307:
 					{
 						PhotoRow* _tmp31_ = NULL;
 #line 1640 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp31_ = self->row;
 #line 1640 "/home/jens/Source/shotwell/src/Photo.vala"
 						g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 13066 "Photo.c"
+#line 13067 "Photo.c"
 					}
 #line 1640 "/home/jens/Source/shotwell/src/Photo.vala"
 					if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -13080,7 +13081,7 @@ void photo_finish_reimport_raw_development (Photo* self, PhotoReimportRawDevelop
 							_photo_reimport_raw_development_state_unref0 (reimport_state);
 #line 1640 "/home/jens/Source/shotwell/src/Photo.vala"
 							return;
-#line 13082 "Photo.c"
+#line 13083 "Photo.c"
 						} else {
 #line 1640 "/home/jens/Source/shotwell/src/Photo.vala"
 							_photo_reimport_raw_development_state_impl_dev_to_reimport_unref0 (dev);
@@ -13094,18 +13095,18 @@ void photo_finish_reimport_raw_development (Photo* self, PhotoReimportRawDevelop
 							g_clear_error (&_inner_error_);
 #line 1640 "/home/jens/Source/shotwell/src/Photo.vala"
 							return;
-#line 13096 "Photo.c"
+#line 13097 "Photo.c"
 						}
 					}
 				}
 			}
 #line 1636 "/home/jens/Source/shotwell/src/Photo.vala"
 			_photo_reimport_raw_development_state_impl_dev_to_reimport_unref0 (dev);
-#line 13103 "Photo.c"
+#line 13104 "Photo.c"
 		}
 #line 1636 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_dev_it);
-#line 13107 "Photo.c"
+#line 13108 "Photo.c"
 	}
 #line 1654 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp32_ = g_strdup ("metadata:name,image:orientation,metadata:rating,metadata:exposure-time");
@@ -13117,7 +13118,7 @@ void photo_finish_reimport_raw_development (Photo* self, PhotoReimportRawDevelop
 	_tmp34_ = _tmp33_->metadata_only;
 #line 1655 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (!_tmp34_) {
-#line 13119 "Photo.c"
+#line 13120 "Photo.c"
 		const gchar* _tmp35_ = NULL;
 		gchar* _tmp36_ = NULL;
 #line 1656 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -13128,7 +13129,7 @@ void photo_finish_reimport_raw_development (Photo* self, PhotoReimportRawDevelop
 		_g_free0 (list);
 #line 1656 "/home/jens/Source/shotwell/src/Photo.vala"
 		list = _tmp36_;
-#line 13130 "Photo.c"
+#line 13131 "Photo.c"
 	}
 #line 1658 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp37_ = list;
@@ -13146,7 +13147,7 @@ void photo_finish_reimport_raw_development (Photo* self, PhotoReimportRawDevelop
 	_g_free0 (list);
 #line 1630 "/home/jens/Source/shotwell/src/Photo.vala"
 	_photo_reimport_raw_development_state_unref0 (reimport_state);
-#line 13148 "Photo.c"
+#line 13149 "Photo.c"
 }
 
 
@@ -13162,7 +13163,7 @@ static gchar* photo_real_get_typename (DataSource* base) {
 	result = _tmp0_;
 #line 1664 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 13164 "Photo.c"
+#line 13165 "Photo.c"
 }
 
 
@@ -13181,7 +13182,7 @@ static gint64 photo_real_get_instance_id (DataSource* base) {
 	result = _tmp1_;
 #line 1668 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 13183 "Photo.c"
+#line 13184 "Photo.c"
 }
 
 
@@ -13211,7 +13212,7 @@ static gchar* photo_real_get_source_id (DataSource* base) {
 	result = _tmp4_;
 #line 1675 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 13213 "Photo.c"
+#line 13214 "Photo.c"
 }
 
 
@@ -13231,7 +13232,7 @@ void photo_set_master_timestamp (Photo* self, GFileInfo* info) {
 	g_file_info_get_modification_time (_tmp0_, &_tmp1_);
 #line 1680 "/home/jens/Source/shotwell/src/Photo.vala"
 	modification = _tmp1_;
-#line 13233 "Photo.c"
+#line 13234 "Photo.c"
 	{
 		{
 			PhotoRow* _tmp2_ = NULL;
@@ -13239,7 +13240,7 @@ void photo_set_master_timestamp (Photo* self, GFileInfo* info) {
 			_tmp2_ = self->row;
 #line 1683 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_lock (&self->priv->__lock_row);
-#line 13241 "Photo.c"
+#line 13242 "Photo.c"
 			{
 				PhotoRow* _tmp3_ = NULL;
 				BackingPhotoRow* _tmp4_ = NULL;
@@ -13268,18 +13269,18 @@ void photo_set_master_timestamp (Photo* self, GFileInfo* info) {
 				_tmp7_ = _tmp6_.tv_sec;
 #line 1684 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp5_ == ((time_t) _tmp7_)) {
-#line 13270 "Photo.c"
+#line 13271 "Photo.c"
 					{
 						PhotoRow* _tmp8_ = NULL;
 #line 1683 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp8_ = self->row;
 #line 1683 "/home/jens/Source/shotwell/src/Photo.vala"
 						g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 13277 "Photo.c"
+#line 13278 "Photo.c"
 					}
 #line 1685 "/home/jens/Source/shotwell/src/Photo.vala"
 					return;
-#line 13281 "Photo.c"
+#line 13282 "Photo.c"
 				}
 #line 1687 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp9_ = photo_table_get_instance ();
@@ -13299,8 +13300,8 @@ void photo_set_master_timestamp (Photo* self, GFileInfo* info) {
 				_database_table_unref0 (_tmp10_);
 #line 1687 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 13301 "Photo.c"
-					goto __finally296;
+#line 13302 "Photo.c"
+					goto __finally309;
 				}
 #line 1688 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp15_ = self->row;
@@ -13312,23 +13313,23 @@ void photo_set_master_timestamp (Photo* self, GFileInfo* info) {
 				_tmp18_ = _tmp17_.tv_sec;
 #line 1688 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp16_->timestamp = (time_t) _tmp18_;
-#line 13314 "Photo.c"
+#line 13315 "Photo.c"
 			}
-			__finally296:
+			__finally309:
 			{
 				PhotoRow* _tmp19_ = NULL;
 #line 1683 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp19_ = self->row;
 #line 1683 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 13323 "Photo.c"
+#line 13324 "Photo.c"
 			}
 #line 1683 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1683 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_inner_error_->domain == DATABASE_ERROR) {
-#line 13329 "Photo.c"
-					goto __catch295_database_error;
+#line 13330 "Photo.c"
+					goto __catch308_database_error;
 				}
 #line 1683 "/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);
@@ -13336,12 +13337,12 @@ void photo_set_master_timestamp (Photo* self, GFileInfo* info) {
 				g_clear_error (&_inner_error_);
 #line 1683 "/home/jens/Source/shotwell/src/Photo.vala"
 				return;
-#line 13338 "Photo.c"
+#line 13339 "Photo.c"
 			}
 		}
 	}
-	goto __finally295;
-	__catch295_database_error:
+	goto __finally308;
+	__catch308_database_error:
 	{
 		GError* err = NULL;
 		GError* _tmp20_ = NULL;
@@ -13357,9 +13358,9 @@ void photo_set_master_timestamp (Photo* self, GFileInfo* info) {
 		_g_error_free0 (err);
 #line 1693 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 13359 "Photo.c"
+#line 13360 "Photo.c"
 	}
-	__finally295:
+	__finally308:
 #line 1682 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1682 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -13368,13 +13369,13 @@ void photo_set_master_timestamp (Photo* self, GFileInfo* info) {
 		g_clear_error (&_inner_error_);
 #line 1682 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 13370 "Photo.c"
+#line 13371 "Photo.c"
 	}
 #line 1696 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp21_ = photo_is_master_baseline (self);
 #line 1696 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp21_) {
-#line 13376 "Photo.c"
+#line 13377 "Photo.c"
 		Alteration* _tmp22_ = NULL;
 		Alteration* _tmp23_ = NULL;
 #line 1697 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -13385,7 +13386,7 @@ void photo_set_master_timestamp (Photo* self, GFileInfo* info) {
 		data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp23_);
 #line 1697 "/home/jens/Source/shotwell/src/Photo.vala"
 		_alteration_unref0 (_tmp23_);
-#line 13387 "Photo.c"
+#line 13388 "Photo.c"
 	} else {
 		Alteration* _tmp24_ = NULL;
 		Alteration* _tmp25_ = NULL;
@@ -13397,7 +13398,7 @@ void photo_set_master_timestamp (Photo* self, GFileInfo* info) {
 		data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp25_);
 #line 1699 "/home/jens/Source/shotwell/src/Photo.vala"
 		_alteration_unref0 (_tmp25_);
-#line 13399 "Photo.c"
+#line 13400 "Photo.c"
 	}
 }
 
@@ -13421,14 +13422,14 @@ void photo_update_editable_modification_time (Photo* self, GFileInfo* info, GErr
 	modification = _tmp1_;
 #line 1706 "/home/jens/Source/shotwell/src/Photo.vala"
 	altered = FALSE;
-#line 13423 "Photo.c"
+#line 13424 "Photo.c"
 	{
 		PhotoRow* _tmp2_ = NULL;
 #line 1707 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp2_ = self->row;
 #line 1707 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 13430 "Photo.c"
+#line 13431 "Photo.c"
 		{
 			gboolean _tmp3_ = FALSE;
 			PhotoRow* _tmp4_ = NULL;
@@ -13439,7 +13440,7 @@ void photo_update_editable_modification_time (Photo* self, GFileInfo* info, GErr
 			_tmp5_ = backing_photo_id_is_valid (&_tmp4_->editable_id);
 #line 1708 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp5_) {
-#line 13441 "Photo.c"
+#line 13442 "Photo.c"
 				BackingPhotoRow* _tmp6_ = NULL;
 				time_t _tmp7_ = 0;
 				GTimeVal _tmp8_ = {0};
@@ -13454,15 +13455,15 @@ void photo_update_editable_modification_time (Photo* self, GFileInfo* info, GErr
 				_tmp9_ = _tmp8_.tv_sec;
 #line 1708 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp3_ = _tmp7_ != ((time_t) _tmp9_);
-#line 13456 "Photo.c"
+#line 13457 "Photo.c"
 			} else {
 #line 1708 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp3_ = FALSE;
-#line 13460 "Photo.c"
+#line 13461 "Photo.c"
 			}
 #line 1708 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp3_) {
-#line 13464 "Photo.c"
+#line 13465 "Photo.c"
 				BackingPhotoTable* _tmp10_ = NULL;
 				BackingPhotoTable* _tmp11_ = NULL;
 				PhotoRow* _tmp12_ = NULL;
@@ -13490,8 +13491,8 @@ void photo_update_editable_modification_time (Photo* self, GFileInfo* info, GErr
 				_database_table_unref0 (_tmp11_);
 #line 1709 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 13492 "Photo.c"
-					goto __finally297;
+#line 13493 "Photo.c"
+					goto __finally310;
 				}
 #line 1711 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp16_ = self->priv->editable;
@@ -13503,17 +13504,17 @@ void photo_update_editable_modification_time (Photo* self, GFileInfo* info, GErr
 				_tmp16_->timestamp = (time_t) _tmp18_;
 #line 1712 "/home/jens/Source/shotwell/src/Photo.vala"
 				altered = TRUE;
-#line 13505 "Photo.c"
+#line 13506 "Photo.c"
 			}
 		}
-		__finally297:
+		__finally310:
 		{
 			PhotoRow* _tmp19_ = NULL;
 #line 1707 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp19_ = self->row;
 #line 1707 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 13515 "Photo.c"
+#line 13516 "Photo.c"
 		}
 #line 1707 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -13523,7 +13524,7 @@ void photo_update_editable_modification_time (Photo* self, GFileInfo* info, GErr
 				g_propagate_error (error, _inner_error_);
 #line 1707 "/home/jens/Source/shotwell/src/Photo.vala"
 				return;
-#line 13525 "Photo.c"
+#line 13526 "Photo.c"
 			} else {
 #line 1707 "/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);
@@ -13531,7 +13532,7 @@ void photo_update_editable_modification_time (Photo* self, GFileInfo* info, GErr
 				g_clear_error (&_inner_error_);
 #line 1707 "/home/jens/Source/shotwell/src/Photo.vala"
 				return;
-#line 13533 "Photo.c"
+#line 13534 "Photo.c"
 			}
 		}
 	}
@@ -13539,7 +13540,7 @@ void photo_update_editable_modification_time (Photo* self, GFileInfo* info, GErr
 	_tmp20_ = altered;
 #line 1716 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp20_) {
-#line 13541 "Photo.c"
+#line 13542 "Photo.c"
 		Alteration* _tmp21_ = NULL;
 		Alteration* _tmp22_ = NULL;
 #line 1717 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -13550,7 +13551,7 @@ void photo_update_editable_modification_time (Photo* self, GFileInfo* info, GErr
 		data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp22_);
 #line 1717 "/home/jens/Source/shotwell/src/Photo.vala"
 		_alteration_unref0 (_tmp22_);
-#line 13552 "Photo.c"
+#line 13553 "Photo.c"
 	}
 }
 
@@ -13561,7 +13562,7 @@ void photo_update_many_editable_timestamps (GeeMap* map, GError** error) {
 	g_return_if_fail (GEE_IS_MAP (map));
 #line 1723 "/home/jens/Source/shotwell/src/Photo.vala"
 	database_table_begin_transaction ();
-#line 13563 "Photo.c"
+#line 13564 "Photo.c"
 	{
 		GeeIterator* _photo_it = NULL;
 		GeeMap* _tmp0_ = NULL;
@@ -13588,7 +13589,7 @@ void photo_update_many_editable_timestamps (GeeMap* map, GError** error) {
 		_photo_it = _tmp5_;
 #line 1724 "/home/jens/Source/shotwell/src/Photo.vala"
 		while (TRUE) {
-#line 13590 "Photo.c"
+#line 13591 "Photo.c"
 			GeeIterator* _tmp6_ = NULL;
 			gboolean _tmp7_ = FALSE;
 			Photo* photo = NULL;
@@ -13607,7 +13608,7 @@ void photo_update_many_editable_timestamps (GeeMap* map, GError** error) {
 			if (!_tmp7_) {
 #line 1724 "/home/jens/Source/shotwell/src/Photo.vala"
 				break;
-#line 13609 "Photo.c"
+#line 13610 "Photo.c"
 			}
 #line 1724 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp8_ = _photo_it;
@@ -13641,7 +13642,7 @@ void photo_update_many_editable_timestamps (GeeMap* map, GError** error) {
 					_g_object_unref0 (_photo_it);
 #line 1725 "/home/jens/Source/shotwell/src/Photo.vala"
 					return;
-#line 13643 "Photo.c"
+#line 13644 "Photo.c"
 				} else {
 #line 1725 "/home/jens/Source/shotwell/src/Photo.vala"
 					_g_object_unref0 (photo);
@@ -13653,16 +13654,16 @@ void photo_update_many_editable_timestamps (GeeMap* map, GError** error) {
 					g_clear_error (&_inner_error_);
 #line 1725 "/home/jens/Source/shotwell/src/Photo.vala"
 					return;
-#line 13655 "Photo.c"
+#line 13656 "Photo.c"
 				}
 			}
 #line 1724 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (photo);
-#line 13660 "Photo.c"
+#line 13661 "Photo.c"
 		}
 #line 1724 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_photo_it);
-#line 13664 "Photo.c"
+#line 13665 "Photo.c"
 	}
 #line 1726 "/home/jens/Source/shotwell/src/Photo.vala"
 	database_table_commit_transaction (&_inner_error_);
@@ -13674,7 +13675,7 @@ void photo_update_many_editable_timestamps (GeeMap* map, GError** error) {
 			g_propagate_error (error, _inner_error_);
 #line 1726 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 13676 "Photo.c"
+#line 13677 "Photo.c"
 		} else {
 #line 1726 "/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);
@@ -13682,7 +13683,7 @@ void photo_update_many_editable_timestamps (GeeMap* map, GError** error) {
 			g_clear_error (&_inner_error_);
 #line 1726 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 13684 "Photo.c"
+#line 13685 "Photo.c"
 		}
 	}
 }
@@ -13702,26 +13703,26 @@ static PhotoFileFormat photo_real_get_preferred_thumbnail_format (ThumbnailSourc
 	_tmp2_ = photo_file_format_can_write_image (_tmp1_);
 #line 1730 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp2_) {
-#line 13704 "Photo.c"
+#line 13705 "Photo.c"
 		PhotoFileFormat _tmp3_ = 0;
 #line 1730 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp3_ = photo_get_file_format (self);
 #line 1730 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = _tmp3_;
-#line 13710 "Photo.c"
+#line 13711 "Photo.c"
 	} else {
 		PhotoFileFormat _tmp4_ = 0;
 #line 1731 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp4_ = photo_file_format_get_system_default_format ();
 #line 1731 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = _tmp4_;
-#line 13717 "Photo.c"
+#line 13718 "Photo.c"
 	}
 #line 1730 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp0_;
 #line 1730 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 13723 "Photo.c"
+#line 13724 "Photo.c"
 }
 
 
@@ -13750,7 +13751,7 @@ static GdkPixbuf* photo_real_create_thumbnail (ThumbnailSource* base, gint scale
 		g_propagate_error (error, _inner_error_);
 #line 1735 "/home/jens/Source/shotwell/src/Photo.vala"
 		return NULL;
-#line 13752 "Photo.c"
+#line 13753 "Photo.c"
 	}
 #line 1735 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = _tmp0_;
@@ -13762,7 +13763,7 @@ static GdkPixbuf* photo_real_create_thumbnail (ThumbnailSource* base, gint scale
 	_g_object_unref0 (_tmp0_);
 #line 1735 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 13764 "Photo.c"
+#line 13765 "Photo.c"
 }
 
 
@@ -13781,7 +13782,7 @@ gboolean photo_is_file_image (GFile* file) {
 	if (_tmp2_) {
 #line 1743 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = TRUE;
-#line 13783 "Photo.c"
+#line 13784 "Photo.c"
 	} else {
 		GFile* _tmp3_ = NULL;
 		gchar* _tmp4_ = NULL;
@@ -13799,13 +13800,13 @@ gboolean photo_is_file_image (GFile* file) {
 		_tmp0_ = _tmp6_;
 #line 1743 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_free0 (_tmp5_);
-#line 13801 "Photo.c"
+#line 13802 "Photo.c"
 	}
 #line 1742 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp0_;
 #line 1742 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 13807 "Photo.c"
+#line 13808 "Photo.c"
 }
 
 
@@ -13847,7 +13848,7 @@ static gboolean photo_is_extension_found (const gchar* basename, gchar** extensi
 		_g_free0 (name);
 #line 1750 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 13849 "Photo.c"
+#line 13850 "Photo.c"
 	}
 #line 1753 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = ext;
@@ -13861,7 +13862,7 @@ static gboolean photo_is_extension_found (const gchar* basename, gchar** extensi
 	_tmp6_ = extensions;
 #line 1756 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp6__length1 = extensions_length1;
-#line 13863 "Photo.c"
+#line 13864 "Photo.c"
 	{
 		gchar** extension_collection = NULL;
 		gint extension_collection_length1 = 0;
@@ -13873,14 +13874,14 @@ static gboolean photo_is_extension_found (const gchar* basename, gchar** extensi
 		extension_collection_length1 = _tmp6__length1;
 #line 1756 "/home/jens/Source/shotwell/src/Photo.vala"
 		for (extension_it = 0; extension_it < _tmp6__length1; extension_it = extension_it + 1) {
-#line 13875 "Photo.c"
+#line 13876 "Photo.c"
 			gchar* _tmp7_ = NULL;
 			gchar* extension = NULL;
 #line 1756 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp7_ = g_strdup (extension_collection[extension_it]);
 #line 1756 "/home/jens/Source/shotwell/src/Photo.vala"
 			extension = _tmp7_;
-#line 13882 "Photo.c"
+#line 13883 "Photo.c"
 			{
 				const gchar* _tmp8_ = NULL;
 				const gchar* _tmp9_ = NULL;
@@ -13900,11 +13901,11 @@ static gboolean photo_is_extension_found (const gchar* basename, gchar** extensi
 					_g_free0 (name);
 #line 1758 "/home/jens/Source/shotwell/src/Photo.vala"
 					return result;
-#line 13902 "Photo.c"
+#line 13903 "Photo.c"
 				}
 #line 1756 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_free0 (extension);
-#line 13906 "Photo.c"
+#line 13907 "Photo.c"
 			}
 		}
 	}
@@ -13916,7 +13917,7 @@ static gboolean photo_is_extension_found (const gchar* basename, gchar** extensi
 	_g_free0 (name);
 #line 1761 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 13918 "Photo.c"
+#line 13919 "Photo.c"
 }
 
 
@@ -13954,7 +13955,7 @@ gboolean photo_is_duplicate (GFile* file, const gchar* thumbnail_md5, const gcha
 	result = _tmp7_;
 #line 1770 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 13956 "Photo.c"
+#line 13957 "Photo.c"
 }
 
 
@@ -14002,13 +14003,13 @@ PhotoID* photo_get_duplicate_ids (GFile* file, const gchar* thumbnail_md5, const
 	if (result_length1) {
 #line 1779 "/home/jens/Source/shotwell/src/Photo.vala"
 		*result_length1 = _tmp9__length1;
-#line 14004 "Photo.c"
+#line 14005 "Photo.c"
 	}
 #line 1779 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp9_;
 #line 1779 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 14010 "Photo.c"
+#line 14011 "Photo.c"
 }
 
 
@@ -14029,7 +14030,7 @@ gint64 photo_get_photo_key (DataSource* source) {
 	result = _tmp2_;
 #line 1787 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 14031 "Photo.c"
+#line 14032 "Photo.c"
 }
 
 
@@ -14056,7 +14057,7 @@ static GFile* photo_real_get_file (MediaSource* base) {
 	result = _tmp3_;
 #line 1806 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 14058 "Photo.c"
+#line 14059 "Photo.c"
 }
 
 
@@ -14067,13 +14068,13 @@ static void _vala_array_add262 (gchar*** array, int* length, int* size, gchar* v
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 1849 "/home/jens/Source/shotwell/src/Photo.vala"
 		*array = g_renew (gchar*, *array, (*size) + 1);
-#line 14069 "Photo.c"
+#line 14070 "Photo.c"
 	}
 #line 1849 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[(*length)++] = value;
 #line 1849 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[*length] = NULL;
-#line 14075 "Photo.c"
+#line 14076 "Photo.c"
 }
 
 
@@ -14084,13 +14085,13 @@ static void _vala_array_add263 (gchar*** array, int* length, int* size, gchar* v
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 1854 "/home/jens/Source/shotwell/src/Photo.vala"
 		*array = g_renew (gchar*, *array, (*size) + 1);
-#line 14086 "Photo.c"
+#line 14087 "Photo.c"
 	}
 #line 1854 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[(*length)++] = value;
 #line 1854 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[*length] = NULL;
-#line 14092 "Photo.c"
+#line 14093 "Photo.c"
 }
 
 
@@ -14101,13 +14102,13 @@ static void _vala_array_add264 (gchar*** array, int* length, int* size, gchar* v
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 1857 "/home/jens/Source/shotwell/src/Photo.vala"
 		*array = g_renew (gchar*, *array, (*size) + 1);
-#line 14103 "Photo.c"
+#line 14104 "Photo.c"
 	}
 #line 1857 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[(*length)++] = value;
 #line 1857 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[*length] = NULL;
-#line 14109 "Photo.c"
+#line 14110 "Photo.c"
 }
 
 
@@ -14118,13 +14119,13 @@ static void _vala_array_add265 (gchar*** array, int* length, int* size, gchar* v
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 1860 "/home/jens/Source/shotwell/src/Photo.vala"
 		*array = g_renew (gchar*, *array, (*size) + 1);
-#line 14120 "Photo.c"
+#line 14121 "Photo.c"
 	}
 #line 1860 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[(*length)++] = value;
 #line 1860 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[*length] = NULL;
-#line 14126 "Photo.c"
+#line 14127 "Photo.c"
 }
 
 
@@ -14159,7 +14160,7 @@ void photo_set_master_file (Photo* self, GFile* file) {
 	name_changed = FALSE;
 #line 1818 "/home/jens/Source/shotwell/src/Photo.vala"
 	old_file = NULL;
-#line 14161 "Photo.c"
+#line 14162 "Photo.c"
 	{
 		{
 			PhotoRow* _tmp2_ = NULL;
@@ -14167,7 +14168,7 @@ void photo_set_master_file (Photo* self, GFile* file) {
 			_tmp2_ = self->row;
 #line 1820 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_lock (&self->priv->__lock_row);
-#line 14169 "Photo.c"
+#line 14170 "Photo.c"
 			{
 				{
 					PhotoBackingReaders* _tmp3_ = NULL;
@@ -14175,7 +14176,7 @@ void photo_set_master_file (Photo* self, GFile* file) {
 					_tmp3_ = self->priv->readers;
 #line 1821 "/home/jens/Source/shotwell/src/Photo.vala"
 					g_rec_mutex_lock (&self->priv->__lock_readers);
-#line 14177 "Photo.c"
+#line 14178 "Photo.c"
 					{
 						PhotoBackingReaders* _tmp4_ = NULL;
 						PhotoFileReader* _tmp5_ = NULL;
@@ -14201,7 +14202,7 @@ void photo_set_master_file (Photo* self, GFile* file) {
 						_tmp9_ = g_file_equal (_tmp7_, _tmp8_);
 #line 1823 "/home/jens/Source/shotwell/src/Photo.vala"
 						if (!_tmp9_) {
-#line 14203 "Photo.c"
+#line 14204 "Photo.c"
 							PhotoTable* _tmp10_ = NULL;
 							PhotoTable* _tmp11_ = NULL;
 							PhotoID _tmp12_ = {0};
@@ -14238,8 +14239,8 @@ void photo_set_master_file (Photo* self, GFile* file) {
 							_database_table_unref0 (_tmp11_);
 #line 1824 "/home/jens/Source/shotwell/src/Photo.vala"
 							if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 14240 "Photo.c"
-								goto __finally300;
+#line 14241 "Photo.c"
+								goto __finally313;
 							}
 #line 1826 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp14_ = self->row;
@@ -14295,7 +14296,7 @@ void photo_set_master_file (Photo* self, GFile* file) {
 							_tmp31_ = is_string_empty (_tmp30_);
 #line 1833 "/home/jens/Source/shotwell/src/Photo.vala"
 							if (_tmp31_) {
-#line 14297 "Photo.c"
+#line 14298 "Photo.c"
 								GFile* _tmp32_ = NULL;
 								gchar* _tmp33_ = NULL;
 								gchar* _tmp34_ = NULL;
@@ -14320,48 +14321,48 @@ void photo_set_master_file (Photo* self, GFile* file) {
 								_g_free0 (_tmp37_);
 #line 1834 "/home/jens/Source/shotwell/src/Photo.vala"
 								_g_free0 (_tmp34_);
-#line 14322 "Photo.c"
+#line 14323 "Photo.c"
 							} else {
 #line 1833 "/home/jens/Source/shotwell/src/Photo.vala"
 								_tmp28_ = FALSE;
-#line 14326 "Photo.c"
+#line 14327 "Photo.c"
 							}
 #line 1833 "/home/jens/Source/shotwell/src/Photo.vala"
 							name_changed = _tmp28_;
-#line 14330 "Photo.c"
+#line 14331 "Photo.c"
 						}
 					}
-					__finally300:
+					__finally313:
 					{
 						PhotoBackingReaders* _tmp38_ = NULL;
 #line 1821 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp38_ = self->priv->readers;
 #line 1821 "/home/jens/Source/shotwell/src/Photo.vala"
 						g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 14340 "Photo.c"
+#line 14341 "Photo.c"
 					}
 #line 1821 "/home/jens/Source/shotwell/src/Photo.vala"
 					if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 14344 "Photo.c"
-						goto __finally299;
+#line 14345 "Photo.c"
+						goto __finally312;
 					}
 				}
 			}
-			__finally299:
+			__finally312:
 			{
 				PhotoRow* _tmp39_ = NULL;
 #line 1820 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp39_ = self->row;
 #line 1820 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 14356 "Photo.c"
+#line 14357 "Photo.c"
 			}
 #line 1820 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1820 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_inner_error_->domain == DATABASE_ERROR) {
-#line 14362 "Photo.c"
-					goto __catch298_database_error;
+#line 14363 "Photo.c"
+					goto __catch311_database_error;
 				}
 #line 1820 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (old_file);
@@ -14373,12 +14374,12 @@ void photo_set_master_file (Photo* self, GFile* file) {
 				g_clear_error (&_inner_error_);
 #line 1820 "/home/jens/Source/shotwell/src/Photo.vala"
 				return;
-#line 14375 "Photo.c"
+#line 14376 "Photo.c"
 			}
 		}
 	}
-	goto __finally298;
-	__catch298_database_error:
+	goto __finally311;
+	__catch311_database_error:
 	{
 		GError* err = NULL;
 		GError* _tmp40_ = NULL;
@@ -14392,9 +14393,9 @@ void photo_set_master_file (Photo* self, GFile* file) {
 		app_window_database_error (_tmp40_);
 #line 1819 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_error_free0 (err);
-#line 14394 "Photo.c"
+#line 14395 "Photo.c"
 	}
-	__finally298:
+	__finally311:
 #line 1819 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1819 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -14407,13 +14408,13 @@ void photo_set_master_file (Photo* self, GFile* file) {
 		g_clear_error (&_inner_error_);
 #line 1819 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 14409 "Photo.c"
+#line 14410 "Photo.c"
 	}
 #line 1842 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp41_ = altered;
 #line 1842 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp41_) {
-#line 14415 "Photo.c"
+#line 14416 "Photo.c"
 		GFile* _tmp42_ = NULL;
 		GFile* _tmp43_ = NULL;
 		gboolean _tmp44_ = FALSE;
@@ -14443,7 +14444,7 @@ void photo_set_master_file (Photo* self, GFile* file) {
 		if (_tmp44_) {
 #line 1846 "/home/jens/Source/shotwell/src/Photo.vala"
 			photo_notify_baseline_replaced (self);
-#line 14445 "Photo.c"
+#line 14446 "Photo.c"
 		}
 #line 1848 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp45_ = g_new0 (gchar*, 0 + 1);
@@ -14465,7 +14466,7 @@ void photo_set_master_file (Photo* self, GFile* file) {
 		_tmp48_ = name_changed;
 #line 1853 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp48_) {
-#line 14467 "Photo.c"
+#line 14468 "Photo.c"
 			gchar** _tmp49_ = NULL;
 			gint _tmp49__length1 = 0;
 			gchar* _tmp50_ = NULL;
@@ -14477,13 +14478,13 @@ void photo_set_master_file (Photo* self, GFile* file) {
 			_tmp50_ = g_strdup ("metadata:name");
 #line 1854 "/home/jens/Source/shotwell/src/Photo.vala"
 			_vala_array_add263 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp50_);
-#line 14479 "Photo.c"
+#line 14480 "Photo.c"
 		}
 #line 1856 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp51_ = is_source;
 #line 1856 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp51_) {
-#line 14485 "Photo.c"
+#line 14486 "Photo.c"
 			gchar** _tmp52_ = NULL;
 			gint _tmp52__length1 = 0;
 			gchar* _tmp53_ = NULL;
@@ -14495,13 +14496,13 @@ void photo_set_master_file (Photo* self, GFile* file) {
 			_tmp53_ = g_strdup ("backing:source");
 #line 1857 "/home/jens/Source/shotwell/src/Photo.vala"
 			_vala_array_add264 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp53_);
-#line 14497 "Photo.c"
+#line 14498 "Photo.c"
 		}
 #line 1859 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp54_ = is_baseline;
 #line 1859 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp54_) {
-#line 14503 "Photo.c"
+#line 14504 "Photo.c"
 			gchar** _tmp55_ = NULL;
 			gint _tmp55__length1 = 0;
 			gchar* _tmp56_ = NULL;
@@ -14513,7 +14514,7 @@ void photo_set_master_file (Photo* self, GFile* file) {
 			_tmp56_ = g_strdup ("backing:baseline");
 #line 1860 "/home/jens/Source/shotwell/src/Photo.vala"
 			_vala_array_add265 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp56_);
-#line 14515 "Photo.c"
+#line 14516 "Photo.c"
 		}
 #line 1862 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp57_ = alteration_list;
@@ -14529,13 +14530,13 @@ void photo_set_master_file (Photo* self, GFile* file) {
 		_alteration_unref0 (_tmp59_);
 #line 1842 "/home/jens/Source/shotwell/src/Photo.vala"
 		alteration_list = (_vala_array_free (alteration_list, alteration_list_length1, (GDestroyNotify) g_free), NULL);
-#line 14531 "Photo.c"
+#line 14532 "Photo.c"
 	}
 #line 1811 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (old_file);
 #line 1811 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_free0 (filepath);
-#line 14537 "Photo.c"
+#line 14538 "Photo.c"
 }
 
 
@@ -14546,13 +14547,13 @@ static void _vala_array_add266 (gchar*** array, int* length, int* size, gchar* v
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 1902 "/home/jens/Source/shotwell/src/Photo.vala"
 		*array = g_renew (gchar*, *array, (*size) + 1);
-#line 14548 "Photo.c"
+#line 14549 "Photo.c"
 	}
 #line 1902 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[(*length)++] = value;
 #line 1902 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[*length] = NULL;
-#line 14554 "Photo.c"
+#line 14555 "Photo.c"
 }
 
 
@@ -14563,13 +14564,13 @@ static void _vala_array_add267 (gchar*** array, int* length, int* size, gchar* v
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 1905 "/home/jens/Source/shotwell/src/Photo.vala"
 		*array = g_renew (gchar*, *array, (*size) + 1);
-#line 14565 "Photo.c"
+#line 14566 "Photo.c"
 	}
 #line 1905 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[(*length)++] = value;
 #line 1905 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[*length] = NULL;
-#line 14571 "Photo.c"
+#line 14572 "Photo.c"
 }
 
 
@@ -14580,13 +14581,13 @@ static void _vala_array_add268 (gchar*** array, int* length, int* size, gchar* v
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 1908 "/home/jens/Source/shotwell/src/Photo.vala"
 		*array = g_renew (gchar*, *array, (*size) + 1);
-#line 14582 "Photo.c"
+#line 14583 "Photo.c"
 	}
 #line 1908 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[(*length)++] = value;
 #line 1908 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[*length] = NULL;
-#line 14588 "Photo.c"
+#line 14589 "Photo.c"
 }
 
 
@@ -14618,7 +14619,7 @@ void photo_set_editable_file (Photo* self, GFile* file) {
 	is_source = FALSE;
 #line 1874 "/home/jens/Source/shotwell/src/Photo.vala"
 	old_file = NULL;
-#line 14620 "Photo.c"
+#line 14621 "Photo.c"
 	{
 		{
 			PhotoRow* _tmp2_ = NULL;
@@ -14626,7 +14627,7 @@ void photo_set_editable_file (Photo* self, GFile* file) {
 			_tmp2_ = self->row;
 #line 1876 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_lock (&self->priv->__lock_row);
-#line 14628 "Photo.c"
+#line 14629 "Photo.c"
 			{
 				{
 					PhotoBackingReaders* _tmp3_ = NULL;
@@ -14634,7 +14635,7 @@ void photo_set_editable_file (Photo* self, GFile* file) {
 					_tmp3_ = self->priv->readers;
 #line 1877 "/home/jens/Source/shotwell/src/Photo.vala"
 					g_rec_mutex_lock (&self->priv->__lock_readers);
-#line 14636 "Photo.c"
+#line 14637 "Photo.c"
 					{
 						GFile* _tmp4_ = NULL;
 						PhotoBackingReaders* _tmp5_ = NULL;
@@ -14648,7 +14649,7 @@ void photo_set_editable_file (Photo* self, GFile* file) {
 						_tmp6_ = _tmp5_->editable;
 #line 1878 "/home/jens/Source/shotwell/src/Photo.vala"
 						if (_tmp6_ != NULL) {
-#line 14650 "Photo.c"
+#line 14651 "Photo.c"
 							PhotoBackingReaders* _tmp7_ = NULL;
 							PhotoFileReader* _tmp8_ = NULL;
 							GFile* _tmp9_ = NULL;
@@ -14662,13 +14663,13 @@ void photo_set_editable_file (Photo* self, GFile* file) {
 							_g_object_unref0 (_tmp4_);
 #line 1878 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp4_ = _tmp9_;
-#line 14664 "Photo.c"
+#line 14665 "Photo.c"
 						} else {
 #line 1878 "/home/jens/Source/shotwell/src/Photo.vala"
 							_g_object_unref0 (_tmp4_);
 #line 1878 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp4_ = NULL;
-#line 14670 "Photo.c"
+#line 14671 "Photo.c"
 						}
 #line 1878 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp10_ = _g_object_ref0 (_tmp4_);
@@ -14680,7 +14681,7 @@ void photo_set_editable_file (Photo* self, GFile* file) {
 						_tmp12_ = old_file;
 #line 1879 "/home/jens/Source/shotwell/src/Photo.vala"
 						if (_tmp12_ != NULL) {
-#line 14682 "Photo.c"
+#line 14683 "Photo.c"
 							GFile* _tmp13_ = NULL;
 							GFile* _tmp14_ = NULL;
 							gboolean _tmp15_ = FALSE;
@@ -14692,15 +14693,15 @@ void photo_set_editable_file (Photo* self, GFile* file) {
 							_tmp15_ = g_file_equal (_tmp13_, _tmp14_);
 #line 1879 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp11_ = !_tmp15_;
-#line 14694 "Photo.c"
+#line 14695 "Photo.c"
 						} else {
 #line 1879 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp11_ = FALSE;
-#line 14698 "Photo.c"
+#line 14699 "Photo.c"
 						}
 #line 1879 "/home/jens/Source/shotwell/src/Photo.vala"
 						if (_tmp11_) {
-#line 14702 "Photo.c"
+#line 14703 "Photo.c"
 							BackingPhotoTable* _tmp16_ = NULL;
 							BackingPhotoTable* _tmp17_ = NULL;
 							PhotoRow* _tmp18_ = NULL;
@@ -14734,8 +14735,8 @@ void photo_set_editable_file (Photo* self, GFile* file) {
 							if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1880 "/home/jens/Source/shotwell/src/Photo.vala"
 								_g_object_unref0 (_tmp4_);
-#line 14736 "Photo.c"
-								goto __finally303;
+#line 14737 "Photo.c"
+								goto __finally316;
 							}
 #line 1882 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp21_ = self->priv->editable;
@@ -14771,43 +14772,43 @@ void photo_set_editable_file (Photo* self, GFile* file) {
 							_tmp30_ = photo_is_editable_source (self);
 #line 1887 "/home/jens/Source/shotwell/src/Photo.vala"
 							is_source = _tmp30_;
-#line 14773 "Photo.c"
+#line 14774 "Photo.c"
 						}
 #line 1877 "/home/jens/Source/shotwell/src/Photo.vala"
 						_g_object_unref0 (_tmp4_);
-#line 14777 "Photo.c"
+#line 14778 "Photo.c"
 					}
-					__finally303:
+					__finally316:
 					{
 						PhotoBackingReaders* _tmp31_ = NULL;
 #line 1877 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp31_ = self->priv->readers;
 #line 1877 "/home/jens/Source/shotwell/src/Photo.vala"
 						g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 14786 "Photo.c"
+#line 14787 "Photo.c"
 					}
 #line 1877 "/home/jens/Source/shotwell/src/Photo.vala"
 					if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 14790 "Photo.c"
-						goto __finally302;
+#line 14791 "Photo.c"
+						goto __finally315;
 					}
 				}
 			}
-			__finally302:
+			__finally315:
 			{
 				PhotoRow* _tmp32_ = NULL;
 #line 1876 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp32_ = self->row;
 #line 1876 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 14802 "Photo.c"
+#line 14803 "Photo.c"
 			}
 #line 1876 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1876 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_inner_error_->domain == DATABASE_ERROR) {
-#line 14808 "Photo.c"
-					goto __catch301_database_error;
+#line 14809 "Photo.c"
+					goto __catch314_database_error;
 				}
 #line 1876 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (old_file);
@@ -14819,12 +14820,12 @@ void photo_set_editable_file (Photo* self, GFile* file) {
 				g_clear_error (&_inner_error_);
 #line 1876 "/home/jens/Source/shotwell/src/Photo.vala"
 				return;
-#line 14821 "Photo.c"
+#line 14822 "Photo.c"
 			}
 		}
 	}
-	goto __finally301;
-	__catch301_database_error:
+	goto __finally314;
+	__catch314_database_error:
 	{
 		GError* err = NULL;
 		GError* _tmp33_ = NULL;
@@ -14838,9 +14839,9 @@ void photo_set_editable_file (Photo* self, GFile* file) {
 		app_window_database_error (_tmp33_);
 #line 1875 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_error_free0 (err);
-#line 14840 "Photo.c"
+#line 14841 "Photo.c"
 	}
-	__finally301:
+	__finally314:
 #line 1875 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1875 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -14853,13 +14854,13 @@ void photo_set_editable_file (Photo* self, GFile* file) {
 		g_clear_error (&_inner_error_);
 #line 1875 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 14855 "Photo.c"
+#line 14856 "Photo.c"
 	}
 #line 1895 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp34_ = altered;
 #line 1895 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp34_) {
-#line 14861 "Photo.c"
+#line 14862 "Photo.c"
 		GFile* _tmp35_ = NULL;
 		GFile* _tmp36_ = NULL;
 		gboolean _tmp37_ = FALSE;
@@ -14888,7 +14889,7 @@ void photo_set_editable_file (Photo* self, GFile* file) {
 		if (_tmp37_) {
 #line 1899 "/home/jens/Source/shotwell/src/Photo.vala"
 			photo_notify_baseline_replaced (self);
-#line 14890 "Photo.c"
+#line 14891 "Photo.c"
 		}
 #line 1901 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp38_ = g_new0 (gchar*, 0 + 1);
@@ -14910,7 +14911,7 @@ void photo_set_editable_file (Photo* self, GFile* file) {
 		_tmp41_ = is_baseline;
 #line 1904 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp41_) {
-#line 14912 "Photo.c"
+#line 14913 "Photo.c"
 			gchar** _tmp42_ = NULL;
 			gint _tmp42__length1 = 0;
 			gchar* _tmp43_ = NULL;
@@ -14922,13 +14923,13 @@ void photo_set_editable_file (Photo* self, GFile* file) {
 			_tmp43_ = g_strdup ("backing:baseline");
 #line 1905 "/home/jens/Source/shotwell/src/Photo.vala"
 			_vala_array_add267 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp43_);
-#line 14924 "Photo.c"
+#line 14925 "Photo.c"
 		}
 #line 1907 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp44_ = is_source;
 #line 1907 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp44_) {
-#line 14930 "Photo.c"
+#line 14931 "Photo.c"
 			gchar** _tmp45_ = NULL;
 			gint _tmp45__length1 = 0;
 			gchar* _tmp46_ = NULL;
@@ -14940,7 +14941,7 @@ void photo_set_editable_file (Photo* self, GFile* file) {
 			_tmp46_ = g_strdup ("backing:source");
 #line 1908 "/home/jens/Source/shotwell/src/Photo.vala"
 			_vala_array_add268 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp46_);
-#line 14942 "Photo.c"
+#line 14943 "Photo.c"
 		}
 #line 1910 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp47_ = alteration_list;
@@ -14956,13 +14957,13 @@ void photo_set_editable_file (Photo* self, GFile* file) {
 		_alteration_unref0 (_tmp49_);
 #line 1895 "/home/jens/Source/shotwell/src/Photo.vala"
 		alteration_list = (_vala_array_free (alteration_list, alteration_list_length1, (GDestroyNotify) g_free), NULL);
-#line 14958 "Photo.c"
+#line 14959 "Photo.c"
 	}
 #line 1868 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (old_file);
 #line 1868 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_free0 (filepath);
-#line 14964 "Photo.c"
+#line 14965 "Photo.c"
 }
 
 
@@ -14983,7 +14984,7 @@ void photo_set_many_editable_file (GeeMap* map, GError** error) {
 	map_iter = _tmp1_;
 #line 1919 "/home/jens/Source/shotwell/src/Photo.vala"
 	while (TRUE) {
-#line 14985 "Photo.c"
+#line 14986 "Photo.c"
 		GeeMapIterator* _tmp2_ = NULL;
 		gboolean _tmp3_ = FALSE;
 		GeeMapIterator* _tmp4_ = NULL;
@@ -15000,7 +15001,7 @@ void photo_set_many_editable_file (GeeMap* map, GError** error) {
 		if (!_tmp3_) {
 #line 1919 "/home/jens/Source/shotwell/src/Photo.vala"
 			break;
-#line 15002 "Photo.c"
+#line 15003 "Photo.c"
 		}
 #line 1920 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp4_ = map_iter;
@@ -15020,7 +15021,7 @@ void photo_set_many_editable_file (GeeMap* map, GError** error) {
 		_g_object_unref0 (_tmp9_);
 #line 1920 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_tmp6_);
-#line 15022 "Photo.c"
+#line 15023 "Photo.c"
 	}
 #line 1922 "/home/jens/Source/shotwell/src/Photo.vala"
 	database_table_commit_transaction (&_inner_error_);
@@ -15034,7 +15035,7 @@ void photo_set_many_editable_file (GeeMap* map, GError** error) {
 			_g_object_unref0 (map_iter);
 #line 1922 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 15036 "Photo.c"
+#line 15037 "Photo.c"
 		} else {
 #line 1922 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (map_iter);
@@ -15044,12 +15045,12 @@ void photo_set_many_editable_file (GeeMap* map, GError** error) {
 			g_clear_error (&_inner_error_);
 #line 1922 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 15046 "Photo.c"
+#line 15047 "Photo.c"
 		}
 	}
 #line 1915 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (map_iter);
-#line 15051 "Photo.c"
+#line 15052 "Photo.c"
 }
 
 
@@ -15075,7 +15076,7 @@ GFile* photo_get_actual_file (Photo* self) {
 	result = _tmp3_;
 #line 1928 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 15077 "Photo.c"
+#line 15078 "Photo.c"
 }
 
 
@@ -15102,7 +15103,7 @@ static GFile* photo_real_get_master_file (MediaSource* base) {
 	result = _tmp3_;
 #line 1932 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 15104 "Photo.c"
+#line 15105 "Photo.c"
 }
 
 
@@ -15122,7 +15123,7 @@ GFile* photo_get_editable_file (Photo* self) {
 	_tmp2_ = reader;
 #line 1938 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp2_ != NULL) {
-#line 15124 "Photo.c"
+#line 15125 "Photo.c"
 		PhotoFileReader* _tmp3_ = NULL;
 		GFile* _tmp4_ = NULL;
 #line 1938 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -15133,13 +15134,13 @@ GFile* photo_get_editable_file (Photo* self) {
 		_g_object_unref0 (_tmp1_);
 #line 1938 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp1_ = _tmp4_;
-#line 15135 "Photo.c"
+#line 15136 "Photo.c"
 	} else {
 #line 1938 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_tmp1_);
 #line 1938 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp1_ = NULL;
-#line 15141 "Photo.c"
+#line 15142 "Photo.c"
 	}
 #line 1938 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp1_;
@@ -15147,7 +15148,7 @@ GFile* photo_get_editable_file (Photo* self) {
 	_photo_file_adapter_unref0 (reader);
 #line 1938 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 15149 "Photo.c"
+#line 15150 "Photo.c"
 }
 
 
@@ -15167,20 +15168,20 @@ GeeCollection* photo_get_raw_developer_files (Photo* self) {
 		result = NULL;
 #line 1943 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 15169 "Photo.c"
+#line 15170 "Photo.c"
 	}
 #line 1945 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = gee_array_list_new (G_TYPE_FILE, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
 #line 1945 "/home/jens/Source/shotwell/src/Photo.vala"
 	ret = _tmp1_;
-#line 15175 "Photo.c"
+#line 15176 "Photo.c"
 	{
 		PhotoRow* _tmp2_ = NULL;
 #line 1946 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp2_ = self->row;
 #line 1946 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 15182 "Photo.c"
+#line 15183 "Photo.c"
 		{
 			{
 				GeeIterator* _row_it = NULL;
@@ -15208,7 +15209,7 @@ GeeCollection* photo_get_raw_developer_files (Photo* self) {
 				_row_it = _tmp8_;
 #line 1947 "/home/jens/Source/shotwell/src/Photo.vala"
 				while (TRUE) {
-#line 15210 "Photo.c"
+#line 15211 "Photo.c"
 					GeeIterator* _tmp9_ = NULL;
 					gboolean _tmp10_ = FALSE;
 					BackingPhotoRow* row = NULL;
@@ -15227,7 +15228,7 @@ GeeCollection* photo_get_raw_developer_files (Photo* self) {
 					if (!_tmp10_) {
 #line 1947 "/home/jens/Source/shotwell/src/Photo.vala"
 						break;
-#line 15229 "Photo.c"
+#line 15230 "Photo.c"
 					}
 #line 1947 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp11_ = _row_it;
@@ -15251,21 +15252,21 @@ GeeCollection* photo_get_raw_developer_files (Photo* self) {
 					_g_object_unref0 (_tmp17_);
 #line 1947 "/home/jens/Source/shotwell/src/Photo.vala"
 					_backing_photo_row_unref0 (row);
-#line 15253 "Photo.c"
+#line 15254 "Photo.c"
 				}
 #line 1947 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (_row_it);
-#line 15257 "Photo.c"
+#line 15258 "Photo.c"
 			}
 		}
-		__finally304:
+		__finally317:
 		{
 			PhotoRow* _tmp18_ = NULL;
 #line 1946 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp18_ = self->row;
 #line 1946 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 15267 "Photo.c"
+#line 15268 "Photo.c"
 		}
 #line 1946 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -15277,14 +15278,14 @@ GeeCollection* photo_get_raw_developer_files (Photo* self) {
 			g_clear_error (&_inner_error_);
 #line 1946 "/home/jens/Source/shotwell/src/Photo.vala"
 			return NULL;
-#line 15279 "Photo.c"
+#line 15280 "Photo.c"
 		}
 	}
 #line 1951 "/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"
 	return result;
-#line 15286 "Photo.c"
+#line 15287 "Photo.c"
 }
 
 
@@ -15310,7 +15311,7 @@ GFile* photo_get_source_file (Photo* self) {
 	result = _tmp3_;
 #line 1955 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 15312 "Photo.c"
+#line 15313 "Photo.c"
 }
 
 
@@ -15319,14 +15320,14 @@ PhotoFileFormat photo_get_file_format (Photo* self) {
 	GError * _inner_error_ = NULL;
 #line 1958 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), 0);
-#line 15321 "Photo.c"
+#line 15322 "Photo.c"
 	{
 		PhotoRow* _tmp0_ = NULL;
 #line 1959 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
 #line 1959 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 15328 "Photo.c"
+#line 15329 "Photo.c"
 		{
 			BackingPhotoRow* _tmp1_ = NULL;
 			PhotoFileFormat _tmp2_ = 0;
@@ -15336,27 +15337,27 @@ PhotoFileFormat photo_get_file_format (Photo* self) {
 			_tmp2_ = _tmp1_->file_format;
 #line 1960 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp2_;
-#line 15338 "Photo.c"
+#line 15339 "Photo.c"
 			{
 				PhotoRow* _tmp3_ = NULL;
 #line 1959 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp3_ = self->row;
 #line 1959 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 15345 "Photo.c"
+#line 15346 "Photo.c"
 			}
 #line 1960 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 15349 "Photo.c"
+#line 15350 "Photo.c"
 		}
-		__finally305:
+		__finally318:
 		{
 			PhotoRow* _tmp4_ = NULL;
 #line 1959 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp4_ = self->row;
 #line 1959 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 15358 "Photo.c"
+#line 15359 "Photo.c"
 		}
 #line 1959 "/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);
@@ -15364,7 +15365,7 @@ PhotoFileFormat photo_get_file_format (Photo* self) {
 		g_clear_error (&_inner_error_);
 #line 1959 "/home/jens/Source/shotwell/src/Photo.vala"
 		return 0;
-#line 15366 "Photo.c"
+#line 15367 "Photo.c"
 	}
 }
 
@@ -15387,19 +15388,19 @@ PhotoFileFormat photo_get_best_export_file_format (Photo* self) {
 	_tmp2_ = photo_file_format_can_write (_tmp1_);
 #line 1966 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (!_tmp2_) {
-#line 15389 "Photo.c"
+#line 15390 "Photo.c"
 		PhotoFileFormat _tmp3_ = 0;
 #line 1967 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp3_ = photo_file_format_get_system_default_format ();
 #line 1967 "/home/jens/Source/shotwell/src/Photo.vala"
 		file_format = _tmp3_;
-#line 15395 "Photo.c"
+#line 15396 "Photo.c"
 	}
 #line 1969 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = file_format;
 #line 1969 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 15401 "Photo.c"
+#line 15402 "Photo.c"
 }
 
 
@@ -15408,14 +15409,14 @@ PhotoFileFormat photo_get_master_file_format (Photo* self) {
 	GError * _inner_error_ = NULL;
 #line 1972 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), 0);
-#line 15410 "Photo.c"
+#line 15411 "Photo.c"
 	{
 		PhotoRow* _tmp0_ = NULL;
 #line 1973 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
 #line 1973 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 15417 "Photo.c"
+#line 15418 "Photo.c"
 		{
 			PhotoBackingReaders* _tmp1_ = NULL;
 			PhotoFileReader* _tmp2_ = NULL;
@@ -15428,27 +15429,27 @@ PhotoFileFormat photo_get_master_file_format (Photo* self) {
 			_tmp3_ = photo_file_adapter_get_file_format (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter));
 #line 1974 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp3_;
-#line 15430 "Photo.c"
+#line 15431 "Photo.c"
 			{
 				PhotoRow* _tmp4_ = NULL;
 #line 1973 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp4_ = self->row;
 #line 1973 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 15437 "Photo.c"
+#line 15438 "Photo.c"
 			}
 #line 1974 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 15441 "Photo.c"
+#line 15442 "Photo.c"
 		}
-		__finally306:
+		__finally319:
 		{
 			PhotoRow* _tmp5_ = NULL;
 #line 1973 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp5_ = self->row;
 #line 1973 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 15450 "Photo.c"
+#line 15451 "Photo.c"
 		}
 #line 1973 "/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);
@@ -15456,7 +15457,7 @@ PhotoFileFormat photo_get_master_file_format (Photo* self) {
 		g_clear_error (&_inner_error_);
 #line 1973 "/home/jens/Source/shotwell/src/Photo.vala"
 		return 0;
-#line 15458 "Photo.c"
+#line 15459 "Photo.c"
 	}
 }
 
@@ -15467,14 +15468,14 @@ static time_t photo_real_get_timestamp (MediaSource* base) {
 	GError * _inner_error_ = NULL;
 #line 1978 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo);
-#line 15469 "Photo.c"
+#line 15470 "Photo.c"
 	{
 		PhotoRow* _tmp0_ = NULL;
 #line 1979 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
 #line 1979 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 15476 "Photo.c"
+#line 15477 "Photo.c"
 		{
 			BackingPhotoRow* _tmp1_ = NULL;
 			time_t _tmp2_ = 0;
@@ -15484,27 +15485,27 @@ static time_t photo_real_get_timestamp (MediaSource* base) {
 			_tmp2_ = _tmp1_->timestamp;
 #line 1980 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp2_;
-#line 15486 "Photo.c"
+#line 15487 "Photo.c"
 			{
 				PhotoRow* _tmp3_ = NULL;
 #line 1979 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp3_ = self->row;
 #line 1979 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 15493 "Photo.c"
+#line 15494 "Photo.c"
 			}
 #line 1980 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 15497 "Photo.c"
+#line 15498 "Photo.c"
 		}
-		__finally307:
+		__finally320:
 		{
 			PhotoRow* _tmp4_ = NULL;
 #line 1979 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp4_ = self->row;
 #line 1979 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 15506 "Photo.c"
+#line 15507 "Photo.c"
 		}
 #line 1979 "/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);
@@ -15512,7 +15513,7 @@ static time_t photo_real_get_timestamp (MediaSource* base) {
 		g_clear_error (&_inner_error_);
 #line 1979 "/home/jens/Source/shotwell/src/Photo.vala"
 		return 0;
-#line 15514 "Photo.c"
+#line 15515 "Photo.c"
 	}
 }
 
@@ -15521,14 +15522,14 @@ void photo_get_photo_id (Photo* self, PhotoID* result) {
 	GError * _inner_error_ = NULL;
 #line 1984 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
-#line 15523 "Photo.c"
+#line 15524 "Photo.c"
 	{
 		PhotoRow* _tmp0_ = NULL;
 #line 1985 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
 #line 1985 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 15530 "Photo.c"
+#line 15531 "Photo.c"
 		{
 			PhotoRow* _tmp1_ = NULL;
 			PhotoID _tmp2_ = {0};
@@ -15538,27 +15539,27 @@ void photo_get_photo_id (Photo* self, PhotoID* result) {
 			_tmp2_ = _tmp1_->photo_id;
 #line 1986 "/home/jens/Source/shotwell/src/Photo.vala"
 			*result = _tmp2_;
-#line 15540 "Photo.c"
+#line 15541 "Photo.c"
 			{
 				PhotoRow* _tmp3_ = NULL;
 #line 1985 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp3_ = self->row;
 #line 1985 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 15547 "Photo.c"
+#line 15548 "Photo.c"
 			}
 #line 1986 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 15551 "Photo.c"
+#line 15552 "Photo.c"
 		}
-		__finally308:
+		__finally321:
 		{
 			PhotoRow* _tmp4_ = NULL;
 #line 1985 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp4_ = self->row;
 #line 1985 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 15560 "Photo.c"
+#line 15561 "Photo.c"
 		}
 #line 1985 "/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);
@@ -15566,7 +15567,7 @@ void photo_get_photo_id (Photo* self, PhotoID* result) {
 		g_clear_error (&_inner_error_);
 #line 1985 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 15568 "Photo.c"
+#line 15569 "Photo.c"
 	}
 }
 
@@ -15585,7 +15586,7 @@ static inline void photo_real_get_event_id (MediaSource* base, EventID* result)
 	*result = _tmp1_;
 #line 1992 "/home/jens/Source/shotwell/src/Photo.vala"
 	return;
-#line 15587 "Photo.c"
+#line 15588 "Photo.c"
 }
 
 
@@ -15606,7 +15607,7 @@ inline gint64 photo_get_raw_event_id (Photo* self) {
 	result = _tmp2_;
 #line 1997 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 15608 "Photo.c"
+#line 15609 "Photo.c"
 }
 
 
@@ -15615,14 +15616,14 @@ static void photo_real_get_import_id (MediaSource* base, ImportID* result) {
 	GError * _inner_error_ = NULL;
 #line 2000 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo);
-#line 15617 "Photo.c"
+#line 15618 "Photo.c"
 	{
 		PhotoRow* _tmp0_ = NULL;
 #line 2001 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
 #line 2001 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 15624 "Photo.c"
+#line 15625 "Photo.c"
 		{
 			PhotoRow* _tmp1_ = NULL;
 			ImportID _tmp2_ = {0};
@@ -15632,27 +15633,27 @@ static void photo_real_get_import_id (MediaSource* base, ImportID* result) {
 			_tmp2_ = _tmp1_->import_id;
 #line 2002 "/home/jens/Source/shotwell/src/Photo.vala"
 			*result = _tmp2_;
-#line 15634 "Photo.c"
+#line 15635 "Photo.c"
 			{
 				PhotoRow* _tmp3_ = NULL;
 #line 2001 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp3_ = self->row;
 #line 2001 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 15641 "Photo.c"
+#line 15642 "Photo.c"
 			}
 #line 2002 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 15645 "Photo.c"
+#line 15646 "Photo.c"
 		}
-		__finally309:
+		__finally322:
 		{
 			PhotoRow* _tmp4_ = NULL;
 #line 2001 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp4_ = self->row;
 #line 2001 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 15654 "Photo.c"
+#line 15655 "Photo.c"
 		}
 #line 2001 "/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);
@@ -15660,7 +15661,7 @@ static void photo_real_get_import_id (MediaSource* base, ImportID* result) {
 		g_clear_error (&_inner_error_);
 #line 2001 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 15662 "Photo.c"
+#line 15663 "Photo.c"
 	}
 }
 
@@ -15669,14 +15670,14 @@ void photo_get_editable_id (Photo* self, BackingPhotoID* result) {
 	GError * _inner_error_ = NULL;
 #line 2006 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
-#line 15671 "Photo.c"
+#line 15672 "Photo.c"
 	{
 		PhotoRow* _tmp0_ = NULL;
 #line 2007 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
 #line 2007 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 15678 "Photo.c"
+#line 15679 "Photo.c"
 		{
 			PhotoRow* _tmp1_ = NULL;
 			BackingPhotoID _tmp2_ = {0};
@@ -15686,27 +15687,27 @@ void photo_get_editable_id (Photo* self, BackingPhotoID* result) {
 			_tmp2_ = _tmp1_->editable_id;
 #line 2008 "/home/jens/Source/shotwell/src/Photo.vala"
 			*result = _tmp2_;
-#line 15688 "Photo.c"
+#line 15689 "Photo.c"
 			{
 				PhotoRow* _tmp3_ = NULL;
 #line 2007 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp3_ = self->row;
 #line 2007 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 15695 "Photo.c"
+#line 15696 "Photo.c"
 			}
 #line 2008 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 15699 "Photo.c"
+#line 15700 "Photo.c"
 		}
-		__finally310:
+		__finally323:
 		{
 			PhotoRow* _tmp4_ = NULL;
 #line 2007 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp4_ = self->row;
 #line 2007 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 15708 "Photo.c"
+#line 15709 "Photo.c"
 		}
 #line 2007 "/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);
@@ -15714,7 +15715,7 @@ void photo_get_editable_id (Photo* self, BackingPhotoID* result) {
 		g_clear_error (&_inner_error_);
 #line 2007 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 15716 "Photo.c"
+#line 15717 "Photo.c"
 	}
 }
 
@@ -15725,14 +15726,14 @@ static gchar* photo_real_get_master_md5 (MediaSource* base) {
 	GError * _inner_error_ = NULL;
 #line 2012 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo);
-#line 15727 "Photo.c"
+#line 15728 "Photo.c"
 	{
 		PhotoRow* _tmp0_ = NULL;
 #line 2013 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
 #line 2013 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 15734 "Photo.c"
+#line 15735 "Photo.c"
 		{
 			PhotoRow* _tmp1_ = NULL;
 			const gchar* _tmp2_ = NULL;
@@ -15745,27 +15746,27 @@ static gchar* photo_real_get_master_md5 (MediaSource* base) {
 			_tmp3_ = g_strdup (_tmp2_);
 #line 2014 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp3_;
-#line 15747 "Photo.c"
+#line 15748 "Photo.c"
 			{
 				PhotoRow* _tmp4_ = NULL;
 #line 2013 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp4_ = self->row;
 #line 2013 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 15754 "Photo.c"
+#line 15755 "Photo.c"
 			}
 #line 2014 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 15758 "Photo.c"
+#line 15759 "Photo.c"
 		}
-		__finally311:
+		__finally324:
 		{
 			PhotoRow* _tmp5_ = NULL;
 #line 2013 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp5_ = self->row;
 #line 2013 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 15767 "Photo.c"
+#line 15768 "Photo.c"
 		}
 #line 2013 "/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);
@@ -15773,7 +15774,7 @@ static gchar* photo_real_get_master_md5 (MediaSource* base) {
 		g_clear_error (&_inner_error_);
 #line 2013 "/home/jens/Source/shotwell/src/Photo.vala"
 		return NULL;
-#line 15775 "Photo.c"
+#line 15776 "Photo.c"
 	}
 }
 
@@ -15783,14 +15784,14 @@ guint64 photo_get_flags (Photo* self) {
 	GError * _inner_error_ = NULL;
 #line 2020 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), 0ULL);
-#line 15785 "Photo.c"
+#line 15786 "Photo.c"
 	{
 		PhotoRow* _tmp0_ = NULL;
 #line 2021 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
 #line 2021 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 15792 "Photo.c"
+#line 15793 "Photo.c"
 		{
 			PhotoRow* _tmp1_ = NULL;
 			guint64 _tmp2_ = 0ULL;
@@ -15800,27 +15801,27 @@ guint64 photo_get_flags (Photo* self) {
 			_tmp2_ = _tmp1_->flags;
 #line 2022 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp2_;
-#line 15802 "Photo.c"
+#line 15803 "Photo.c"
 			{
 				PhotoRow* _tmp3_ = NULL;
 #line 2021 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp3_ = self->row;
 #line 2021 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 15809 "Photo.c"
+#line 15810 "Photo.c"
 			}
 #line 2022 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 15813 "Photo.c"
+#line 15814 "Photo.c"
 		}
-		__finally312:
+		__finally325:
 		{
 			PhotoRow* _tmp4_ = NULL;
 #line 2021 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp4_ = self->row;
 #line 2021 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 15822 "Photo.c"
+#line 15823 "Photo.c"
 		}
 #line 2021 "/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);
@@ -15828,7 +15829,7 @@ guint64 photo_get_flags (Photo* self) {
 		g_clear_error (&_inner_error_);
 #line 2021 "/home/jens/Source/shotwell/src/Photo.vala"
 		return 0ULL;
-#line 15830 "Photo.c"
+#line 15831 "Photo.c"
 	}
 }
 
@@ -15850,7 +15851,7 @@ static void photo_notify_flags_altered (Photo* self, Alteration* additional_alte
 	_tmp1_ = additional_alteration;
 #line 2028 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp1_ != NULL) {
-#line 15852 "Photo.c"
+#line 15853 "Photo.c"
 		Alteration* _tmp2_ = NULL;
 		Alteration* _tmp3_ = NULL;
 		Alteration* _tmp4_ = NULL;
@@ -15864,7 +15865,7 @@ static void photo_notify_flags_altered (Photo* self, Alteration* additional_alte
 		_alteration_unref0 (alteration);
 #line 2029 "/home/jens/Source/shotwell/src/Photo.vala"
 		alteration = _tmp4_;
-#line 15866 "Photo.c"
+#line 15867 "Photo.c"
 	}
 #line 2031 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp5_ = alteration;
@@ -15872,7 +15873,7 @@ static void photo_notify_flags_altered (Photo* self, Alteration* additional_alte
 	data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp5_);
 #line 2026 "/home/jens/Source/shotwell/src/Photo.vala"
 	_alteration_unref0 (alteration);
-#line 15874 "Photo.c"
+#line 15875 "Photo.c"
 }
 
 
@@ -15886,14 +15887,14 @@ guint64 photo_replace_flags (Photo* self, guint64 flags, Alteration* additional_
 	g_return_val_if_fail (IS_PHOTO (self), 0ULL);
 #line 2034 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail ((additional_alteration == NULL) || IS_ALTERATION (additional_alteration), 0ULL);
-#line 15888 "Photo.c"
+#line 15889 "Photo.c"
 	{
 		PhotoRow* _tmp0_ = NULL;
 #line 2036 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
 #line 2036 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 15895 "Photo.c"
+#line 15896 "Photo.c"
 		{
 			PhotoTable* _tmp1_ = NULL;
 			PhotoTable* _tmp2_ = NULL;
@@ -15919,7 +15920,7 @@ guint64 photo_replace_flags (Photo* self, guint64 flags, Alteration* additional_
 			_tmp6_ = committed;
 #line 2038 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp6_) {
-#line 15921 "Photo.c"
+#line 15922 "Photo.c"
 				PhotoRow* _tmp7_ = NULL;
 				guint64 _tmp8_ = 0ULL;
 #line 2039 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -15928,17 +15929,17 @@ guint64 photo_replace_flags (Photo* self, guint64 flags, Alteration* additional_
 				_tmp8_ = flags;
 #line 2039 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp7_->flags = _tmp8_;
-#line 15930 "Photo.c"
+#line 15931 "Photo.c"
 			}
 		}
-		__finally313:
+		__finally326:
 		{
 			PhotoRow* _tmp9_ = NULL;
 #line 2036 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp9_ = self->row;
 #line 2036 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 15940 "Photo.c"
+#line 15941 "Photo.c"
 		}
 #line 2036 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -15948,20 +15949,20 @@ guint64 photo_replace_flags (Photo* self, guint64 flags, Alteration* additional_
 			g_clear_error (&_inner_error_);
 #line 2036 "/home/jens/Source/shotwell/src/Photo.vala"
 			return 0ULL;
-#line 15950 "Photo.c"
+#line 15951 "Photo.c"
 		}
 	}
 #line 2042 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp10_ = committed;
 #line 2042 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp10_) {
-#line 15957 "Photo.c"
+#line 15958 "Photo.c"
 		Alteration* _tmp11_ = NULL;
 #line 2043 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp11_ = additional_alteration;
 #line 2043 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_notify_flags_altered (self, _tmp11_);
-#line 15963 "Photo.c"
+#line 15964 "Photo.c"
 	}
 #line 2045 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp12_ = flags;
@@ -15969,7 +15970,7 @@ guint64 photo_replace_flags (Photo* self, guint64 flags, Alteration* additional_
 	result = _tmp12_;
 #line 2045 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 15971 "Photo.c"
+#line 15972 "Photo.c"
 }
 
 
@@ -15978,14 +15979,14 @@ gboolean photo_is_flag_set (Photo* self, guint64 mask) {
 	GError * _inner_error_ = NULL;
 #line 2048 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), FALSE);
-#line 15980 "Photo.c"
+#line 15981 "Photo.c"
 	{
 		PhotoRow* _tmp0_ = NULL;
 #line 2049 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
 #line 2049 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 15987 "Photo.c"
+#line 15988 "Photo.c"
 		{
 			PhotoRow* _tmp1_ = NULL;
 			guint64 _tmp2_ = 0ULL;
@@ -16001,27 +16002,27 @@ gboolean photo_is_flag_set (Photo* self, guint64 mask) {
 			_tmp4_ = media_source_internal_is_flag_set (_tmp2_, _tmp3_);
 #line 2050 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp4_;
-#line 16003 "Photo.c"
+#line 16004 "Photo.c"
 			{
 				PhotoRow* _tmp5_ = NULL;
 #line 2049 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp5_ = self->row;
 #line 2049 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 16010 "Photo.c"
+#line 16011 "Photo.c"
 			}
 #line 2050 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 16014 "Photo.c"
+#line 16015 "Photo.c"
 		}
-		__finally314:
+		__finally327:
 		{
 			PhotoRow* _tmp6_ = NULL;
 #line 2049 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp6_ = self->row;
 #line 2049 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 16023 "Photo.c"
+#line 16024 "Photo.c"
 		}
 #line 2049 "/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);
@@ -16029,7 +16030,7 @@ gboolean photo_is_flag_set (Photo* self, guint64 mask) {
 		g_clear_error (&_inner_error_);
 #line 2049 "/home/jens/Source/shotwell/src/Photo.vala"
 		return FALSE;
-#line 16031 "Photo.c"
+#line 16032 "Photo.c"
 	}
 }
 
@@ -16048,14 +16049,14 @@ guint64 photo_add_flags (Photo* self, guint64 mask, Alteration* additional_alter
 	flags = (guint64) 0;
 #line 2057 "/home/jens/Source/shotwell/src/Photo.vala"
 	committed = FALSE;
-#line 16050 "Photo.c"
+#line 16051 "Photo.c"
 	{
 		PhotoRow* _tmp0_ = NULL;
 #line 2058 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
 #line 2058 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 16057 "Photo.c"
+#line 16058 "Photo.c"
 		{
 			PhotoRow* _tmp1_ = NULL;
 			guint64 _tmp2_ = 0ULL;
@@ -16082,7 +16083,7 @@ guint64 photo_add_flags (Photo* self, guint64 mask, Alteration* additional_alter
 			_tmp7_ = flags;
 #line 2060 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp6_ != _tmp7_) {
-#line 16084 "Photo.c"
+#line 16085 "Photo.c"
 				PhotoTable* _tmp8_ = NULL;
 				PhotoTable* _tmp9_ = NULL;
 				PhotoID _tmp10_ = {0};
@@ -16107,7 +16108,7 @@ guint64 photo_add_flags (Photo* self, guint64 mask, Alteration* additional_alter
 				_tmp13_ = committed;
 #line 2062 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp13_) {
-#line 16109 "Photo.c"
+#line 16110 "Photo.c"
 					PhotoRow* _tmp14_ = NULL;
 					guint64 _tmp15_ = 0ULL;
 #line 2063 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -16116,18 +16117,18 @@ guint64 photo_add_flags (Photo* self, guint64 mask, Alteration* additional_alter
 					_tmp15_ = flags;
 #line 2063 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp14_->flags = _tmp15_;
-#line 16118 "Photo.c"
+#line 16119 "Photo.c"
 				}
 			}
 		}
-		__finally315:
+		__finally328:
 		{
 			PhotoRow* _tmp16_ = NULL;
 #line 2058 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp16_ = self->row;
 #line 2058 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 16129 "Photo.c"
+#line 16130 "Photo.c"
 		}
 #line 2058 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -16137,26 +16138,26 @@ guint64 photo_add_flags (Photo* self, guint64 mask, Alteration* additional_alter
 			g_clear_error (&_inner_error_);
 #line 2058 "/home/jens/Source/shotwell/src/Photo.vala"
 			return 0ULL;
-#line 16139 "Photo.c"
+#line 16140 "Photo.c"
 		}
 	}
 #line 2067 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp17_ = committed;
 #line 2067 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp17_) {
-#line 16146 "Photo.c"
+#line 16147 "Photo.c"
 		Alteration* _tmp18_ = NULL;
 #line 2068 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp18_ = additional_alteration;
 #line 2068 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_notify_flags_altered (self, _tmp18_);
-#line 16152 "Photo.c"
+#line 16153 "Photo.c"
 	}
 #line 2070 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = flags;
 #line 2070 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 16158 "Photo.c"
+#line 16159 "Photo.c"
 }
 
 
@@ -16174,14 +16175,14 @@ guint64 photo_remove_flags (Photo* self, guint64 mask, Alteration* additional_al
 	flags = (guint64) 0;
 #line 2076 "/home/jens/Source/shotwell/src/Photo.vala"
 	committed = FALSE;
-#line 16176 "Photo.c"
+#line 16177 "Photo.c"
 	{
 		PhotoRow* _tmp0_ = NULL;
 #line 2077 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
 #line 2077 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 16183 "Photo.c"
+#line 16184 "Photo.c"
 		{
 			PhotoRow* _tmp1_ = NULL;
 			guint64 _tmp2_ = 0ULL;
@@ -16208,7 +16209,7 @@ guint64 photo_remove_flags (Photo* self, guint64 mask, Alteration* additional_al
 			_tmp7_ = flags;
 #line 2079 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp6_ != _tmp7_) {
-#line 16210 "Photo.c"
+#line 16211 "Photo.c"
 				PhotoTable* _tmp8_ = NULL;
 				PhotoTable* _tmp9_ = NULL;
 				PhotoID _tmp10_ = {0};
@@ -16233,7 +16234,7 @@ guint64 photo_remove_flags (Photo* self, guint64 mask, Alteration* additional_al
 				_tmp13_ = committed;
 #line 2081 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp13_) {
-#line 16235 "Photo.c"
+#line 16236 "Photo.c"
 					PhotoRow* _tmp14_ = NULL;
 					guint64 _tmp15_ = 0ULL;
 #line 2082 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -16242,18 +16243,18 @@ guint64 photo_remove_flags (Photo* self, guint64 mask, Alteration* additional_al
 					_tmp15_ = flags;
 #line 2082 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp14_->flags = _tmp15_;
-#line 16244 "Photo.c"
+#line 16245 "Photo.c"
 				}
 			}
 		}
-		__finally316:
+		__finally329:
 		{
 			PhotoRow* _tmp16_ = NULL;
 #line 2077 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp16_ = self->row;
 #line 2077 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 16255 "Photo.c"
+#line 16256 "Photo.c"
 		}
 #line 2077 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -16263,26 +16264,26 @@ guint64 photo_remove_flags (Photo* self, guint64 mask, Alteration* additional_al
 			g_clear_error (&_inner_error_);
 #line 2077 "/home/jens/Source/shotwell/src/Photo.vala"
 			return 0ULL;
-#line 16265 "Photo.c"
+#line 16266 "Photo.c"
 		}
 	}
 #line 2086 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp17_ = committed;
 #line 2086 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp17_) {
-#line 16272 "Photo.c"
+#line 16273 "Photo.c"
 		Alteration* _tmp18_ = NULL;
 #line 2087 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp18_ = additional_alteration;
 #line 2087 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_notify_flags_altered (self, _tmp18_);
-#line 16278 "Photo.c"
+#line 16279 "Photo.c"
 	}
 #line 2089 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = flags;
 #line 2089 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 16284 "Photo.c"
+#line 16285 "Photo.c"
 }
 
 
@@ -16300,14 +16301,14 @@ guint64 photo_add_remove_flags (Photo* self, guint64 add, guint64 remove, Altera
 	flags = (guint64) 0;
 #line 2095 "/home/jens/Source/shotwell/src/Photo.vala"
 	committed = FALSE;
-#line 16302 "Photo.c"
+#line 16303 "Photo.c"
 	{
 		PhotoRow* _tmp0_ = NULL;
 #line 2096 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
 #line 2096 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 16309 "Photo.c"
+#line 16310 "Photo.c"
 		{
 			PhotoRow* _tmp1_ = NULL;
 			guint64 _tmp2_ = 0ULL;
@@ -16334,7 +16335,7 @@ guint64 photo_add_remove_flags (Photo* self, guint64 add, guint64 remove, Altera
 			_tmp7_ = flags;
 #line 2098 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp6_ != _tmp7_) {
-#line 16336 "Photo.c"
+#line 16337 "Photo.c"
 				PhotoTable* _tmp8_ = NULL;
 				PhotoTable* _tmp9_ = NULL;
 				PhotoID _tmp10_ = {0};
@@ -16359,7 +16360,7 @@ guint64 photo_add_remove_flags (Photo* self, guint64 add, guint64 remove, Altera
 				_tmp13_ = committed;
 #line 2100 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp13_) {
-#line 16361 "Photo.c"
+#line 16362 "Photo.c"
 					PhotoRow* _tmp14_ = NULL;
 					guint64 _tmp15_ = 0ULL;
 #line 2101 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -16368,18 +16369,18 @@ guint64 photo_add_remove_flags (Photo* self, guint64 add, guint64 remove, Altera
 					_tmp15_ = flags;
 #line 2101 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp14_->flags = _tmp15_;
-#line 16370 "Photo.c"
+#line 16371 "Photo.c"
 				}
 			}
 		}
-		__finally317:
+		__finally330:
 		{
 			PhotoRow* _tmp16_ = NULL;
 #line 2096 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp16_ = self->row;
 #line 2096 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 16381 "Photo.c"
+#line 16382 "Photo.c"
 		}
 #line 2096 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -16389,26 +16390,26 @@ guint64 photo_add_remove_flags (Photo* self, guint64 add, guint64 remove, Altera
 			g_clear_error (&_inner_error_);
 #line 2096 "/home/jens/Source/shotwell/src/Photo.vala"
 			return 0ULL;
-#line 16391 "Photo.c"
+#line 16392 "Photo.c"
 		}
 	}
 #line 2105 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp17_ = committed;
 #line 2105 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp17_) {
-#line 16398 "Photo.c"
+#line 16399 "Photo.c"
 		Alteration* _tmp18_ = NULL;
 #line 2106 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp18_ = additional_alteration;
 #line 2106 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_notify_flags_altered (self, _tmp18_);
-#line 16404 "Photo.c"
+#line 16405 "Photo.c"
 	}
 #line 2108 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = flags;
 #line 2108 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 16410 "Photo.c"
+#line 16411 "Photo.c"
 }
 
 
@@ -16430,7 +16431,7 @@ void photo_add_remove_many_flags (GeeCollection* add, guint64 add_mask, Alterati
 	_tmp0_ = add;
 #line 2116 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp0_ != NULL) {
-#line 16432 "Photo.c"
+#line 16433 "Photo.c"
 		{
 			GeeIterator* _photo_it = NULL;
 			GeeCollection* _tmp1_ = NULL;
@@ -16443,7 +16444,7 @@ void photo_add_remove_many_flags (GeeCollection* add, guint64 add_mask, Alterati
 			_photo_it = _tmp2_;
 #line 2117 "/home/jens/Source/shotwell/src/Photo.vala"
 			while (TRUE) {
-#line 16445 "Photo.c"
+#line 16446 "Photo.c"
 				GeeIterator* _tmp3_ = NULL;
 				gboolean _tmp4_ = FALSE;
 				Photo* photo = NULL;
@@ -16460,7 +16461,7 @@ void photo_add_remove_many_flags (GeeCollection* add, guint64 add_mask, Alterati
 				if (!_tmp4_) {
 #line 2117 "/home/jens/Source/shotwell/src/Photo.vala"
 					break;
-#line 16462 "Photo.c"
+#line 16463 "Photo.c"
 				}
 #line 2117 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp5_ = _photo_it;
@@ -16478,18 +16479,18 @@ void photo_add_remove_many_flags (GeeCollection* add, guint64 add_mask, Alterati
 				photo_add_flags (_tmp7_, _tmp8_, _tmp9_);
 #line 2117 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (photo);
-#line 16480 "Photo.c"
+#line 16481 "Photo.c"
 			}
 #line 2117 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (_photo_it);
-#line 16484 "Photo.c"
+#line 16485 "Photo.c"
 		}
 	}
 #line 2121 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp10_ = remove;
 #line 2121 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp10_ != NULL) {
-#line 16491 "Photo.c"
+#line 16492 "Photo.c"
 		{
 			GeeIterator* _photo_it = NULL;
 			GeeCollection* _tmp11_ = NULL;
@@ -16502,7 +16503,7 @@ void photo_add_remove_many_flags (GeeCollection* add, guint64 add_mask, Alterati
 			_photo_it = _tmp12_;
 #line 2122 "/home/jens/Source/shotwell/src/Photo.vala"
 			while (TRUE) {
-#line 16504 "Photo.c"
+#line 16505 "Photo.c"
 				GeeIterator* _tmp13_ = NULL;
 				gboolean _tmp14_ = FALSE;
 				Photo* photo = NULL;
@@ -16519,7 +16520,7 @@ void photo_add_remove_many_flags (GeeCollection* add, guint64 add_mask, Alterati
 				if (!_tmp14_) {
 #line 2122 "/home/jens/Source/shotwell/src/Photo.vala"
 					break;
-#line 16521 "Photo.c"
+#line 16522 "Photo.c"
 				}
 #line 2122 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp15_ = _photo_it;
@@ -16537,11 +16538,11 @@ void photo_add_remove_many_flags (GeeCollection* add, guint64 add_mask, Alterati
 				photo_remove_flags (_tmp17_, _tmp18_, _tmp19_);
 #line 2122 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (photo);
-#line 16539 "Photo.c"
+#line 16540 "Photo.c"
 			}
 #line 2122 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (_photo_it);
-#line 16543 "Photo.c"
+#line 16544 "Photo.c"
 		}
 	}
 #line 2126 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -16554,7 +16555,7 @@ void photo_add_remove_many_flags (GeeCollection* add, guint64 add_mask, Alterati
 			g_propagate_error (error, _inner_error_);
 #line 2126 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 16556 "Photo.c"
+#line 16557 "Photo.c"
 		} else {
 #line 2126 "/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);
@@ -16562,7 +16563,7 @@ void photo_add_remove_many_flags (GeeCollection* add, guint64 add_mask, Alterati
 			g_clear_error (&_inner_error_);
 #line 2126 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 16564 "Photo.c"
+#line 16565 "Photo.c"
 		}
 	}
 }
@@ -16582,14 +16583,14 @@ guint64 photo_toggle_flags (Photo* self, guint64 mask, Alteration* additional_al
 	flags = (guint64) 0;
 #line 2132 "/home/jens/Source/shotwell/src/Photo.vala"
 	committed = FALSE;
-#line 16584 "Photo.c"
+#line 16585 "Photo.c"
 	{
 		PhotoRow* _tmp0_ = NULL;
 #line 2133 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
 #line 2133 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 16591 "Photo.c"
+#line 16592 "Photo.c"
 		{
 			PhotoRow* _tmp1_ = NULL;
 			guint64 _tmp2_ = 0ULL;
@@ -16613,7 +16614,7 @@ guint64 photo_toggle_flags (Photo* self, guint64 mask, Alteration* additional_al
 			_tmp6_ = flags;
 #line 2135 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp5_ != _tmp6_) {
-#line 16615 "Photo.c"
+#line 16616 "Photo.c"
 				PhotoTable* _tmp7_ = NULL;
 				PhotoTable* _tmp8_ = NULL;
 				PhotoID _tmp9_ = {0};
@@ -16638,7 +16639,7 @@ guint64 photo_toggle_flags (Photo* self, guint64 mask, Alteration* additional_al
 				_tmp12_ = committed;
 #line 2137 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp12_) {
-#line 16640 "Photo.c"
+#line 16641 "Photo.c"
 					PhotoRow* _tmp13_ = NULL;
 					guint64 _tmp14_ = 0ULL;
 #line 2138 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -16647,18 +16648,18 @@ guint64 photo_toggle_flags (Photo* self, guint64 mask, Alteration* additional_al
 					_tmp14_ = flags;
 #line 2138 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp13_->flags = _tmp14_;
-#line 16649 "Photo.c"
+#line 16650 "Photo.c"
 				}
 			}
 		}
-		__finally318:
+		__finally331:
 		{
 			PhotoRow* _tmp15_ = NULL;
 #line 2133 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp15_ = self->row;
 #line 2133 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 16660 "Photo.c"
+#line 16661 "Photo.c"
 		}
 #line 2133 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -16668,26 +16669,26 @@ guint64 photo_toggle_flags (Photo* self, guint64 mask, Alteration* additional_al
 			g_clear_error (&_inner_error_);
 #line 2133 "/home/jens/Source/shotwell/src/Photo.vala"
 			return 0ULL;
-#line 16670 "Photo.c"
+#line 16671 "Photo.c"
 		}
 	}
 #line 2142 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp16_ = committed;
 #line 2142 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp16_) {
-#line 16677 "Photo.c"
+#line 16678 "Photo.c"
 		Alteration* _tmp17_ = NULL;
 #line 2143 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp17_ = additional_alteration;
 #line 2143 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_notify_flags_altered (self, _tmp17_);
-#line 16683 "Photo.c"
+#line 16684 "Photo.c"
 	}
 #line 2145 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = flags;
 #line 2145 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 16689 "Photo.c"
+#line 16690 "Photo.c"
 }
 
 
@@ -16696,14 +16697,14 @@ gboolean photo_is_master_metadata_dirty (Photo* self) {
 	GError * _inner_error_ = NULL;
 #line 2148 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), FALSE);
-#line 16698 "Photo.c"
+#line 16699 "Photo.c"
 	{
 		PhotoRow* _tmp0_ = NULL;
 #line 2149 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
 #line 2149 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 16705 "Photo.c"
+#line 16706 "Photo.c"
 		{
 			PhotoRow* _tmp1_ = NULL;
 			gboolean _tmp2_ = FALSE;
@@ -16713,27 +16714,27 @@ gboolean photo_is_master_metadata_dirty (Photo* self) {
 			_tmp2_ = _tmp1_->metadata_dirty;
 #line 2150 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp2_;
-#line 16715 "Photo.c"
+#line 16716 "Photo.c"
 			{
 				PhotoRow* _tmp3_ = NULL;
 #line 2149 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp3_ = self->row;
 #line 2149 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 16722 "Photo.c"
+#line 16723 "Photo.c"
 			}
 #line 2150 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 16726 "Photo.c"
+#line 16727 "Photo.c"
 		}
-		__finally319:
+		__finally332:
 		{
 			PhotoRow* _tmp4_ = NULL;
 #line 2149 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp4_ = self->row;
 #line 2149 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 16735 "Photo.c"
+#line 16736 "Photo.c"
 		}
 #line 2149 "/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);
@@ -16741,7 +16742,7 @@ gboolean photo_is_master_metadata_dirty (Photo* self) {
 		g_clear_error (&_inner_error_);
 #line 2149 "/home/jens/Source/shotwell/src/Photo.vala"
 		return FALSE;
-#line 16743 "Photo.c"
+#line 16744 "Photo.c"
 	}
 }
 
@@ -16754,14 +16755,14 @@ void photo_set_master_metadata_dirty (Photo* self, gboolean dirty, GError** erro
 	g_return_if_fail (IS_PHOTO (self));
 #line 2155 "/home/jens/Source/shotwell/src/Photo.vala"
 	committed = FALSE;
-#line 16756 "Photo.c"
+#line 16757 "Photo.c"
 	{
 		PhotoRow* _tmp0_ = NULL;
 #line 2156 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
 #line 2156 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 16763 "Photo.c"
+#line 16764 "Photo.c"
 		{
 			PhotoRow* _tmp1_ = NULL;
 			gboolean _tmp2_ = FALSE;
@@ -16774,7 +16775,7 @@ void photo_set_master_metadata_dirty (Photo* self, gboolean dirty, GError** erro
 			_tmp3_ = dirty;
 #line 2157 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp2_ != _tmp3_) {
-#line 16776 "Photo.c"
+#line 16777 "Photo.c"
 				PhotoTable* _tmp4_ = NULL;
 				PhotoTable* _tmp5_ = NULL;
 				PhotoID _tmp6_ = {0};
@@ -16795,8 +16796,8 @@ void photo_set_master_metadata_dirty (Photo* self, gboolean dirty, GError** erro
 				_database_table_unref0 (_tmp5_);
 #line 2158 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 16797 "Photo.c"
-					goto __finally320;
+#line 16798 "Photo.c"
+					goto __finally333;
 				}
 #line 2159 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp8_ = self->row;
@@ -16806,17 +16807,17 @@ void photo_set_master_metadata_dirty (Photo* self, gboolean dirty, GError** erro
 				_tmp8_->metadata_dirty = _tmp9_;
 #line 2160 "/home/jens/Source/shotwell/src/Photo.vala"
 				committed = TRUE;
-#line 16808 "Photo.c"
+#line 16809 "Photo.c"
 			}
 		}
-		__finally320:
+		__finally333:
 		{
 			PhotoRow* _tmp10_ = NULL;
 #line 2156 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp10_ = self->row;
 #line 2156 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 16818 "Photo.c"
+#line 16819 "Photo.c"
 		}
 #line 2156 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -16826,7 +16827,7 @@ void photo_set_master_metadata_dirty (Photo* self, gboolean dirty, GError** erro
 				g_propagate_error (error, _inner_error_);
 #line 2156 "/home/jens/Source/shotwell/src/Photo.vala"
 				return;
-#line 16828 "Photo.c"
+#line 16829 "Photo.c"
 			} else {
 #line 2156 "/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);
@@ -16834,7 +16835,7 @@ void photo_set_master_metadata_dirty (Photo* self, gboolean dirty, GError** erro
 				g_clear_error (&_inner_error_);
 #line 2156 "/home/jens/Source/shotwell/src/Photo.vala"
 				return;
-#line 16836 "Photo.c"
+#line 16837 "Photo.c"
 			}
 		}
 	}
@@ -16842,7 +16843,7 @@ void photo_set_master_metadata_dirty (Photo* self, gboolean dirty, GError** erro
 	_tmp11_ = committed;
 #line 2164 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp11_) {
-#line 16844 "Photo.c"
+#line 16845 "Photo.c"
 		Alteration* _tmp12_ = NULL;
 		Alteration* _tmp13_ = NULL;
 #line 2165 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -16853,7 +16854,7 @@ void photo_set_master_metadata_dirty (Photo* self, gboolean dirty, GError** erro
 		data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp13_);
 #line 2165 "/home/jens/Source/shotwell/src/Photo.vala"
 		_alteration_unref0 (_tmp13_);
-#line 16855 "Photo.c"
+#line 16856 "Photo.c"
 	}
 }
 
@@ -16864,14 +16865,14 @@ static Rating photo_real_get_rating (MediaSource* base) {
 	GError * _inner_error_ = NULL;
 #line 2168 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo);
-#line 16866 "Photo.c"
+#line 16867 "Photo.c"
 	{
 		PhotoRow* _tmp0_ = NULL;
 #line 2169 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
 #line 2169 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 16873 "Photo.c"
+#line 16874 "Photo.c"
 		{
 			PhotoRow* _tmp1_ = NULL;
 			Rating _tmp2_ = 0;
@@ -16881,27 +16882,27 @@ static Rating photo_real_get_rating (MediaSource* base) {
 			_tmp2_ = _tmp1_->rating;
 #line 2170 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp2_;
-#line 16883 "Photo.c"
+#line 16884 "Photo.c"
 			{
 				PhotoRow* _tmp3_ = NULL;
 #line 2169 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp3_ = self->row;
 #line 2169 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 16890 "Photo.c"
+#line 16891 "Photo.c"
 			}
 #line 2170 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 16894 "Photo.c"
+#line 16895 "Photo.c"
 		}
-		__finally321:
+		__finally334:
 		{
 			PhotoRow* _tmp4_ = NULL;
 #line 2169 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp4_ = self->row;
 #line 2169 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 16903 "Photo.c"
+#line 16904 "Photo.c"
 		}
 #line 2169 "/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);
@@ -16909,7 +16910,7 @@ static Rating photo_real_get_rating (MediaSource* base) {
 		g_clear_error (&_inner_error_);
 #line 2169 "/home/jens/Source/shotwell/src/Photo.vala"
 		return 0;
-#line 16911 "Photo.c"
+#line 16912 "Photo.c"
 	}
 }
 
@@ -16923,14 +16924,14 @@ static void photo_real_set_rating (MediaSource* base, Rating rating) {
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo);
 #line 2175 "/home/jens/Source/shotwell/src/Photo.vala"
 	committed = FALSE;
-#line 16925 "Photo.c"
+#line 16926 "Photo.c"
 	{
 		PhotoRow* _tmp0_ = NULL;
 #line 2177 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
 #line 2177 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 16932 "Photo.c"
+#line 16933 "Photo.c"
 		{
 			gboolean _tmp1_ = FALSE;
 			Rating _tmp2_ = 0;
@@ -16944,7 +16945,7 @@ static void photo_real_set_rating (MediaSource* base, Rating rating) {
 			_tmp4_ = _tmp3_->rating;
 #line 2178 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp2_ != _tmp4_) {
-#line 16946 "Photo.c"
+#line 16947 "Photo.c"
 				Rating _tmp5_ = 0;
 				gboolean _tmp6_ = FALSE;
 #line 2178 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -16953,15 +16954,15 @@ static void photo_real_set_rating (MediaSource* base, Rating rating) {
 				_tmp6_ = rating_is_valid (_tmp5_);
 #line 2178 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp1_ = _tmp6_;
-#line 16955 "Photo.c"
+#line 16956 "Photo.c"
 			} else {
 #line 2178 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp1_ = FALSE;
-#line 16959 "Photo.c"
+#line 16960 "Photo.c"
 			}
 #line 2178 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp1_) {
-#line 16963 "Photo.c"
+#line 16964 "Photo.c"
 				PhotoTable* _tmp7_ = NULL;
 				PhotoTable* _tmp8_ = NULL;
 				PhotoID _tmp9_ = {0};
@@ -16986,7 +16987,7 @@ static void photo_real_set_rating (MediaSource* base, Rating rating) {
 				_tmp12_ = committed;
 #line 2180 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp12_) {
-#line 16988 "Photo.c"
+#line 16989 "Photo.c"
 					PhotoRow* _tmp13_ = NULL;
 					Rating _tmp14_ = 0;
 #line 2181 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -16995,18 +16996,18 @@ static void photo_real_set_rating (MediaSource* base, Rating rating) {
 					_tmp14_ = rating;
 #line 2181 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp13_->rating = _tmp14_;
-#line 16997 "Photo.c"
+#line 16998 "Photo.c"
 				}
 			}
 		}
-		__finally322:
+		__finally335:
 		{
 			PhotoRow* _tmp15_ = NULL;
 #line 2177 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp15_ = self->row;
 #line 2177 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 17008 "Photo.c"
+#line 17009 "Photo.c"
 		}
 #line 2177 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -17016,14 +17017,14 @@ static void photo_real_set_rating (MediaSource* base, Rating rating) {
 			g_clear_error (&_inner_error_);
 #line 2177 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 17018 "Photo.c"
+#line 17019 "Photo.c"
 		}
 	}
 #line 2185 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp16_ = committed;
 #line 2185 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp16_) {
-#line 17025 "Photo.c"
+#line 17026 "Photo.c"
 		Alteration* _tmp17_ = NULL;
 		Alteration* _tmp18_ = NULL;
 #line 2186 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -17034,7 +17035,7 @@ static void photo_real_set_rating (MediaSource* base, Rating rating) {
 		data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp18_);
 #line 2186 "/home/jens/Source/shotwell/src/Photo.vala"
 		_alteration_unref0 (_tmp18_);
-#line 17036 "Photo.c"
+#line 17037 "Photo.c"
 	}
 }
 
@@ -17044,14 +17045,14 @@ static void photo_real_increase_rating (MediaSource* base) {
 	GError * _inner_error_ = NULL;
 #line 2189 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo);
-#line 17046 "Photo.c"
+#line 17047 "Photo.c"
 	{
 		PhotoRow* _tmp0_ = NULL;
 #line 2190 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
 #line 2190 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 17053 "Photo.c"
+#line 17054 "Photo.c"
 		{
 			PhotoRow* _tmp1_ = NULL;
 			Rating _tmp2_ = 0;
@@ -17064,16 +17065,16 @@ static void photo_real_increase_rating (MediaSource* base) {
 			_tmp3_ = rating_increase (_tmp2_);
 #line 2191 "/home/jens/Source/shotwell/src/Photo.vala"
 			media_source_set_rating (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), _tmp3_);
-#line 17066 "Photo.c"
+#line 17067 "Photo.c"
 		}
-		__finally323:
+		__finally336:
 		{
 			PhotoRow* _tmp4_ = NULL;
 #line 2190 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp4_ = self->row;
 #line 2190 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 17075 "Photo.c"
+#line 17076 "Photo.c"
 		}
 #line 2190 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -17083,7 +17084,7 @@ static void photo_real_increase_rating (MediaSource* base) {
 			g_clear_error (&_inner_error_);
 #line 2190 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 17085 "Photo.c"
+#line 17086 "Photo.c"
 		}
 	}
 }
@@ -17094,14 +17095,14 @@ static void photo_real_decrease_rating (MediaSource* base) {
 	GError * _inner_error_ = NULL;
 #line 2195 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo);
-#line 17096 "Photo.c"
+#line 17097 "Photo.c"
 	{
 		PhotoRow* _tmp0_ = NULL;
 #line 2196 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
 #line 2196 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 17103 "Photo.c"
+#line 17104 "Photo.c"
 		{
 			PhotoRow* _tmp1_ = NULL;
 			Rating _tmp2_ = 0;
@@ -17114,16 +17115,16 @@ static void photo_real_decrease_rating (MediaSource* base) {
 			_tmp3_ = rating_decrease (_tmp2_);
 #line 2197 "/home/jens/Source/shotwell/src/Photo.vala"
 			media_source_set_rating (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), _tmp3_);
-#line 17116 "Photo.c"
+#line 17117 "Photo.c"
 		}
-		__finally324:
+		__finally337:
 		{
 			PhotoRow* _tmp4_ = NULL;
 #line 2196 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp4_ = self->row;
 #line 2196 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 17125 "Photo.c"
+#line 17126 "Photo.c"
 		}
 #line 2196 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -17133,7 +17134,7 @@ static void photo_real_decrease_rating (MediaSource* base) {
 			g_clear_error (&_inner_error_);
 #line 2196 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 17135 "Photo.c"
+#line 17136 "Photo.c"
 		}
 	}
 }
@@ -17146,7 +17147,7 @@ static void photo_real_commit_backlinks (DataSource* base, SourceCollection* sou
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo);
 #line 2201 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail ((sources == NULL) || IS_SOURCE_COLLECTION (sources));
-#line 17148 "Photo.c"
+#line 17149 "Photo.c"
 	{
 		PhotoTable* _tmp0_ = NULL;
 		PhotoTable* _tmp1_ = NULL;
@@ -17168,8 +17169,8 @@ static void photo_real_commit_backlinks (DataSource* base, SourceCollection* sou
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 2206 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
-#line 17170 "Photo.c"
-				goto __catch325_database_error;
+#line 17171 "Photo.c"
+				goto __catch338_database_error;
 			}
 #line 2206 "/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);
@@ -17177,7 +17178,7 @@ static void photo_real_commit_backlinks (DataSource* base, SourceCollection* sou
 			g_clear_error (&_inner_error_);
 #line 2206 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 17179 "Photo.c"
+#line 17180 "Photo.c"
 		}
 		{
 			PhotoRow* _tmp4_ = NULL;
@@ -17185,7 +17186,7 @@ static void photo_real_commit_backlinks (DataSource* base, SourceCollection* sou
 			_tmp4_ = self->row;
 #line 2207 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_lock (&self->priv->__lock_row);
-#line 17187 "Photo.c"
+#line 17188 "Photo.c"
 			{
 				PhotoRow* _tmp5_ = NULL;
 				const gchar* _tmp6_ = NULL;
@@ -17200,23 +17201,23 @@ static void photo_real_commit_backlinks (DataSource* base, SourceCollection* sou
 				_g_free0 (_tmp5_->backlinks);
 #line 2208 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp5_->backlinks = _tmp7_;
-#line 17202 "Photo.c"
+#line 17203 "Photo.c"
 			}
-			__finally326:
+			__finally339:
 			{
 				PhotoRow* _tmp8_ = NULL;
 #line 2207 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp8_ = self->row;
 #line 2207 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 17211 "Photo.c"
+#line 17212 "Photo.c"
 			}
 #line 2207 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 2207 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_inner_error_->domain == DATABASE_ERROR) {
-#line 17217 "Photo.c"
-					goto __catch325_database_error;
+#line 17218 "Photo.c"
+					goto __catch338_database_error;
 				}
 #line 2207 "/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);
@@ -17224,12 +17225,12 @@ static void photo_real_commit_backlinks (DataSource* base, SourceCollection* sou
 				g_clear_error (&_inner_error_);
 #line 2207 "/home/jens/Source/shotwell/src/Photo.vala"
 				return;
-#line 17226 "Photo.c"
+#line 17227 "Photo.c"
 			}
 		}
 	}
-	goto __finally325;
-	__catch325_database_error:
+	goto __finally338;
+	__catch338_database_error:
 	{
 		GError* err = NULL;
 		gchar* _tmp9_ = NULL;
@@ -17254,9 +17255,9 @@ static void photo_real_commit_backlinks (DataSource* base, SourceCollection* sou
 		_g_free0 (_tmp10_);
 #line 2205 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_error_free0 (err);
-#line 17256 "Photo.c"
+#line 17257 "Photo.c"
 	}
-	__finally325:
+	__finally338:
 #line 2205 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 2205 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -17265,7 +17266,7 @@ static void photo_real_commit_backlinks (DataSource* base, SourceCollection* sou
 		g_clear_error (&_inner_error_);
 #line 2205 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 17267 "Photo.c"
+#line 17268 "Photo.c"
 	}
 }
 
@@ -17278,14 +17279,14 @@ static gboolean photo_real_set_event_id (MediaSource* base, EventID* event_id) {
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo);
 #line 2219 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (event_id != NULL, FALSE);
-#line 17280 "Photo.c"
+#line 17281 "Photo.c"
 	{
 		PhotoRow* _tmp0_ = NULL;
 #line 2220 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
 #line 2220 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 17287 "Photo.c"
+#line 17288 "Photo.c"
 		{
 			gboolean committed = FALSE;
 			PhotoTable* _tmp1_ = NULL;
@@ -17318,7 +17319,7 @@ static gboolean photo_real_set_event_id (MediaSource* base, EventID* event_id) {
 			_tmp8_ = committed;
 #line 2223 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp8_) {
-#line 17320 "Photo.c"
+#line 17321 "Photo.c"
 				PhotoRow* _tmp9_ = NULL;
 				EventID _tmp10_ = {0};
 #line 2224 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -17327,31 +17328,31 @@ static gboolean photo_real_set_event_id (MediaSource* base, EventID* event_id) {
 				_tmp10_ = *event_id;
 #line 2224 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp9_->event_id = _tmp10_;
-#line 17329 "Photo.c"
+#line 17330 "Photo.c"
 			}
 #line 2226 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = committed;
-#line 17333 "Photo.c"
+#line 17334 "Photo.c"
 			{
 				PhotoRow* _tmp11_ = NULL;
 #line 2220 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp11_ = self->row;
 #line 2220 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 17340 "Photo.c"
+#line 17341 "Photo.c"
 			}
 #line 2226 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 17344 "Photo.c"
+#line 17345 "Photo.c"
 		}
-		__finally327:
+		__finally340:
 		{
 			PhotoRow* _tmp12_ = NULL;
 #line 2220 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp12_ = self->row;
 #line 2220 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 17353 "Photo.c"
+#line 17354 "Photo.c"
 		}
 #line 2220 "/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);
@@ -17359,7 +17360,7 @@ static gboolean photo_real_set_event_id (MediaSource* base, EventID* event_id) {
 		g_clear_error (&_inner_error_);
 #line 2220 "/home/jens/Source/shotwell/src/Photo.vala"
 		return FALSE;
-#line 17361 "Photo.c"
+#line 17362 "Photo.c"
 	}
 }
 
@@ -17385,7 +17386,7 @@ static gchar* photo_real_to_string (DataObject* base) {
 	_tmp1_ = photo_is_master_baseline (self);
 #line 2232 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (!_tmp1_) {
-#line 17387 "Photo.c"
+#line 17388 "Photo.c"
 		GFile* _tmp2_ = NULL;
 		GFile* _tmp3_ = NULL;
 		gchar* _tmp4_ = NULL;
@@ -17417,7 +17418,7 @@ static gchar* photo_real_to_string (DataObject* base) {
 		_g_free0 (_tmp5_);
 #line 2232 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_tmp3_);
-#line 17419 "Photo.c"
+#line 17420 "Photo.c"
 	} else {
 		gchar* _tmp9_ = NULL;
 #line 2232 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -17426,7 +17427,7 @@ static gchar* photo_real_to_string (DataObject* base) {
 		_g_free0 (_tmp0_);
 #line 2232 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = _tmp9_;
-#line 17428 "Photo.c"
+#line 17429 "Photo.c"
 	}
 #line 2231 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_get_photo_id (self, &_tmp10_);
@@ -17460,7 +17461,7 @@ static gchar* photo_real_to_string (DataObject* base) {
 	_g_free0 (_tmp0_);
 #line 2231 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 17462 "Photo.c"
+#line 17463 "Photo.c"
 }
 
 
@@ -17487,7 +17488,7 @@ static gboolean photo_real_equals (DataSource* base, DataSource* source) {
 	_tmp2_ = photo;
 #line 2238 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp2_ != NULL) {
-#line 17489 "Photo.c"
+#line 17490 "Photo.c"
 		PhotoID photo_id = {0};
 		PhotoID _tmp3_ = {0};
 		PhotoID other_photo_id = {0};
@@ -17509,7 +17510,7 @@ static gboolean photo_real_equals (DataSource* base, DataSource* source) {
 		_tmp7_ = photo;
 #line 2242 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (self != _tmp7_) {
-#line 17511 "Photo.c"
+#line 17512 "Photo.c"
 			PhotoID _tmp8_ = {0};
 			gint64 _tmp9_ = 0LL;
 #line 2242 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -17518,15 +17519,15 @@ static gboolean photo_real_equals (DataSource* base, DataSource* source) {
 			_tmp9_ = _tmp8_.id;
 #line 2242 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp6_ = _tmp9_ != PHOTO_ID_INVALID;
-#line 17520 "Photo.c"
+#line 17521 "Photo.c"
 		} else {
 #line 2242 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp6_ = FALSE;
-#line 17524 "Photo.c"
+#line 17525 "Photo.c"
 		}
 #line 2242 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp6_) {
-#line 17528 "Photo.c"
+#line 17529 "Photo.c"
 			PhotoID _tmp10_ = {0};
 			gint64 _tmp11_ = 0LL;
 			PhotoID _tmp12_ = {0};
@@ -17541,7 +17542,7 @@ static gboolean photo_real_equals (DataSource* base, DataSource* source) {
 			_tmp13_ = _tmp12_.id;
 #line 2243 "/home/jens/Source/shotwell/src/Photo.vala"
 			_vala_assert (_tmp11_ != _tmp13_, "photo_id.id != other_photo_id.id");
-#line 17543 "Photo.c"
+#line 17544 "Photo.c"
 		}
 	}
 #line 2247 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -17554,7 +17555,7 @@ static gboolean photo_real_equals (DataSource* base, DataSource* source) {
 	_g_object_unref0 (photo);
 #line 2247 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 17556 "Photo.c"
+#line 17557 "Photo.c"
 }
 
 
@@ -17582,7 +17583,7 @@ static void photo_file_exif_updated (Photo* self) {
 	file = _tmp0_;
 #line 2254 "/home/jens/Source/shotwell/src/Photo.vala"
 	info = NULL;
-#line 17584 "Photo.c"
+#line 17585 "Photo.c"
 	{
 		GFileInfo* _tmp1_ = NULL;
 		GFileInfo* _tmp2_ = NULL;
@@ -17593,8 +17594,8 @@ static void photo_file_exif_updated (Photo* self) {
 		_tmp1_ = _tmp2_;
 #line 2256 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 17595 "Photo.c"
-			goto __catch328_g_error;
+#line 17596 "Photo.c"
+			goto __catch341_g_error;
 		}
 #line 2256 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp3_ = _tmp1_;
@@ -17606,10 +17607,10 @@ static void photo_file_exif_updated (Photo* self) {
 		info = _tmp3_;
 #line 2255 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_tmp1_);
-#line 17608 "Photo.c"
+#line 17609 "Photo.c"
 	}
-	goto __finally328;
-	__catch328_g_error:
+	goto __finally341;
+	__catch341_g_error:
 	{
 		GError* err = NULL;
 		gchar* _tmp4_ = NULL;
@@ -17631,9 +17632,9 @@ static void photo_file_exif_updated (Photo* self) {
 		_g_free0 (_tmp5_);
 #line 2255 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_error_free0 (err);
-#line 17633 "Photo.c"
+#line 17634 "Photo.c"
 	}
-	__finally328:
+	__finally341:
 #line 2255 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 2255 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -17646,7 +17647,7 @@ static void photo_file_exif_updated (Photo* self) {
 		g_clear_error (&_inner_error_);
 #line 2255 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 17648 "Photo.c"
+#line 17649 "Photo.c"
 	}
 #line 2262 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp7_ = info;
@@ -17658,18 +17659,18 @@ static void photo_file_exif_updated (Photo* self) {
 	_tmp9_ = photo_file_interrogator_new (file, PHOTO_FILE_SNIFFER_OPTIONS_GET_ALL);
 #line 2265 "/home/jens/Source/shotwell/src/Photo.vala"
 	interrogator = _tmp9_;
-#line 17660 "Photo.c"
+#line 17661 "Photo.c"
 	{
 #line 2267 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_file_interrogator_interrogate (interrogator, &_inner_error_);
 #line 2267 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 17666 "Photo.c"
-			goto __catch329_g_error;
+#line 17667 "Photo.c"
+			goto __catch342_g_error;
 		}
 	}
-	goto __finally329;
-	__catch329_g_error:
+	goto __finally342;
+	__catch342_g_error:
 	{
 		GError* err = NULL;
 		gchar* _tmp10_ = NULL;
@@ -17694,9 +17695,9 @@ static void photo_file_exif_updated (Photo* self) {
 		_g_free0 (_tmp11_);
 #line 2266 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_error_free0 (err);
-#line 17696 "Photo.c"
+#line 17697 "Photo.c"
 	}
-	__finally329:
+	__finally342:
 #line 2266 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 2266 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -17711,7 +17712,7 @@ static void photo_file_exif_updated (Photo* self) {
 		g_clear_error (&_inner_error_);
 #line 2266 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 17713 "Photo.c"
+#line 17714 "Photo.c"
 	}
 #line 2272 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp14_ = photo_file_interrogator_get_detected_photo_information (interrogator);
@@ -17723,18 +17724,18 @@ static void photo_file_exif_updated (Photo* self) {
 	if (_tmp16_ == NULL) {
 #line 2273 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp15_ = TRUE;
-#line 17725 "Photo.c"
+#line 17726 "Photo.c"
 	} else {
 		gboolean _tmp17_ = FALSE;
 #line 2273 "/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"
 		_tmp15_ = _tmp17_;
-#line 17732 "Photo.c"
+#line 17733 "Photo.c"
 	}
 #line 2273 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp15_) {
-#line 17736 "Photo.c"
+#line 17737 "Photo.c"
 		gchar* _tmp18_ = NULL;
 		gchar* _tmp19_ = NULL;
 #line 2274 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -17755,7 +17756,7 @@ static void photo_file_exif_updated (Photo* self) {
 		_g_object_unref0 (file);
 #line 2276 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 17757 "Photo.c"
+#line 17758 "Photo.c"
 	}
 	{
 		PhotoRow* _tmp20_ = NULL;
@@ -17763,7 +17764,7 @@ static void photo_file_exif_updated (Photo* self) {
 		_tmp20_ = self->row;
 #line 2280 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 17765 "Photo.c"
+#line 17766 "Photo.c"
 		{
 			PhotoTable* _tmp21_ = NULL;
 			PhotoTable* _tmp22_ = NULL;
@@ -17814,16 +17815,16 @@ static void photo_file_exif_updated (Photo* self) {
 			success = _tmp35_;
 #line 2281 "/home/jens/Source/shotwell/src/Photo.vala"
 			_database_table_unref0 (_tmp22_);
-#line 17816 "Photo.c"
+#line 17817 "Photo.c"
 		}
-		__finally330:
+		__finally343:
 		{
 			PhotoRow* _tmp36_ = NULL;
 #line 2280 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp36_ = self->row;
 #line 2280 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 17825 "Photo.c"
+#line 17826 "Photo.c"
 		}
 #line 2280 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -17841,14 +17842,14 @@ static void photo_file_exif_updated (Photo* self) {
 			g_clear_error (&_inner_error_);
 #line 2280 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 17843 "Photo.c"
+#line 17844 "Photo.c"
 		}
 	}
 #line 2285 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp37_ = success;
 #line 2285 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp37_) {
-#line 17850 "Photo.c"
+#line 17851 "Photo.c"
 		Alteration* _tmp38_ = NULL;
 		Alteration* _tmp39_ = NULL;
 #line 2286 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -17859,7 +17860,7 @@ static void photo_file_exif_updated (Photo* self) {
 		data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp39_);
 #line 2286 "/home/jens/Source/shotwell/src/Photo.vala"
 		_alteration_unref0 (_tmp39_);
-#line 17861 "Photo.c"
+#line 17862 "Photo.c"
 	}
 #line 2251 "/home/jens/Source/shotwell/src/Photo.vala"
 	_detected_photo_information_unref0 (detected);
@@ -17869,7 +17870,7 @@ static void photo_file_exif_updated (Photo* self) {
 	_g_object_unref0 (info);
 #line 2251 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (file);
-#line 17871 "Photo.c"
+#line 17872 "Photo.c"
 }
 
 
@@ -17879,14 +17880,14 @@ static guint64 photo_real_get_filesize (MediaSource* base) {
 	GError * _inner_error_ = NULL;
 #line 2291 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo);
-#line 17881 "Photo.c"
+#line 17882 "Photo.c"
 	{
 		PhotoRow* _tmp0_ = NULL;
 #line 2292 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
 #line 2292 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 17888 "Photo.c"
+#line 17889 "Photo.c"
 		{
 			BackingPhotoRow* _tmp1_ = NULL;
 			gint64 _tmp2_ = 0LL;
@@ -17896,27 +17897,27 @@ static guint64 photo_real_get_filesize (MediaSource* base) {
 			_tmp2_ = _tmp1_->filesize;
 #line 2293 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = (guint64) _tmp2_;
-#line 17898 "Photo.c"
+#line 17899 "Photo.c"
 			{
 				PhotoRow* _tmp3_ = NULL;
 #line 2292 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp3_ = self->row;
 #line 2292 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 17905 "Photo.c"
+#line 17906 "Photo.c"
 			}
 #line 2293 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 17909 "Photo.c"
+#line 17910 "Photo.c"
 		}
-		__finally331:
+		__finally344:
 		{
 			PhotoRow* _tmp4_ = NULL;
 #line 2292 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp4_ = self->row;
 #line 2292 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 17918 "Photo.c"
+#line 17919 "Photo.c"
 		}
 #line 2292 "/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);
@@ -17924,7 +17925,7 @@ static guint64 photo_real_get_filesize (MediaSource* base) {
 		g_clear_error (&_inner_error_);
 #line 2292 "/home/jens/Source/shotwell/src/Photo.vala"
 		return 0ULL;
-#line 17926 "Photo.c"
+#line 17927 "Photo.c"
 	}
 }
 
@@ -17935,14 +17936,14 @@ static guint64 photo_real_get_master_filesize (MediaSource* base) {
 	GError * _inner_error_ = NULL;
 #line 2297 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo);
-#line 17937 "Photo.c"
+#line 17938 "Photo.c"
 	{
 		PhotoRow* _tmp0_ = NULL;
 #line 2298 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
 #line 2298 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 17944 "Photo.c"
+#line 17945 "Photo.c"
 		{
 			PhotoRow* _tmp1_ = NULL;
 			BackingPhotoRow* _tmp2_ = NULL;
@@ -17955,27 +17956,27 @@ static guint64 photo_real_get_master_filesize (MediaSource* base) {
 			_tmp3_ = _tmp2_->filesize;
 #line 2299 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = (guint64) _tmp3_;
-#line 17957 "Photo.c"
+#line 17958 "Photo.c"
 			{
 				PhotoRow* _tmp4_ = NULL;
 #line 2298 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp4_ = self->row;
 #line 2298 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 17964 "Photo.c"
+#line 17965 "Photo.c"
 			}
 #line 2299 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 17968 "Photo.c"
+#line 17969 "Photo.c"
 		}
-		__finally332:
+		__finally345:
 		{
 			PhotoRow* _tmp5_ = NULL;
 #line 2298 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp5_ = self->row;
 #line 2298 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 17977 "Photo.c"
+#line 17978 "Photo.c"
 		}
 #line 2298 "/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);
@@ -17983,7 +17984,7 @@ static guint64 photo_real_get_master_filesize (MediaSource* base) {
 		g_clear_error (&_inner_error_);
 #line 2298 "/home/jens/Source/shotwell/src/Photo.vala"
 		return 0ULL;
-#line 17985 "Photo.c"
+#line 17986 "Photo.c"
 	}
 }
 
@@ -17993,14 +17994,14 @@ guint64 photo_get_editable_filesize (Photo* self) {
 	GError * _inner_error_ = NULL;
 #line 2303 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), 0ULL);
-#line 17995 "Photo.c"
+#line 17996 "Photo.c"
 	{
 		PhotoRow* _tmp0_ = NULL;
 #line 2304 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
 #line 2304 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 18002 "Photo.c"
+#line 18003 "Photo.c"
 		{
 			BackingPhotoRow* _tmp1_ = NULL;
 			gint64 _tmp2_ = 0LL;
@@ -18010,27 +18011,27 @@ guint64 photo_get_editable_filesize (Photo* self) {
 			_tmp2_ = _tmp1_->filesize;
 #line 2305 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = (guint64) _tmp2_;
-#line 18012 "Photo.c"
+#line 18013 "Photo.c"
 			{
 				PhotoRow* _tmp3_ = NULL;
 #line 2304 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp3_ = self->row;
 #line 2304 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 18019 "Photo.c"
+#line 18020 "Photo.c"
 			}
 #line 2305 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 18023 "Photo.c"
+#line 18024 "Photo.c"
 		}
-		__finally333:
+		__finally346:
 		{
 			PhotoRow* _tmp4_ = NULL;
 #line 2304 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp4_ = self->row;
 #line 2304 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 18032 "Photo.c"
+#line 18033 "Photo.c"
 		}
 #line 2304 "/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);
@@ -18038,7 +18039,7 @@ guint64 photo_get_editable_filesize (Photo* self) {
 		g_clear_error (&_inner_error_);
 #line 2304 "/home/jens/Source/shotwell/src/Photo.vala"
 		return 0ULL;
-#line 18040 "Photo.c"
+#line 18041 "Photo.c"
 	}
 }
 
@@ -18055,7 +18056,7 @@ static time_t photo_real_get_exposure_time (Dateable* base) {
 	result = _tmp0_;
 #line 2310 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 18057 "Photo.c"
+#line 18058 "Photo.c"
 }
 
 
@@ -18065,14 +18066,14 @@ static gchar* photo_real_get_basename (MediaSource* base) {
 	GError * _inner_error_ = NULL;
 #line 2313 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo);
-#line 18067 "Photo.c"
+#line 18068 "Photo.c"
 	{
 		PhotoRow* _tmp0_ = NULL;
 #line 2314 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
 #line 2314 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 18074 "Photo.c"
+#line 18075 "Photo.c"
 		{
 			const gchar* _tmp1_ = NULL;
 			gchar* _tmp2_ = NULL;
@@ -18082,27 +18083,27 @@ static gchar* photo_real_get_basename (MediaSource* base) {
 			_tmp2_ = g_strdup (_tmp1_);
 #line 2315 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp2_;
-#line 18084 "Photo.c"
+#line 18085 "Photo.c"
 			{
 				PhotoRow* _tmp3_ = NULL;
 #line 2314 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp3_ = self->row;
 #line 2314 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 18091 "Photo.c"
+#line 18092 "Photo.c"
 			}
 #line 2315 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 18095 "Photo.c"
+#line 18096 "Photo.c"
 		}
-		__finally334:
+		__finally347:
 		{
 			PhotoRow* _tmp4_ = NULL;
 #line 2314 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp4_ = self->row;
 #line 2314 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 18104 "Photo.c"
+#line 18105 "Photo.c"
 		}
 #line 2314 "/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);
@@ -18110,7 +18111,7 @@ static gchar* photo_real_get_basename (MediaSource* base) {
 		g_clear_error (&_inner_error_);
 #line 2314 "/home/jens/Source/shotwell/src/Photo.vala"
 		return NULL;
-#line 18112 "Photo.c"
+#line 18113 "Photo.c"
 	}
 }
 
@@ -18121,14 +18122,14 @@ static gchar* photo_real_get_title (MediaSource* base) {
 	GError * _inner_error_ = NULL;
 #line 2319 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo);
-#line 18123 "Photo.c"
+#line 18124 "Photo.c"
 	{
 		PhotoRow* _tmp0_ = NULL;
 #line 2320 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
 #line 2320 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 18130 "Photo.c"
+#line 18131 "Photo.c"
 		{
 			PhotoRow* _tmp1_ = NULL;
 			const gchar* _tmp2_ = NULL;
@@ -18141,27 +18142,27 @@ static gchar* photo_real_get_title (MediaSource* base) {
 			_tmp3_ = g_strdup (_tmp2_);
 #line 2321 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp3_;
-#line 18143 "Photo.c"
+#line 18144 "Photo.c"
 			{
 				PhotoRow* _tmp4_ = NULL;
 #line 2320 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp4_ = self->row;
 #line 2320 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 18150 "Photo.c"
+#line 18151 "Photo.c"
 			}
 #line 2321 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 18154 "Photo.c"
+#line 18155 "Photo.c"
 		}
-		__finally335:
+		__finally348:
 		{
 			PhotoRow* _tmp5_ = NULL;
 #line 2320 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp5_ = self->row;
 #line 2320 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 18163 "Photo.c"
+#line 18164 "Photo.c"
 		}
 #line 2320 "/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);
@@ -18169,7 +18170,7 @@ static gchar* photo_real_get_title (MediaSource* base) {
 		g_clear_error (&_inner_error_);
 #line 2320 "/home/jens/Source/shotwell/src/Photo.vala"
 		return NULL;
-#line 18171 "Photo.c"
+#line 18172 "Photo.c"
 	}
 }
 
@@ -18180,14 +18181,14 @@ static gchar* photo_real_get_comment (MediaSource* base) {
 	GError * _inner_error_ = NULL;
 #line 2325 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo);
-#line 18182 "Photo.c"
+#line 18183 "Photo.c"
 	{
 		PhotoRow* _tmp0_ = NULL;
 #line 2326 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
 #line 2326 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 18189 "Photo.c"
+#line 18190 "Photo.c"
 		{
 			PhotoRow* _tmp1_ = NULL;
 			const gchar* _tmp2_ = NULL;
@@ -18200,27 +18201,27 @@ static gchar* photo_real_get_comment (MediaSource* base) {
 			_tmp3_ = g_strdup (_tmp2_);
 #line 2327 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp3_;
-#line 18202 "Photo.c"
+#line 18203 "Photo.c"
 			{
 				PhotoRow* _tmp4_ = NULL;
 #line 2326 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp4_ = self->row;
 #line 2326 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 18209 "Photo.c"
+#line 18210 "Photo.c"
 			}
 #line 2327 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 18213 "Photo.c"
+#line 18214 "Photo.c"
 		}
-		__finally336:
+		__finally349:
 		{
 			PhotoRow* _tmp5_ = NULL;
 #line 2326 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp5_ = self->row;
 #line 2326 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 18222 "Photo.c"
+#line 18223 "Photo.c"
 		}
 #line 2326 "/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);
@@ -18228,7 +18229,7 @@ static gchar* photo_real_get_comment (MediaSource* base) {
 		g_clear_error (&_inner_error_);
 #line 2326 "/home/jens/Source/shotwell/src/Photo.vala"
 		return NULL;
-#line 18230 "Photo.c"
+#line 18231 "Photo.c"
 	}
 }
 
@@ -18251,14 +18252,14 @@ static void photo_real_set_title (MediaSource* base, const gchar* title) {
 	new_title = _tmp1_;
 #line 2334 "/home/jens/Source/shotwell/src/Photo.vala"
 	committed = FALSE;
-#line 18253 "Photo.c"
+#line 18254 "Photo.c"
 	{
 		PhotoRow* _tmp2_ = NULL;
 #line 2335 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp2_ = self->row;
 #line 2335 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 18260 "Photo.c"
+#line 18261 "Photo.c"
 		{
 			const gchar* _tmp3_ = NULL;
 			PhotoRow* _tmp4_ = NULL;
@@ -18278,20 +18279,20 @@ static void photo_real_set_title (MediaSource* base, const gchar* title) {
 			_tmp5_ = _tmp4_->title;
 #line 2336 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (g_strcmp0 (_tmp3_, _tmp5_) == 0) {
-#line 18280 "Photo.c"
+#line 18281 "Photo.c"
 				{
 					PhotoRow* _tmp6_ = NULL;
 #line 2335 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp6_ = self->row;
 #line 2335 "/home/jens/Source/shotwell/src/Photo.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 18287 "Photo.c"
+#line 18288 "Photo.c"
 				}
 #line 2337 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_free0 (new_title);
 #line 2337 "/home/jens/Source/shotwell/src/Photo.vala"
 				return;
-#line 18293 "Photo.c"
+#line 18294 "Photo.c"
 			}
 #line 2339 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp7_ = photo_table_get_instance ();
@@ -18313,7 +18314,7 @@ static void photo_real_set_title (MediaSource* base, const gchar* title) {
 			_tmp13_ = committed;
 #line 2340 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp13_) {
-#line 18315 "Photo.c"
+#line 18316 "Photo.c"
 				PhotoRow* _tmp14_ = NULL;
 				const gchar* _tmp15_ = NULL;
 				gchar* _tmp16_ = NULL;
@@ -18327,17 +18328,17 @@ static void photo_real_set_title (MediaSource* base, const gchar* title) {
 				_g_free0 (_tmp14_->title);
 #line 2341 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp14_->title = _tmp16_;
-#line 18329 "Photo.c"
+#line 18330 "Photo.c"
 			}
 		}
-		__finally337:
+		__finally350:
 		{
 			PhotoRow* _tmp17_ = NULL;
 #line 2335 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp17_ = self->row;
 #line 2335 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 18339 "Photo.c"
+#line 18340 "Photo.c"
 		}
 #line 2335 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -18349,14 +18350,14 @@ static void photo_real_set_title (MediaSource* base, const gchar* title) {
 			g_clear_error (&_inner_error_);
 #line 2335 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 18351 "Photo.c"
+#line 18352 "Photo.c"
 		}
 	}
 #line 2344 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp18_ = committed;
 #line 2344 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp18_) {
-#line 18358 "Photo.c"
+#line 18359 "Photo.c"
 		Alteration* _tmp19_ = NULL;
 		Alteration* _tmp20_ = NULL;
 #line 2345 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -18367,11 +18368,11 @@ static void photo_real_set_title (MediaSource* base, const gchar* title) {
 		data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp20_);
 #line 2345 "/home/jens/Source/shotwell/src/Photo.vala"
 		_alteration_unref0 (_tmp20_);
-#line 18369 "Photo.c"
+#line 18370 "Photo.c"
 	}
 #line 2331 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_free0 (new_title);
-#line 18373 "Photo.c"
+#line 18374 "Photo.c"
 }
 
 
@@ -18394,14 +18395,14 @@ static gboolean photo_real_set_comment (MediaSource* base, const gchar* comment)
 	new_comment = _tmp1_;
 #line 2351 "/home/jens/Source/shotwell/src/Photo.vala"
 	committed = FALSE;
-#line 18396 "Photo.c"
+#line 18397 "Photo.c"
 	{
 		PhotoRow* _tmp2_ = NULL;
 #line 2352 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp2_ = self->row;
 #line 2352 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 18403 "Photo.c"
+#line 18404 "Photo.c"
 		{
 			const gchar* _tmp3_ = NULL;
 			PhotoRow* _tmp4_ = NULL;
@@ -18423,20 +18424,20 @@ static gboolean photo_real_set_comment (MediaSource* base, const gchar* comment)
 			if (g_strcmp0 (_tmp3_, _tmp5_) == 0) {
 #line 2354 "/home/jens/Source/shotwell/src/Photo.vala"
 				result = TRUE;
-#line 18425 "Photo.c"
+#line 18426 "Photo.c"
 				{
 					PhotoRow* _tmp6_ = NULL;
 #line 2352 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp6_ = self->row;
 #line 2352 "/home/jens/Source/shotwell/src/Photo.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 18432 "Photo.c"
+#line 18433 "Photo.c"
 				}
 #line 2354 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_free0 (new_comment);
 #line 2354 "/home/jens/Source/shotwell/src/Photo.vala"
 				return result;
-#line 18438 "Photo.c"
+#line 18439 "Photo.c"
 			}
 #line 2356 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp7_ = photo_table_get_instance ();
@@ -18458,7 +18459,7 @@ static gboolean photo_real_set_comment (MediaSource* base, const gchar* comment)
 			_tmp13_ = committed;
 #line 2357 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp13_) {
-#line 18460 "Photo.c"
+#line 18461 "Photo.c"
 				PhotoRow* _tmp14_ = NULL;
 				const gchar* _tmp15_ = NULL;
 				gchar* _tmp16_ = NULL;
@@ -18472,17 +18473,17 @@ static gboolean photo_real_set_comment (MediaSource* base, const gchar* comment)
 				_g_free0 (_tmp14_->comment);
 #line 2358 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp14_->comment = _tmp16_;
-#line 18474 "Photo.c"
+#line 18475 "Photo.c"
 			}
 		}
-		__finally338:
+		__finally351:
 		{
 			PhotoRow* _tmp17_ = NULL;
 #line 2352 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp17_ = self->row;
 #line 2352 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 18484 "Photo.c"
+#line 18485 "Photo.c"
 		}
 #line 2352 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -18494,14 +18495,14 @@ static gboolean photo_real_set_comment (MediaSource* base, const gchar* comment)
 			g_clear_error (&_inner_error_);
 #line 2352 "/home/jens/Source/shotwell/src/Photo.vala"
 			return FALSE;
-#line 18496 "Photo.c"
+#line 18497 "Photo.c"
 		}
 	}
 #line 2361 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp18_ = committed;
 #line 2361 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp18_) {
-#line 18503 "Photo.c"
+#line 18504 "Photo.c"
 		Alteration* _tmp19_ = NULL;
 		Alteration* _tmp20_ = NULL;
 #line 2362 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -18512,7 +18513,7 @@ static gboolean photo_real_set_comment (MediaSource* base, const gchar* comment)
 		data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp20_);
 #line 2362 "/home/jens/Source/shotwell/src/Photo.vala"
 		_alteration_unref0 (_tmp20_);
-#line 18514 "Photo.c"
+#line 18515 "Photo.c"
 	}
 #line 2364 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = committed;
@@ -18520,14 +18521,14 @@ static gboolean photo_real_set_comment (MediaSource* base, const gchar* comment)
 	_g_free0 (new_comment);
 #line 2364 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 18522 "Photo.c"
+#line 18523 "Photo.c"
 }
 
 
 static gpointer _g_error_copy0 (gpointer self) {
 #line 2374 "/home/jens/Source/shotwell/src/Photo.vala"
 	return self ? g_error_copy (self) : NULL;
-#line 18529 "Photo.c"
+#line 18530 "Photo.c"
 }
 
 
@@ -18541,14 +18542,14 @@ void photo_set_import_id (Photo* self, ImportID* import_id) {
 	g_return_if_fail (import_id != NULL);
 #line 2368 "/home/jens/Source/shotwell/src/Photo.vala"
 	dberr = NULL;
-#line 18543 "Photo.c"
+#line 18544 "Photo.c"
 	{
 		PhotoRow* _tmp0_ = NULL;
 #line 2369 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
 #line 2369 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 18550 "Photo.c"
+#line 18551 "Photo.c"
 		{
 			{
 				PhotoTable* _tmp1_ = NULL;
@@ -18576,8 +18577,8 @@ void photo_set_import_id (Photo* self, ImportID* import_id) {
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 2371 "/home/jens/Source/shotwell/src/Photo.vala"
 					if (_inner_error_->domain == DATABASE_ERROR) {
-#line 18578 "Photo.c"
-						goto __catch340_database_error;
+#line 18579 "Photo.c"
+						goto __catch353_database_error;
 					}
 					{
 						PhotoRow* _tmp6_ = NULL;
@@ -18585,7 +18586,7 @@ void photo_set_import_id (Photo* self, ImportID* import_id) {
 						_tmp6_ = self->row;
 #line 2369 "/home/jens/Source/shotwell/src/Photo.vala"
 						g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 18587 "Photo.c"
+#line 18588 "Photo.c"
 					}
 #line 2371 "/home/jens/Source/shotwell/src/Photo.vala"
 					_g_error_free0 (dberr);
@@ -18595,7 +18596,7 @@ void photo_set_import_id (Photo* self, ImportID* import_id) {
 					g_clear_error (&_inner_error_);
 #line 2371 "/home/jens/Source/shotwell/src/Photo.vala"
 					return;
-#line 18597 "Photo.c"
+#line 18598 "Photo.c"
 				}
 #line 2372 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp7_ = self->row;
@@ -18603,10 +18604,10 @@ void photo_set_import_id (Photo* self, ImportID* import_id) {
 				_tmp8_ = *import_id;
 #line 2372 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp7_->import_id = _tmp8_;
-#line 18605 "Photo.c"
+#line 18606 "Photo.c"
 			}
-			goto __finally340;
-			__catch340_database_error:
+			goto __finally353;
+			__catch353_database_error:
 			{
 				GError* err = NULL;
 				GError* _tmp9_ = NULL;
@@ -18625,19 +18626,19 @@ void photo_set_import_id (Photo* self, ImportID* import_id) {
 				dberr = _tmp10_;
 #line 2370 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_error_free0 (err);
-#line 18627 "Photo.c"
+#line 18628 "Photo.c"
 			}
-			__finally340:
+			__finally353:
 #line 2370 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 18632 "Photo.c"
+#line 18633 "Photo.c"
 				{
 					PhotoRow* _tmp11_ = NULL;
 #line 2369 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp11_ = self->row;
 #line 2369 "/home/jens/Source/shotwell/src/Photo.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 18639 "Photo.c"
+#line 18640 "Photo.c"
 				}
 #line 2370 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_error_free0 (dberr);
@@ -18647,17 +18648,17 @@ void photo_set_import_id (Photo* self, ImportID* import_id) {
 				g_clear_error (&_inner_error_);
 #line 2370 "/home/jens/Source/shotwell/src/Photo.vala"
 				return;
-#line 18649 "Photo.c"
+#line 18650 "Photo.c"
 			}
 		}
-		__finally339:
+		__finally352:
 		{
 			PhotoRow* _tmp12_ = NULL;
 #line 2369 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp12_ = self->row;
 #line 2369 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 18659 "Photo.c"
+#line 18660 "Photo.c"
 		}
 #line 2369 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -18669,14 +18670,14 @@ void photo_set_import_id (Photo* self, ImportID* import_id) {
 			g_clear_error (&_inner_error_);
 #line 2369 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 18671 "Photo.c"
+#line 18672 "Photo.c"
 		}
 	}
 #line 2378 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp13_ = dberr;
 #line 2378 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp13_ == NULL) {
-#line 18678 "Photo.c"
+#line 18679 "Photo.c"
 		Alteration* _tmp14_ = NULL;
 		Alteration* _tmp15_ = NULL;
 #line 2379 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -18687,7 +18688,7 @@ void photo_set_import_id (Photo* self, ImportID* import_id) {
 		data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp15_);
 #line 2379 "/home/jens/Source/shotwell/src/Photo.vala"
 		_alteration_unref0 (_tmp15_);
-#line 18689 "Photo.c"
+#line 18690 "Photo.c"
 	} else {
 		gchar* _tmp16_ = NULL;
 		gchar* _tmp17_ = NULL;
@@ -18705,11 +18706,11 @@ void photo_set_import_id (Photo* self, ImportID* import_id) {
 		g_warning ("Photo.vala:2381: Unable to write import ID for %s: %s", _tmp17_, _tmp19_);
 #line 2381 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_free0 (_tmp17_);
-#line 18707 "Photo.c"
+#line 18708 "Photo.c"
 	}
 #line 2367 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_error_free0 (dberr);
-#line 18711 "Photo.c"
+#line 18712 "Photo.c"
 }
 
 
@@ -18746,7 +18747,7 @@ void photo_set_title_persistent (Photo* self, const gchar* title, GError** error
 	_tmp3_ = photo_file_format_can_write_metadata (_tmp2_);
 #line 2388 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (!_tmp3_) {
-#line 18748 "Photo.c"
+#line 18749 "Photo.c"
 		PhotoFileReader* _tmp4_ = NULL;
 		gchar* _tmp5_ = NULL;
 		gchar* _tmp6_ = NULL;
@@ -18769,7 +18770,7 @@ void photo_set_title_persistent (Photo* self, const gchar* title, GError** error
 		_photo_file_adapter_unref0 (source);
 #line 2393 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 18771 "Photo.c"
+#line 18772 "Photo.c"
 	}
 #line 2396 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp8_ = source;
@@ -18785,7 +18786,7 @@ void photo_set_title_persistent (Photo* self, const gchar* title, GError** error
 		_photo_file_adapter_unref0 (source);
 #line 2396 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 18787 "Photo.c"
+#line 18788 "Photo.c"
 	}
 #line 2397 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp10_ = metadata;
@@ -18809,7 +18810,7 @@ void photo_set_title_persistent (Photo* self, const gchar* title, GError** error
 		_photo_file_adapter_unref0 (source);
 #line 2399 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 18811 "Photo.c"
+#line 18812 "Photo.c"
 	}
 #line 2400 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp14_ = source;
@@ -18821,7 +18822,7 @@ void photo_set_title_persistent (Photo* self, const gchar* title, GError** error
 	library_monitor_blacklist_file (_tmp16_, "Photo.set_persistent_title");
 #line 2400 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (_tmp16_);
-#line 18823 "Photo.c"
+#line 18824 "Photo.c"
 	{
 		PhotoFileMetadataWriter* _tmp17_ = NULL;
 		PhotoMetadata* _tmp18_ = NULL;
@@ -18833,11 +18834,11 @@ void photo_set_title_persistent (Photo* self, const gchar* title, GError** error
 		photo_file_metadata_writer_write_metadata (_tmp17_, _tmp18_, &_inner_error_);
 #line 2402 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 18835 "Photo.c"
-			goto __finally341;
+#line 18836 "Photo.c"
+			goto __finally354;
 		}
 	}
-	__finally341:
+	__finally354:
 	{
 		PhotoFileReader* _tmp19_ = NULL;
 		GFile* _tmp20_ = NULL;
@@ -18852,7 +18853,7 @@ void photo_set_title_persistent (Photo* self, const gchar* title, GError** error
 		library_monitor_unblacklist_file (_tmp21_);
 #line 2404 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_tmp21_);
-#line 18854 "Photo.c"
+#line 18855 "Photo.c"
 	}
 #line 2401 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -18866,7 +18867,7 @@ void photo_set_title_persistent (Photo* self, const gchar* title, GError** error
 		_photo_file_adapter_unref0 (source);
 #line 2401 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 18868 "Photo.c"
+#line 18869 "Photo.c"
 	}
 #line 2407 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp22_ = title;
@@ -18880,7 +18881,7 @@ void photo_set_title_persistent (Photo* self, const gchar* title, GError** error
 	_media_metadata_unref0 (metadata);
 #line 2384 "/home/jens/Source/shotwell/src/Photo.vala"
 	_photo_file_adapter_unref0 (source);
-#line 18882 "Photo.c"
+#line 18883 "Photo.c"
 }
 
 
@@ -18917,7 +18918,7 @@ void photo_set_comment_persistent (Photo* self, const gchar* comment, GError** e
 	_tmp3_ = photo_file_format_can_write_metadata (_tmp2_);
 #line 2416 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (!_tmp3_) {
-#line 18919 "Photo.c"
+#line 18920 "Photo.c"
 		PhotoFileReader* _tmp4_ = NULL;
 		gchar* _tmp5_ = NULL;
 		gchar* _tmp6_ = NULL;
@@ -18940,7 +18941,7 @@ void photo_set_comment_persistent (Photo* self, const gchar* comment, GError** e
 		_photo_file_adapter_unref0 (source);
 #line 2421 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 18942 "Photo.c"
+#line 18943 "Photo.c"
 	}
 #line 2424 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp8_ = source;
@@ -18956,14 +18957,14 @@ void photo_set_comment_persistent (Photo* self, const gchar* comment, GError** e
 		_photo_file_adapter_unref0 (source);
 #line 2424 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 18958 "Photo.c"
+#line 18959 "Photo.c"
 	}
 #line 2425 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp10_ = metadata;
 #line 2425 "/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_comment (_tmp10_, _tmp11_, PHOTO_METADATA_SET_OPTION_ALL_DOMAINS);
 #line 2427 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp12_ = source;
 #line 2427 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -18980,7 +18981,7 @@ void photo_set_comment_persistent (Photo* self, const gchar* comment, GError** e
 		_photo_file_adapter_unref0 (source);
 #line 2427 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 18982 "Photo.c"
+#line 18983 "Photo.c"
 	}
 #line 2428 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp14_ = source;
@@ -18992,7 +18993,7 @@ void photo_set_comment_persistent (Photo* self, const gchar* comment, GError** e
 	library_monitor_blacklist_file (_tmp16_, "Photo.set_persistent_comment");
 #line 2428 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (_tmp16_);
-#line 18994 "Photo.c"
+#line 18995 "Photo.c"
 	{
 		PhotoFileMetadataWriter* _tmp17_ = NULL;
 		PhotoMetadata* _tmp18_ = NULL;
@@ -19004,11 +19005,11 @@ void photo_set_comment_persistent (Photo* self, const gchar* comment, GError** e
 		photo_file_metadata_writer_write_metadata (_tmp17_, _tmp18_, &_inner_error_);
 #line 2430 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 19006 "Photo.c"
-			goto __finally342;
+#line 19007 "Photo.c"
+			goto __finally355;
 		}
 	}
-	__finally342:
+	__finally355:
 	{
 		PhotoFileReader* _tmp19_ = NULL;
 		GFile* _tmp20_ = NULL;
@@ -19023,7 +19024,7 @@ void photo_set_comment_persistent (Photo* self, const gchar* comment, GError** e
 		library_monitor_unblacklist_file (_tmp21_);
 #line 2432 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_tmp21_);
-#line 19025 "Photo.c"
+#line 19026 "Photo.c"
 	}
 #line 2429 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -19037,7 +19038,7 @@ void photo_set_comment_persistent (Photo* self, const gchar* comment, GError** e
 		_photo_file_adapter_unref0 (source);
 #line 2429 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 19039 "Photo.c"
+#line 19040 "Photo.c"
 	}
 #line 2435 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp22_ = comment;
@@ -19051,7 +19052,7 @@ void photo_set_comment_persistent (Photo* self, const gchar* comment, GError** e
 	_media_metadata_unref0 (metadata);
 #line 2412 "/home/jens/Source/shotwell/src/Photo.vala"
 	_photo_file_adapter_unref0 (source);
-#line 19053 "Photo.c"
+#line 19054 "Photo.c"
 }
 
 
@@ -19062,14 +19063,14 @@ static void photo_real_set_exposure_time (Dateable* base, time_t time) {
 	GError * _inner_error_ = NULL;
 #line 2440 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo);
-#line 19064 "Photo.c"
+#line 19065 "Photo.c"
 	{
 		PhotoRow* _tmp0_ = NULL;
 #line 2442 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
 #line 2442 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 19071 "Photo.c"
+#line 19072 "Photo.c"
 		{
 			PhotoTable* _tmp1_ = NULL;
 			PhotoTable* _tmp2_ = NULL;
@@ -19098,7 +19099,7 @@ static void photo_real_set_exposure_time (Dateable* base, time_t time) {
 			_tmp7_ = committed;
 #line 2444 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp7_) {
-#line 19100 "Photo.c"
+#line 19101 "Photo.c"
 				PhotoRow* _tmp8_ = NULL;
 				time_t _tmp9_ = 0;
 				time_t _tmp10_ = 0;
@@ -19112,17 +19113,17 @@ static void photo_real_set_exposure_time (Dateable* base, time_t time) {
 				_tmp10_ = time;
 #line 2446 "/home/jens/Source/shotwell/src/Photo.vala"
 				self->priv->cached_exposure_time = _tmp10_;
-#line 19114 "Photo.c"
+#line 19115 "Photo.c"
 			}
 		}
-		__finally343:
+		__finally356:
 		{
 			PhotoRow* _tmp11_ = NULL;
 #line 2442 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp11_ = self->row;
 #line 2442 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 19124 "Photo.c"
+#line 19125 "Photo.c"
 		}
 #line 2442 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -19132,14 +19133,14 @@ static void photo_real_set_exposure_time (Dateable* base, time_t time) {
 			g_clear_error (&_inner_error_);
 #line 2442 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 19134 "Photo.c"
+#line 19135 "Photo.c"
 		}
 	}
 #line 2450 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp12_ = committed;
 #line 2450 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp12_) {
-#line 19141 "Photo.c"
+#line 19142 "Photo.c"
 		Alteration* _tmp13_ = NULL;
 		Alteration* _tmp14_ = NULL;
 #line 2451 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -19150,7 +19151,7 @@ static void photo_real_set_exposure_time (Dateable* base, time_t time) {
 		data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp14_);
 #line 2451 "/home/jens/Source/shotwell/src/Photo.vala"
 		_alteration_unref0 (_tmp14_);
-#line 19152 "Photo.c"
+#line 19153 "Photo.c"
 	}
 }
 
@@ -19190,7 +19191,7 @@ void photo_set_exposure_time_persistent (Photo* self, time_t time, GError** erro
 	_tmp3_ = photo_file_format_can_write_metadata (_tmp2_);
 #line 2458 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (!_tmp3_) {
-#line 19192 "Photo.c"
+#line 19193 "Photo.c"
 		PhotoFileReader* _tmp4_ = NULL;
 		gchar* _tmp5_ = NULL;
 		gchar* _tmp6_ = NULL;
@@ -19213,7 +19214,7 @@ void photo_set_exposure_time_persistent (Photo* self, time_t time, GError** erro
 		_photo_file_adapter_unref0 (source);
 #line 2463 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 19215 "Photo.c"
+#line 19216 "Photo.c"
 	}
 #line 2466 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp8_ = source;
@@ -19229,7 +19230,7 @@ void photo_set_exposure_time_persistent (Photo* self, time_t time, GError** erro
 		_photo_file_adapter_unref0 (source);
 #line 2466 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 19231 "Photo.c"
+#line 19232 "Photo.c"
 	}
 #line 2467 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp10_ = metadata;
@@ -19259,7 +19260,7 @@ void photo_set_exposure_time_persistent (Photo* self, time_t time, GError** erro
 		_photo_file_adapter_unref0 (source);
 #line 2469 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 19261 "Photo.c"
+#line 19262 "Photo.c"
 	}
 #line 2470 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp16_ = source;
@@ -19271,7 +19272,7 @@ void photo_set_exposure_time_persistent (Photo* self, time_t time, GError** erro
 	library_monitor_blacklist_file (_tmp18_, "Photo.set_exposure_time_persistent");
 #line 2470 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (_tmp18_);
-#line 19273 "Photo.c"
+#line 19274 "Photo.c"
 	{
 		PhotoFileMetadataWriter* _tmp19_ = NULL;
 		PhotoMetadata* _tmp20_ = NULL;
@@ -19283,11 +19284,11 @@ void photo_set_exposure_time_persistent (Photo* self, time_t time, GError** erro
 		photo_file_metadata_writer_write_metadata (_tmp19_, _tmp20_, &_inner_error_);
 #line 2472 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 19285 "Photo.c"
-			goto __finally344;
+#line 19286 "Photo.c"
+			goto __finally357;
 		}
 	}
-	__finally344:
+	__finally357:
 	{
 		PhotoFileReader* _tmp21_ = NULL;
 		GFile* _tmp22_ = NULL;
@@ -19302,7 +19303,7 @@ void photo_set_exposure_time_persistent (Photo* self, time_t time, GError** erro
 		library_monitor_unblacklist_file (_tmp23_);
 #line 2474 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_tmp23_);
-#line 19304 "Photo.c"
+#line 19305 "Photo.c"
 	}
 #line 2471 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -19316,7 +19317,7 @@ void photo_set_exposure_time_persistent (Photo* self, time_t time, GError** erro
 		_photo_file_adapter_unref0 (source);
 #line 2471 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 19318 "Photo.c"
+#line 19319 "Photo.c"
 	}
 #line 2477 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp24_ = time;
@@ -19330,7 +19331,7 @@ void photo_set_exposure_time_persistent (Photo* self, time_t time, GError** erro
 	_media_metadata_unref0 (metadata);
 #line 2454 "/home/jens/Source/shotwell/src/Photo.vala"
 	_photo_file_adapter_unref0 (source);
-#line 19332 "Photo.c"
+#line 19333 "Photo.c"
 }
 
 
@@ -19369,7 +19370,7 @@ static void photo_real_get_dimensions (MediaSource* base, PhotoException disallo
 	_tmp2_ = photo_exception_allows (_tmp1_, PHOTO_EXCEPTION_ORIENTATION);
 #line 2500 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp2_) {
-#line 19371 "Photo.c"
+#line 19372 "Photo.c"
 		Orientation ori_tmp = 0;
 		Orientation _tmp3_ = 0;
 		Orientation _tmp4_ = 0;
@@ -19389,7 +19390,7 @@ static void photo_real_get_dimensions (MediaSource* base, PhotoException disallo
 			case ORIENTATION_LEFT_BOTTOM:
 #line 2504 "/home/jens/Source/shotwell/src/Photo.vala"
 			case ORIENTATION_RIGHT_BOTTOM:
-#line 19391 "Photo.c"
+#line 19392 "Photo.c"
 			{
 				gint width_tmp = 0;
 				Dimensions _tmp5_ = {0};
@@ -19415,13 +19416,13 @@ static void photo_real_get_dimensions (MediaSource* base, PhotoException disallo
 				returned_dims.height = _tmp9_;
 #line 2514 "/home/jens/Source/shotwell/src/Photo.vala"
 				break;
-#line 19417 "Photo.c"
+#line 19418 "Photo.c"
 			}
 			default:
 			{
 #line 2518 "/home/jens/Source/shotwell/src/Photo.vala"
 				break;
-#line 19423 "Photo.c"
+#line 19424 "Photo.c"
 			}
 		}
 	}
@@ -19431,7 +19432,7 @@ static void photo_real_get_dimensions (MediaSource* base, PhotoException disallo
 	_tmp11_ = photo_exception_allows (_tmp10_, PHOTO_EXCEPTION_STRAIGHTEN);
 #line 2523 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp11_) {
-#line 19433 "Photo.c"
+#line 19434 "Photo.c"
 		gdouble x_size = 0.0;
 		gdouble y_size = 0.0;
 		gdouble angle = 0.0;
@@ -19475,7 +19476,7 @@ static void photo_real_get_dimensions (MediaSource* base, PhotoException disallo
 		_tmp21_ = y_size;
 #line 2532 "/home/jens/Source/shotwell/src/Photo.vala"
 		returned_dims.height = (gint) _tmp21_;
-#line 19477 "Photo.c"
+#line 19478 "Photo.c"
 	}
 #line 2536 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp22_ = disallowed_steps;
@@ -19483,7 +19484,7 @@ static void photo_real_get_dimensions (MediaSource* base, PhotoException disallo
 	_tmp23_ = photo_exception_allows (_tmp22_, PHOTO_EXCEPTION_CROP);
 #line 2536 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp23_) {
-#line 19485 "Photo.c"
+#line 19486 "Photo.c"
 		Box crop = {0};
 		PhotoException _tmp24_ = 0;
 		Box _tmp25_ = {0};
@@ -19496,20 +19497,20 @@ static void photo_real_get_dimensions (MediaSource* base, PhotoException disallo
 		crop = _tmp25_;
 #line 2538 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp26_) {
-#line 19498 "Photo.c"
+#line 19499 "Photo.c"
 			Dimensions _tmp27_ = {0};
 #line 2539 "/home/jens/Source/shotwell/src/Photo.vala"
 			box_get_dimensions (&crop, &_tmp27_);
 #line 2539 "/home/jens/Source/shotwell/src/Photo.vala"
 			returned_dims = _tmp27_;
-#line 19504 "Photo.c"
+#line 19505 "Photo.c"
 		}
 	}
 #line 2542 "/home/jens/Source/shotwell/src/Photo.vala"
 	*result = returned_dims;
 #line 2542 "/home/jens/Source/shotwell/src/Photo.vala"
 	return;
-#line 19511 "Photo.c"
+#line 19512 "Photo.c"
 }
 
 
@@ -19536,13 +19537,13 @@ static void photo_locked_create_adjustments_from_data (Photo* self) {
 	_tmp2_ = map;
 #line 2550 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp2_ == NULL) {
-#line 19538 "Photo.c"
+#line 19539 "Photo.c"
 		PixelTransformationBundle* _tmp3_ = NULL;
 #line 2551 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp3_ = self->priv->adjustments;
 #line 2551 "/home/jens/Source/shotwell/src/Photo.vala"
 		pixel_transformation_bundle_set_to_identity (_tmp3_);
-#line 19544 "Photo.c"
+#line 19545 "Photo.c"
 	} else {
 		PixelTransformationBundle* _tmp4_ = NULL;
 		KeyValueMap* _tmp5_ = NULL;
@@ -19552,7 +19553,7 @@ static void photo_locked_create_adjustments_from_data (Photo* self) {
 		_tmp5_ = map;
 #line 2553 "/home/jens/Source/shotwell/src/Photo.vala"
 		pixel_transformation_bundle_load (_tmp4_, _tmp5_);
-#line 19554 "Photo.c"
+#line 19555 "Photo.c"
 	}
 #line 2555 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp6_ = self->priv->adjustments;
@@ -19564,7 +19565,7 @@ static void photo_locked_create_adjustments_from_data (Photo* self) {
 	self->priv->transformer = _tmp7_;
 #line 2546 "/home/jens/Source/shotwell/src/Photo.vala"
 	_key_value_map_unref0 (map);
-#line 19566 "Photo.c"
+#line 19567 "Photo.c"
 }
 
 
@@ -19573,14 +19574,14 @@ PixelTransformationBundle* photo_get_color_adjustments (Photo* self) {
 	GError * _inner_error_ = NULL;
 #line 2559 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), NULL);
-#line 19575 "Photo.c"
+#line 19576 "Photo.c"
 	{
 		PhotoRow* _tmp0_ = NULL;
 #line 2560 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
 #line 2560 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 19582 "Photo.c"
+#line 19583 "Photo.c"
 		{
 			PixelTransformationBundle* _tmp1_ = NULL;
 			PixelTransformationBundle* _tmp2_ = NULL;
@@ -19591,7 +19592,7 @@ PixelTransformationBundle* photo_get_color_adjustments (Photo* self) {
 			if (_tmp1_ == NULL) {
 #line 2562 "/home/jens/Source/shotwell/src/Photo.vala"
 				photo_locked_create_adjustments_from_data (self);
-#line 19593 "Photo.c"
+#line 19594 "Photo.c"
 			}
 #line 2564 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = self->priv->adjustments;
@@ -19599,27 +19600,27 @@ PixelTransformationBundle* photo_get_color_adjustments (Photo* self) {
 			_tmp3_ = pixel_transformation_bundle_copy (_tmp2_);
 #line 2564 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp3_;
-#line 19601 "Photo.c"
+#line 19602 "Photo.c"
 			{
 				PhotoRow* _tmp4_ = NULL;
 #line 2560 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp4_ = self->row;
 #line 2560 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 19608 "Photo.c"
+#line 19609 "Photo.c"
 			}
 #line 2564 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 19612 "Photo.c"
+#line 19613 "Photo.c"
 		}
-		__finally345:
+		__finally358:
 		{
 			PhotoRow* _tmp5_ = NULL;
 #line 2560 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp5_ = self->row;
 #line 2560 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 19621 "Photo.c"
+#line 19622 "Photo.c"
 		}
 #line 2560 "/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);
@@ -19627,7 +19628,7 @@ PixelTransformationBundle* photo_get_color_adjustments (Photo* self) {
 		g_clear_error (&_inner_error_);
 #line 2560 "/home/jens/Source/shotwell/src/Photo.vala"
 		return NULL;
-#line 19629 "Photo.c"
+#line 19630 "Photo.c"
 	}
 }
 
@@ -19637,14 +19638,14 @@ PixelTransformer* photo_get_pixel_transformer (Photo* self) {
 	GError * _inner_error_ = NULL;
 #line 2568 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), NULL);
-#line 19639 "Photo.c"
+#line 19640 "Photo.c"
 	{
 		PhotoRow* _tmp0_ = NULL;
 #line 2569 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
 #line 2569 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 19646 "Photo.c"
+#line 19647 "Photo.c"
 		{
 			PixelTransformer* _tmp1_ = NULL;
 			PixelTransformer* _tmp2_ = NULL;
@@ -19655,7 +19656,7 @@ PixelTransformer* photo_get_pixel_transformer (Photo* self) {
 			if (_tmp1_ == NULL) {
 #line 2571 "/home/jens/Source/shotwell/src/Photo.vala"
 				photo_locked_create_adjustments_from_data (self);
-#line 19657 "Photo.c"
+#line 19658 "Photo.c"
 			}
 #line 2573 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = self->priv->transformer;
@@ -19663,27 +19664,27 @@ PixelTransformer* photo_get_pixel_transformer (Photo* self) {
 			_tmp3_ = pixel_transformer_copy (_tmp2_);
 #line 2573 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp3_;
-#line 19665 "Photo.c"
+#line 19666 "Photo.c"
 			{
 				PhotoRow* _tmp4_ = NULL;
 #line 2569 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp4_ = self->row;
 #line 2569 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 19672 "Photo.c"
+#line 19673 "Photo.c"
 			}
 #line 2573 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 19676 "Photo.c"
+#line 19677 "Photo.c"
 		}
-		__finally346:
+		__finally359:
 		{
 			PhotoRow* _tmp5_ = NULL;
 #line 2569 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp5_ = self->row;
 #line 2569 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 19685 "Photo.c"
+#line 19686 "Photo.c"
 		}
 #line 2569 "/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);
@@ -19691,7 +19692,7 @@ PixelTransformer* photo_get_pixel_transformer (Photo* self) {
 		g_clear_error (&_inner_error_);
 #line 2569 "/home/jens/Source/shotwell/src/Photo.vala"
 		return NULL;
-#line 19693 "Photo.c"
+#line 19694 "Photo.c"
 	}
 }
 
@@ -19707,7 +19708,7 @@ gboolean photo_has_color_adjustments (Photo* self) {
 	result = _tmp0_;
 #line 2578 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 19709 "Photo.c"
+#line 19710 "Photo.c"
 }
 
 
@@ -19736,7 +19737,7 @@ PixelTransformation* photo_get_color_adjustment (Photo* self, PixelTransformatio
 	result = _tmp4_;
 #line 2582 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 19738 "Photo.c"
+#line 19739 "Photo.c"
 }
 
 
@@ -19759,7 +19760,7 @@ void photo_set_color_adjustments (Photo* self, PixelTransformationBundle* new_ad
 	_tmp1_ = pixel_transformation_bundle_is_identity (_tmp0_);
 #line 2588 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp1_) {
-#line 19761 "Photo.c"
+#line 19762 "Photo.c"
 		gboolean _result_ = FALSE;
 		gboolean _tmp5_ = FALSE;
 		{
@@ -19768,7 +19769,7 @@ void photo_set_color_adjustments (Photo* self, PixelTransformationBundle* new_ad
 			_tmp2_ = self->row;
 #line 2590 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_lock (&self->priv->__lock_row);
-#line 19770 "Photo.c"
+#line 19771 "Photo.c"
 			{
 				gboolean _tmp3_ = FALSE;
 #line 2591 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -19783,16 +19784,16 @@ void photo_set_color_adjustments (Photo* self, PixelTransformationBundle* new_ad
 				_pixel_transformer_unref0 (self->priv->transformer);
 #line 2593 "/home/jens/Source/shotwell/src/Photo.vala"
 				self->priv->transformer = NULL;
-#line 19785 "Photo.c"
+#line 19786 "Photo.c"
 			}
-			__finally347:
+			__finally360:
 			{
 				PhotoRow* _tmp4_ = NULL;
 #line 2590 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp4_ = self->row;
 #line 2590 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 19794 "Photo.c"
+#line 19795 "Photo.c"
 			}
 #line 2590 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -19802,14 +19803,14 @@ void photo_set_color_adjustments (Photo* self, PixelTransformationBundle* new_ad
 				g_clear_error (&_inner_error_);
 #line 2590 "/home/jens/Source/shotwell/src/Photo.vala"
 				return;
-#line 19804 "Photo.c"
+#line 19805 "Photo.c"
 			}
 		}
 #line 2596 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp5_ = _result_;
 #line 2596 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp5_) {
-#line 19811 "Photo.c"
+#line 19812 "Photo.c"
 			Alteration* _tmp6_ = NULL;
 			Alteration* _tmp7_ = NULL;
 #line 2597 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -19820,11 +19821,11 @@ void photo_set_color_adjustments (Photo* self, PixelTransformationBundle* new_ad
 			data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp7_);
 #line 2597 "/home/jens/Source/shotwell/src/Photo.vala"
 			_alteration_unref0 (_tmp7_);
-#line 19822 "Photo.c"
+#line 19823 "Photo.c"
 		}
 #line 2599 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 19826 "Photo.c"
+#line 19827 "Photo.c"
 	}
 #line 2603 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp8_ = new_adjustments;
@@ -19832,14 +19833,14 @@ void photo_set_color_adjustments (Photo* self, PixelTransformationBundle* new_ad
 	_tmp9_ = pixel_transformation_bundle_save (_tmp8_, "adjustments");
 #line 2603 "/home/jens/Source/shotwell/src/Photo.vala"
 	map = _tmp9_;
-#line 19834 "Photo.c"
+#line 19835 "Photo.c"
 	{
 		PhotoRow* _tmp10_ = NULL;
 #line 2606 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp10_ = self->row;
 #line 2606 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 19841 "Photo.c"
+#line 19842 "Photo.c"
 		{
 			gboolean _tmp11_ = FALSE;
 			PixelTransformer* _tmp12_ = NULL;
@@ -19851,18 +19852,18 @@ void photo_set_color_adjustments (Photo* self, PixelTransformationBundle* new_ad
 			if (_tmp12_ == NULL) {
 #line 2607 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp11_ = TRUE;
-#line 19853 "Photo.c"
+#line 19854 "Photo.c"
 			} else {
 				PixelTransformationBundle* _tmp13_ = NULL;
 #line 2607 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp13_ = self->priv->adjustments;
 #line 2607 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp11_ = _tmp13_ == NULL;
-#line 19860 "Photo.c"
+#line 19861 "Photo.c"
 			}
 #line 2607 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp11_) {
-#line 19864 "Photo.c"
+#line 19865 "Photo.c"
 				PixelTransformationBundle* _tmp14_ = NULL;
 				PixelTransformationBundle* _tmp15_ = NULL;
 				PixelTransformationBundle* _tmp16_ = NULL;
@@ -19883,7 +19884,7 @@ void photo_set_color_adjustments (Photo* self, PixelTransformationBundle* new_ad
 				_pixel_transformer_unref0 (self->priv->transformer);
 #line 2610 "/home/jens/Source/shotwell/src/Photo.vala"
 				self->priv->transformer = _tmp17_;
-#line 19885 "Photo.c"
+#line 19886 "Photo.c"
 			} else {
 				PixelTransformationBundle* _tmp34_ = NULL;
 				PixelTransformationBundle* _tmp35_ = NULL;
@@ -19910,7 +19911,7 @@ void photo_set_color_adjustments (Photo* self, PixelTransformationBundle* new_ad
 					_transformation_it = _tmp22_;
 #line 2613 "/home/jens/Source/shotwell/src/Photo.vala"
 					while (TRUE) {
-#line 19912 "Photo.c"
+#line 19913 "Photo.c"
 						GeeIterator* _tmp23_ = NULL;
 						gboolean _tmp24_ = FALSE;
 						PixelTransformation* transformation = NULL;
@@ -19931,7 +19932,7 @@ void photo_set_color_adjustments (Photo* self, PixelTransformationBundle* new_ad
 						if (!_tmp24_) {
 #line 2613 "/home/jens/Source/shotwell/src/Photo.vala"
 							break;
-#line 19933 "Photo.c"
+#line 19934 "Photo.c"
 						}
 #line 2613 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp25_ = _transformation_it;
@@ -19959,11 +19960,11 @@ void photo_set_color_adjustments (Photo* self, PixelTransformationBundle* new_ad
 						_pixel_transformation_unref0 (_tmp32_);
 #line 2613 "/home/jens/Source/shotwell/src/Photo.vala"
 						_pixel_transformation_unref0 (transformation);
-#line 19961 "Photo.c"
+#line 19962 "Photo.c"
 					}
 #line 2613 "/home/jens/Source/shotwell/src/Photo.vala"
 					_g_object_unref0 (_transformation_it);
-#line 19965 "Photo.c"
+#line 19966 "Photo.c"
 				}
 #line 2619 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp34_ = new_adjustments;
@@ -19973,7 +19974,7 @@ void photo_set_color_adjustments (Photo* self, PixelTransformationBundle* new_ad
 				_pixel_transformation_bundle_unref0 (self->priv->adjustments);
 #line 2619 "/home/jens/Source/shotwell/src/Photo.vala"
 				self->priv->adjustments = _tmp35_;
-#line 19975 "Photo.c"
+#line 19976 "Photo.c"
 			}
 #line 2622 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp36_ = map;
@@ -19981,16 +19982,16 @@ void photo_set_color_adjustments (Photo* self, PixelTransformationBundle* new_ad
 			_tmp37_ = photo_set_transformation (self, _tmp36_);
 #line 2622 "/home/jens/Source/shotwell/src/Photo.vala"
 			committed = _tmp37_;
-#line 19983 "Photo.c"
+#line 19984 "Photo.c"
 		}
-		__finally348:
+		__finally361:
 		{
 			PhotoRow* _tmp38_ = NULL;
 #line 2606 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp38_ = self->row;
 #line 2606 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 19992 "Photo.c"
+#line 19993 "Photo.c"
 		}
 #line 2606 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -20002,14 +20003,14 @@ void photo_set_color_adjustments (Photo* self, PixelTransformationBundle* new_ad
 			g_clear_error (&_inner_error_);
 #line 2606 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 20004 "Photo.c"
+#line 20005 "Photo.c"
 		}
 	}
 #line 2625 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp39_ = committed;
 #line 2625 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp39_) {
-#line 20011 "Photo.c"
+#line 20012 "Photo.c"
 		Alteration* _tmp40_ = NULL;
 		Alteration* _tmp41_ = NULL;
 #line 2626 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -20020,11 +20021,11 @@ void photo_set_color_adjustments (Photo* self, PixelTransformationBundle* new_ad
 		data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp41_);
 #line 2626 "/home/jens/Source/shotwell/src/Photo.vala"
 		_alteration_unref0 (_tmp41_);
-#line 20022 "Photo.c"
+#line 20023 "Photo.c"
 	}
 #line 2585 "/home/jens/Source/shotwell/src/Photo.vala"
 	_key_value_map_unref0 (map);
-#line 20026 "Photo.c"
+#line 20027 "Photo.c"
 }
 
 
@@ -20034,7 +20035,7 @@ static PhotoMetadata* photo_real_get_metadata (PhotoSource* base) {
 	GError * _inner_error_ = NULL;
 #line 2630 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo);
-#line 20036 "Photo.c"
+#line 20037 "Photo.c"
 	{
 		PhotoMetadata* _tmp0_ = NULL;
 		PhotoFileReader* _tmp1_ = NULL;
@@ -20056,8 +20057,8 @@ static PhotoMetadata* photo_real_get_metadata (PhotoSource* base) {
 		_tmp0_ = _tmp4_;
 #line 2632 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 20058 "Photo.c"
-			goto __catch349_g_error;
+#line 20059 "Photo.c"
+			goto __catch362_g_error;
 		}
 #line 2632 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp5_ = _tmp0_;
@@ -20069,10 +20070,10 @@ static PhotoMetadata* photo_real_get_metadata (PhotoSource* base) {
 		_media_metadata_unref0 (_tmp0_);
 #line 2632 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 20071 "Photo.c"
+#line 20072 "Photo.c"
 	}
-	goto __finally349;
-	__catch349_g_error:
+	goto __finally362;
+	__catch362_g_error:
 	{
 		GError* err = NULL;
 		GError* _tmp6_ = NULL;
@@ -20093,16 +20094,16 @@ static PhotoMetadata* photo_real_get_metadata (PhotoSource* base) {
 		_g_error_free0 (err);
 #line 2636 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 20095 "Photo.c"
+#line 20096 "Photo.c"
 	}
-	__finally349:
+	__finally362:
 #line 2631 "/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"
 	g_clear_error (&_inner_error_);
 #line 2631 "/home/jens/Source/shotwell/src/Photo.vala"
 	return NULL;
-#line 20104 "Photo.c"
+#line 20105 "Photo.c"
 }
 
 
@@ -20135,7 +20136,7 @@ PhotoMetadata* photo_get_master_metadata (Photo* self, GError** error) {
 		g_propagate_error (error, _inner_error_);
 #line 2641 "/home/jens/Source/shotwell/src/Photo.vala"
 		return NULL;
-#line 20137 "Photo.c"
+#line 20138 "Photo.c"
 	}
 #line 2641 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp5_ = _tmp0_;
@@ -20147,7 +20148,7 @@ PhotoMetadata* photo_get_master_metadata (Photo* self, GError** error) {
 	_media_metadata_unref0 (_tmp0_);
 #line 2641 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 20149 "Photo.c"
+#line 20150 "Photo.c"
 }
 
 
@@ -20168,7 +20169,7 @@ PhotoMetadata* photo_get_editable_metadata (Photo* self, GError** error) {
 	_tmp2_ = reader;
 #line 2647 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp2_ != NULL) {
-#line 20170 "Photo.c"
+#line 20171 "Photo.c"
 		PhotoFileReader* _tmp3_ = NULL;
 		PhotoMetadata* _tmp4_ = NULL;
 #line 2647 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -20189,14 +20190,14 @@ PhotoMetadata* photo_get_editable_metadata (Photo* self, GError** error) {
 			_photo_file_adapter_unref0 (reader);
 #line 2647 "/home/jens/Source/shotwell/src/Photo.vala"
 			return NULL;
-#line 20191 "Photo.c"
+#line 20192 "Photo.c"
 		}
 	} else {
 #line 2647 "/home/jens/Source/shotwell/src/Photo.vala"
 		_media_metadata_unref0 (_tmp1_);
 #line 2647 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp1_ = NULL;
-#line 20198 "Photo.c"
+#line 20199 "Photo.c"
 	}
 #line 2647 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp1_;
@@ -20204,7 +20205,7 @@ PhotoMetadata* photo_get_editable_metadata (Photo* self, GError** error) {
 	_photo_file_adapter_unref0 (reader);
 #line 2647 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 20206 "Photo.c"
+#line 20207 "Photo.c"
 }
 
 
@@ -20255,15 +20256,15 @@ gboolean photo_persist_master_metadata (Photo* self, PhotoMetadata* metadata, Ph
 		if (state) {
 #line 2660 "/home/jens/Source/shotwell/src/Photo.vala"
 			*state = _vala_state;
-#line 20257 "Photo.c"
+#line 20258 "Photo.c"
 		} else {
 #line 2660 "/home/jens/Source/shotwell/src/Photo.vala"
 			_photo_reimport_master_state_unref0 (_vala_state);
-#line 20261 "Photo.c"
+#line 20262 "Photo.c"
 		}
 #line 2660 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 20265 "Photo.c"
+#line 20266 "Photo.c"
 	}
 #line 2662 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp5_ = master_reader;
@@ -20279,7 +20280,7 @@ gboolean photo_persist_master_metadata (Photo* self, PhotoMetadata* metadata, Ph
 		_photo_file_adapter_unref0 (master_reader);
 #line 2662 "/home/jens/Source/shotwell/src/Photo.vala"
 		return FALSE;
-#line 20281 "Photo.c"
+#line 20282 "Photo.c"
 	}
 #line 2662 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp7_ = _tmp4_;
@@ -20303,7 +20304,7 @@ gboolean photo_persist_master_metadata (Photo* self, PhotoMetadata* metadata, Ph
 		_photo_file_adapter_unref0 (master_reader);
 #line 2662 "/home/jens/Source/shotwell/src/Photo.vala"
 		return FALSE;
-#line 20305 "Photo.c"
+#line 20306 "Photo.c"
 	}
 #line 2664 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp12_ = photo_prepare_for_reimport_master (self, &_tmp11_, &_inner_error_);
@@ -20323,7 +20324,7 @@ gboolean photo_persist_master_metadata (Photo* self, PhotoMetadata* metadata, Ph
 		_photo_file_adapter_unref0 (master_reader);
 #line 2664 "/home/jens/Source/shotwell/src/Photo.vala"
 		return FALSE;
-#line 20325 "Photo.c"
+#line 20326 "Photo.c"
 	}
 #line 2664 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (!_tmp10_) {
@@ -20337,15 +20338,15 @@ gboolean photo_persist_master_metadata (Photo* self, PhotoMetadata* metadata, Ph
 		if (state) {
 #line 2665 "/home/jens/Source/shotwell/src/Photo.vala"
 			*state = _vala_state;
-#line 20339 "Photo.c"
+#line 20340 "Photo.c"
 		} else {
 #line 2665 "/home/jens/Source/shotwell/src/Photo.vala"
 			_photo_reimport_master_state_unref0 (_vala_state);
-#line 20343 "Photo.c"
+#line 20344 "Photo.c"
 		}
 #line 2665 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 20347 "Photo.c"
+#line 20348 "Photo.c"
 	}
 #line 2667 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp13_ = _vala_state;
@@ -20361,15 +20362,15 @@ gboolean photo_persist_master_metadata (Photo* self, PhotoMetadata* metadata, Ph
 	if (state) {
 #line 2669 "/home/jens/Source/shotwell/src/Photo.vala"
 		*state = _vala_state;
-#line 20363 "Photo.c"
+#line 20364 "Photo.c"
 	} else {
 #line 2669 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_reimport_master_state_unref0 (_vala_state);
-#line 20367 "Photo.c"
+#line 20368 "Photo.c"
 	}
 #line 2669 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 20371 "Photo.c"
+#line 20372 "Photo.c"
 }
 
 
@@ -20392,7 +20393,7 @@ void photo_finish_update_master_metadata (Photo* self, PhotoReimportMasterState*
 			g_propagate_error (error, _inner_error_);
 #line 2673 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 20394 "Photo.c"
+#line 20395 "Photo.c"
 		} else {
 #line 2673 "/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);
@@ -20400,7 +20401,7 @@ void photo_finish_update_master_metadata (Photo* self, PhotoReimportMasterState*
 			g_clear_error (&_inner_error_);
 #line 2673 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 20402 "Photo.c"
+#line 20403 "Photo.c"
 		}
 	}
 }
@@ -20450,15 +20451,15 @@ gboolean photo_persist_editable_metadata (Photo* self, PhotoMetadata* metadata,
 		if (state) {
 #line 2682 "/home/jens/Source/shotwell/src/Photo.vala"
 			*state = _vala_state;
-#line 20452 "Photo.c"
+#line 20453 "Photo.c"
 		} else {
 #line 2682 "/home/jens/Source/shotwell/src/Photo.vala"
 			_photo_reimport_editable_state_unref0 (_vala_state);
-#line 20456 "Photo.c"
+#line 20457 "Photo.c"
 		}
 #line 2682 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 20460 "Photo.c"
+#line 20461 "Photo.c"
 	}
 #line 2684 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = editable_reader;
@@ -20476,15 +20477,15 @@ gboolean photo_persist_editable_metadata (Photo* self, PhotoMetadata* metadata,
 		if (state) {
 #line 2685 "/home/jens/Source/shotwell/src/Photo.vala"
 			*state = _vala_state;
-#line 20478 "Photo.c"
+#line 20479 "Photo.c"
 		} else {
 #line 2685 "/home/jens/Source/shotwell/src/Photo.vala"
 			_photo_reimport_editable_state_unref0 (_vala_state);
-#line 20482 "Photo.c"
+#line 20483 "Photo.c"
 		}
 #line 2685 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 20486 "Photo.c"
+#line 20487 "Photo.c"
 	}
 #line 2687 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp6_ = editable_reader;
@@ -20500,7 +20501,7 @@ gboolean photo_persist_editable_metadata (Photo* self, PhotoMetadata* metadata,
 		_photo_file_adapter_unref0 (editable_reader);
 #line 2687 "/home/jens/Source/shotwell/src/Photo.vala"
 		return FALSE;
-#line 20502 "Photo.c"
+#line 20503 "Photo.c"
 	}
 #line 2687 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp8_ = _tmp5_;
@@ -20524,7 +20525,7 @@ gboolean photo_persist_editable_metadata (Photo* self, PhotoMetadata* metadata,
 		_photo_file_adapter_unref0 (editable_reader);
 #line 2687 "/home/jens/Source/shotwell/src/Photo.vala"
 		return FALSE;
-#line 20526 "Photo.c"
+#line 20527 "Photo.c"
 	}
 #line 2689 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp13_ = photo_prepare_for_reimport_editable (self, &_tmp12_, &_inner_error_);
@@ -20544,7 +20545,7 @@ gboolean photo_persist_editable_metadata (Photo* self, PhotoMetadata* metadata,
 		_photo_file_adapter_unref0 (editable_reader);
 #line 2689 "/home/jens/Source/shotwell/src/Photo.vala"
 		return FALSE;
-#line 20546 "Photo.c"
+#line 20547 "Photo.c"
 	}
 #line 2689 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (!_tmp11_) {
@@ -20558,15 +20559,15 @@ gboolean photo_persist_editable_metadata (Photo* self, PhotoMetadata* metadata,
 		if (state) {
 #line 2690 "/home/jens/Source/shotwell/src/Photo.vala"
 			*state = _vala_state;
-#line 20560 "Photo.c"
+#line 20561 "Photo.c"
 		} else {
 #line 2690 "/home/jens/Source/shotwell/src/Photo.vala"
 			_photo_reimport_editable_state_unref0 (_vala_state);
-#line 20564 "Photo.c"
+#line 20565 "Photo.c"
 		}
 #line 2690 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 20568 "Photo.c"
+#line 20569 "Photo.c"
 	}
 #line 2692 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp14_ = _vala_state;
@@ -20582,15 +20583,15 @@ gboolean photo_persist_editable_metadata (Photo* self, PhotoMetadata* metadata,
 	if (state) {
 #line 2694 "/home/jens/Source/shotwell/src/Photo.vala"
 		*state = _vala_state;
-#line 20584 "Photo.c"
+#line 20585 "Photo.c"
 	} else {
 #line 2694 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_reimport_editable_state_unref0 (_vala_state);
-#line 20588 "Photo.c"
+#line 20589 "Photo.c"
 	}
 #line 2694 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 20592 "Photo.c"
+#line 20593 "Photo.c"
 }
 
 
@@ -20613,7 +20614,7 @@ void photo_finish_update_editable_metadata (Photo* self, PhotoReimportEditableSt
 			g_propagate_error (error, _inner_error_);
 #line 2698 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 20615 "Photo.c"
+#line 20616 "Photo.c"
 		} else {
 #line 2698 "/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);
@@ -20621,7 +20622,7 @@ void photo_finish_update_editable_metadata (Photo* self, PhotoReimportEditableSt
 			g_clear_error (&_inner_error_);
 #line 2698 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 20623 "Photo.c"
+#line 20624 "Photo.c"
 		}
 	}
 }
@@ -20631,14 +20632,14 @@ void photo_get_raw_dimensions (Photo* self, Dimensions* result) {
 	GError * _inner_error_ = NULL;
 #line 2703 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
-#line 20633 "Photo.c"
+#line 20634 "Photo.c"
 	{
 		PhotoRow* _tmp0_ = NULL;
 #line 2704 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
 #line 2704 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 20640 "Photo.c"
+#line 20641 "Photo.c"
 		{
 			BackingPhotoRow* _tmp1_ = NULL;
 			Dimensions _tmp2_ = {0};
@@ -20648,27 +20649,27 @@ void photo_get_raw_dimensions (Photo* self, Dimensions* result) {
 			_tmp2_ = _tmp1_->dim;
 #line 2705 "/home/jens/Source/shotwell/src/Photo.vala"
 			*result = _tmp2_;
-#line 20650 "Photo.c"
+#line 20651 "Photo.c"
 			{
 				PhotoRow* _tmp3_ = NULL;
 #line 2704 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp3_ = self->row;
 #line 2704 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 20657 "Photo.c"
+#line 20658 "Photo.c"
 			}
 #line 2705 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 20661 "Photo.c"
+#line 20662 "Photo.c"
 		}
-		__finally350:
+		__finally363:
 		{
 			PhotoRow* _tmp4_ = NULL;
 #line 2704 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp4_ = self->row;
 #line 2704 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 20670 "Photo.c"
+#line 20671 "Photo.c"
 		}
 #line 2704 "/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);
@@ -20676,7 +20677,7 @@ void photo_get_raw_dimensions (Photo* self, Dimensions* result) {
 		g_clear_error (&_inner_error_);
 #line 2704 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 20678 "Photo.c"
+#line 20679 "Photo.c"
 	}
 }
 
@@ -20686,14 +20687,14 @@ gboolean photo_has_transformations (Photo* self) {
 	GError * _inner_error_ = NULL;
 #line 2709 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), FALSE);
-#line 20688 "Photo.c"
+#line 20689 "Photo.c"
 	{
 		PhotoRow* _tmp0_ = NULL;
 #line 2710 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
 #line 2710 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 20695 "Photo.c"
+#line 20696 "Photo.c"
 		{
 			gboolean _tmp1_ = FALSE;
 			PhotoRow* _tmp2_ = NULL;
@@ -20712,7 +20713,7 @@ gboolean photo_has_transformations (Photo* self) {
 			if (_tmp3_ != _tmp5_) {
 #line 2712 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp1_ = TRUE;
-#line 20714 "Photo.c"
+#line 20715 "Photo.c"
 			} else {
 				PhotoRow* _tmp6_ = NULL;
 				GeeHashMap* _tmp7_ = NULL;
@@ -20722,31 +20723,31 @@ gboolean photo_has_transformations (Photo* self) {
 				_tmp7_ = _tmp6_->transformations;
 #line 2713 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp1_ = _tmp7_ != NULL;
-#line 20724 "Photo.c"
+#line 20725 "Photo.c"
 			}
 #line 2711 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp1_;
-#line 20728 "Photo.c"
+#line 20729 "Photo.c"
 			{
 				PhotoRow* _tmp8_ = NULL;
 #line 2710 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp8_ = self->row;
 #line 2710 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 20735 "Photo.c"
+#line 20736 "Photo.c"
 			}
 #line 2711 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 20739 "Photo.c"
+#line 20740 "Photo.c"
 		}
-		__finally351:
+		__finally364:
 		{
 			PhotoRow* _tmp9_ = NULL;
 #line 2710 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp9_ = self->row;
 #line 2710 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 20748 "Photo.c"
+#line 20749 "Photo.c"
 		}
 #line 2710 "/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);
@@ -20754,7 +20755,7 @@ gboolean photo_has_transformations (Photo* self) {
 		g_clear_error (&_inner_error_);
 #line 2710 "/home/jens/Source/shotwell/src/Photo.vala"
 		return FALSE;
-#line 20756 "Photo.c"
+#line 20757 "Photo.c"
 	}
 }
 
@@ -20778,7 +20779,7 @@ gboolean photo_only_metadata_changed (Photo* self) {
 	_tmp1_ = metadata;
 #line 2721 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp1_ != NULL) {
-#line 20780 "Photo.c"
+#line 20781 "Photo.c"
 		PhotoMetadata* _tmp2_ = NULL;
 		MetadataDateTime* _tmp3_ = NULL;
 #line 2722 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -20789,7 +20790,7 @@ gboolean photo_only_metadata_changed (Photo* self) {
 		_metadata_date_time_unref0 (date_time);
 #line 2722 "/home/jens/Source/shotwell/src/Photo.vala"
 		date_time = _tmp3_;
-#line 20791 "Photo.c"
+#line 20792 "Photo.c"
 	}
 	{
 		PhotoRow* _tmp4_ = NULL;
@@ -20797,7 +20798,7 @@ gboolean photo_only_metadata_changed (Photo* self) {
 		_tmp4_ = self->row;
 #line 2724 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 20799 "Photo.c"
+#line 20800 "Photo.c"
 		{
 			gboolean _tmp5_ = FALSE;
 			PhotoRow* _tmp6_ = NULL;
@@ -20808,7 +20809,7 @@ gboolean photo_only_metadata_changed (Photo* self) {
 			_tmp7_ = _tmp6_->transformations;
 #line 2725 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp7_ == NULL) {
-#line 20810 "Photo.c"
+#line 20811 "Photo.c"
 				gboolean _tmp8_ = FALSE;
 				PhotoRow* _tmp9_ = NULL;
 				Orientation _tmp10_ = 0;
@@ -20826,7 +20827,7 @@ gboolean photo_only_metadata_changed (Photo* self) {
 				if (_tmp10_ != _tmp12_) {
 #line 2726 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp8_ = TRUE;
-#line 20828 "Photo.c"
+#line 20829 "Photo.c"
 				} else {
 					gboolean _tmp13_ = FALSE;
 					MetadataDateTime* _tmp14_ = NULL;
@@ -20834,7 +20835,7 @@ gboolean photo_only_metadata_changed (Photo* self) {
 					_tmp14_ = date_time;
 #line 2727 "/home/jens/Source/shotwell/src/Photo.vala"
 					if (_tmp14_ != NULL) {
-#line 20836 "Photo.c"
+#line 20837 "Photo.c"
 						PhotoRow* _tmp15_ = NULL;
 						time_t _tmp16_ = 0;
 						MetadataDateTime* _tmp17_ = NULL;
@@ -20849,34 +20850,34 @@ gboolean photo_only_metadata_changed (Photo* self) {
 						_tmp18_ = metadata_date_time_get_timestamp (_tmp17_);
 #line 2727 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp13_ = _tmp16_ != _tmp18_;
-#line 20851 "Photo.c"
+#line 20852 "Photo.c"
 					} else {
 #line 2727 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp13_ = FALSE;
-#line 20855 "Photo.c"
+#line 20856 "Photo.c"
 					}
 #line 2727 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp8_ = _tmp13_;
-#line 20859 "Photo.c"
+#line 20860 "Photo.c"
 				}
 #line 2726 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp5_ = _tmp8_;
-#line 20863 "Photo.c"
+#line 20864 "Photo.c"
 			} else {
 #line 2725 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp5_ = FALSE;
-#line 20867 "Photo.c"
+#line 20868 "Photo.c"
 			}
 #line 2725 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp5_;
-#line 20871 "Photo.c"
+#line 20872 "Photo.c"
 			{
 				PhotoRow* _tmp19_ = NULL;
 #line 2724 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp19_ = self->row;
 #line 2724 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 20878 "Photo.c"
+#line 20879 "Photo.c"
 			}
 #line 2725 "/home/jens/Source/shotwell/src/Photo.vala"
 			_media_metadata_unref0 (metadata);
@@ -20884,16 +20885,16 @@ gboolean photo_only_metadata_changed (Photo* self) {
 			_metadata_date_time_unref0 (date_time);
 #line 2725 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 20886 "Photo.c"
+#line 20887 "Photo.c"
 		}
-		__finally352:
+		__finally365:
 		{
 			PhotoRow* _tmp20_ = NULL;
 #line 2724 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp20_ = self->row;
 #line 2724 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 20895 "Photo.c"
+#line 20896 "Photo.c"
 		}
 #line 2724 "/home/jens/Source/shotwell/src/Photo.vala"
 		_media_metadata_unref0 (metadata);
@@ -20905,13 +20906,13 @@ gboolean photo_only_metadata_changed (Photo* self) {
 		g_clear_error (&_inner_error_);
 #line 2724 "/home/jens/Source/shotwell/src/Photo.vala"
 		return FALSE;
-#line 20907 "Photo.c"
+#line 20908 "Photo.c"
 	}
 #line 2717 "/home/jens/Source/shotwell/src/Photo.vala"
 	_media_metadata_unref0 (metadata);
 #line 2717 "/home/jens/Source/shotwell/src/Photo.vala"
 	_metadata_date_time_unref0 (date_time);
-#line 20913 "Photo.c"
+#line 20914 "Photo.c"
 }
 
 
@@ -20941,7 +20942,7 @@ gboolean photo_has_alterations (Photo* self) {
 	_tmp1_ = metadata;
 #line 2737 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp1_ != NULL) {
-#line 20943 "Photo.c"
+#line 20944 "Photo.c"
 		PhotoMetadata* _tmp2_ = NULL;
 		MetadataDateTime* _tmp3_ = NULL;
 		PhotoMetadata* _tmp4_ = NULL;
@@ -20972,20 +20973,20 @@ gboolean photo_has_alterations (Photo* self) {
 		_g_free0 (comment);
 #line 2740 "/home/jens/Source/shotwell/src/Photo.vala"
 		comment = _tmp7_;
-#line 20974 "Photo.c"
+#line 20975 "Photo.c"
 	}
 #line 2744 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp8_ = date_time;
 #line 2744 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp8_ == NULL) {
-#line 20980 "Photo.c"
+#line 20981 "Photo.c"
 		{
 			PhotoRow* _tmp9_ = NULL;
 #line 2746 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp9_ = self->row;
 #line 2746 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_lock (&self->priv->__lock_row);
-#line 20987 "Photo.c"
+#line 20988 "Photo.c"
 			{
 				BackingPhotoRow* _tmp10_ = NULL;
 				time_t _tmp11_ = 0;
@@ -21003,14 +21004,14 @@ gboolean photo_has_alterations (Photo* self) {
 				if (_tmp11_ != _tmp13_) {
 #line 2750 "/home/jens/Source/shotwell/src/Photo.vala"
 					result = TRUE;
-#line 21005 "Photo.c"
+#line 21006 "Photo.c"
 					{
 						PhotoRow* _tmp14_ = NULL;
 #line 2746 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp14_ = self->row;
 #line 2746 "/home/jens/Source/shotwell/src/Photo.vala"
 						g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 21012 "Photo.c"
+#line 21013 "Photo.c"
 					}
 #line 2750 "/home/jens/Source/shotwell/src/Photo.vala"
 					_media_metadata_unref0 (metadata);
@@ -21022,17 +21023,17 @@ gboolean photo_has_alterations (Photo* self) {
 					_metadata_date_time_unref0 (date_time);
 #line 2750 "/home/jens/Source/shotwell/src/Photo.vala"
 					return result;
-#line 21024 "Photo.c"
+#line 21025 "Photo.c"
 				}
 			}
-			__finally353:
+			__finally366:
 			{
 				PhotoRow* _tmp15_ = NULL;
 #line 2746 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp15_ = self->row;
 #line 2746 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 21034 "Photo.c"
+#line 21035 "Photo.c"
 			}
 #line 2746 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -21050,7 +21051,7 @@ gboolean photo_has_alterations (Photo* self) {
 				g_clear_error (&_inner_error_);
 #line 2746 "/home/jens/Source/shotwell/src/Photo.vala"
 				return FALSE;
-#line 21052 "Photo.c"
+#line 21053 "Photo.c"
 			}
 		}
 	}
@@ -21060,7 +21061,7 @@ gboolean photo_has_alterations (Photo* self) {
 		_tmp16_ = self->row;
 #line 2755 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 21062 "Photo.c"
+#line 21063 "Photo.c"
 		{
 			gboolean _tmp17_ = FALSE;
 			gboolean _tmp18_ = FALSE;
@@ -21076,7 +21077,7 @@ gboolean photo_has_alterations (Photo* self) {
 			if (_tmp22_ != NULL) {
 #line 2756 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp20_ = TRUE;
-#line 21078 "Photo.c"
+#line 21079 "Photo.c"
 			} else {
 				PhotoRow* _tmp23_ = NULL;
 				Orientation _tmp24_ = 0;
@@ -21092,13 +21093,13 @@ gboolean photo_has_alterations (Photo* self) {
 				_tmp26_ = _tmp25_->original_orientation;
 #line 2757 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp20_ = _tmp24_ != _tmp26_;
-#line 21094 "Photo.c"
+#line 21095 "Photo.c"
 			}
 #line 2756 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp20_) {
 #line 2756 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp19_ = TRUE;
-#line 21100 "Photo.c"
+#line 21101 "Photo.c"
 			} else {
 				gboolean _tmp27_ = FALSE;
 				MetadataDateTime* _tmp28_ = NULL;
@@ -21106,7 +21107,7 @@ gboolean photo_has_alterations (Photo* self) {
 				_tmp28_ = date_time;
 #line 2758 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp28_ != NULL) {
-#line 21108 "Photo.c"
+#line 21109 "Photo.c"
 					PhotoRow* _tmp29_ = NULL;
 					time_t _tmp30_ = 0;
 					MetadataDateTime* _tmp31_ = NULL;
@@ -21121,21 +21122,21 @@ gboolean photo_has_alterations (Photo* self) {
 					_tmp32_ = metadata_date_time_get_timestamp (_tmp31_);
 #line 2758 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp27_ = _tmp30_ != _tmp32_;
-#line 21123 "Photo.c"
+#line 21124 "Photo.c"
 				} else {
 #line 2758 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp27_ = FALSE;
-#line 21127 "Photo.c"
+#line 21128 "Photo.c"
 				}
 #line 2758 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp19_ = _tmp27_;
-#line 21131 "Photo.c"
+#line 21132 "Photo.c"
 			}
 #line 2756 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp19_) {
 #line 2756 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp18_ = TRUE;
-#line 21137 "Photo.c"
+#line 21138 "Photo.c"
 			} else {
 				gchar* _tmp33_ = NULL;
 				gchar* _tmp34_ = NULL;
@@ -21150,13 +21151,13 @@ gboolean photo_has_alterations (Photo* self) {
 				_tmp18_ = g_strcmp0 (_tmp34_, _tmp35_) != 0;
 #line 2759 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_free0 (_tmp34_);
-#line 21152 "Photo.c"
+#line 21153 "Photo.c"
 			}
 #line 2756 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp18_) {
 #line 2756 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp17_ = TRUE;
-#line 21158 "Photo.c"
+#line 21159 "Photo.c"
 			} else {
 				gchar* _tmp36_ = NULL;
 				gchar* _tmp37_ = NULL;
@@ -21171,18 +21172,18 @@ gboolean photo_has_alterations (Photo* self) {
 				_tmp17_ = g_strcmp0 (_tmp37_, _tmp38_) != 0;
 #line 2760 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_free0 (_tmp37_);
-#line 21173 "Photo.c"
+#line 21174 "Photo.c"
 			}
 #line 2756 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp17_;
-#line 21177 "Photo.c"
+#line 21178 "Photo.c"
 			{
 				PhotoRow* _tmp39_ = NULL;
 #line 2755 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp39_ = self->row;
 #line 2755 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 21184 "Photo.c"
+#line 21185 "Photo.c"
 			}
 #line 2756 "/home/jens/Source/shotwell/src/Photo.vala"
 			_media_metadata_unref0 (metadata);
@@ -21194,16 +21195,16 @@ gboolean photo_has_alterations (Photo* self) {
 			_metadata_date_time_unref0 (date_time);
 #line 2756 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 21196 "Photo.c"
+#line 21197 "Photo.c"
 		}
-		__finally354:
+		__finally367:
 		{
 			PhotoRow* _tmp40_ = NULL;
 #line 2755 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp40_ = self->row;
 #line 2755 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 21205 "Photo.c"
+#line 21206 "Photo.c"
 		}
 #line 2755 "/home/jens/Source/shotwell/src/Photo.vala"
 		_media_metadata_unref0 (metadata);
@@ -21219,7 +21220,7 @@ gboolean photo_has_alterations (Photo* self) {
 		g_clear_error (&_inner_error_);
 #line 2755 "/home/jens/Source/shotwell/src/Photo.vala"
 		return FALSE;
-#line 21221 "Photo.c"
+#line 21222 "Photo.c"
 	}
 #line 2731 "/home/jens/Source/shotwell/src/Photo.vala"
 	_media_metadata_unref0 (metadata);
@@ -21229,7 +21230,7 @@ gboolean photo_has_alterations (Photo* self) {
 	_g_free0 (title);
 #line 2731 "/home/jens/Source/shotwell/src/Photo.vala"
 	_metadata_date_time_unref0 (date_time);
-#line 21231 "Photo.c"
+#line 21232 "Photo.c"
 }
 
 
@@ -21238,14 +21239,14 @@ PhotoTransformationState* photo_save_transformation_state (Photo* self) {
 	GError * _inner_error_ = NULL;
 #line 2765 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), NULL);
-#line 21240 "Photo.c"
+#line 21241 "Photo.c"
 	{
 		PhotoRow* _tmp0_ = NULL;
 #line 2766 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
 #line 2766 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 21247 "Photo.c"
+#line 21248 "Photo.c"
 		{
 			PixelTransformer* _tmp1_ = NULL;
 			PixelTransformer* _tmp2_ = NULL;
@@ -21260,7 +21261,7 @@ PhotoTransformationState* photo_save_transformation_state (Photo* self) {
 			_tmp2_ = self->priv->transformer;
 #line 2769 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp2_ != NULL) {
-#line 21262 "Photo.c"
+#line 21263 "Photo.c"
 				PixelTransformer* _tmp3_ = NULL;
 				PixelTransformer* _tmp4_ = NULL;
 #line 2769 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -21271,19 +21272,19 @@ PhotoTransformationState* photo_save_transformation_state (Photo* self) {
 				_pixel_transformer_unref0 (_tmp1_);
 #line 2769 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp1_ = _tmp4_;
-#line 21273 "Photo.c"
+#line 21274 "Photo.c"
 			} else {
 #line 2769 "/home/jens/Source/shotwell/src/Photo.vala"
 				_pixel_transformer_unref0 (_tmp1_);
 #line 2769 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp1_ = NULL;
-#line 21279 "Photo.c"
+#line 21280 "Photo.c"
 			}
 #line 2770 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp6_ = self->priv->adjustments;
 #line 2770 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp6_ != NULL) {
-#line 21285 "Photo.c"
+#line 21286 "Photo.c"
 				PixelTransformationBundle* _tmp7_ = NULL;
 				PixelTransformationBundle* _tmp8_ = NULL;
 #line 2770 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -21294,13 +21295,13 @@ PhotoTransformationState* photo_save_transformation_state (Photo* self) {
 				_pixel_transformation_bundle_unref0 (_tmp5_);
 #line 2770 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp5_ = _tmp8_;
-#line 21296 "Photo.c"
+#line 21297 "Photo.c"
 			} else {
 #line 2770 "/home/jens/Source/shotwell/src/Photo.vala"
 				_pixel_transformation_bundle_unref0 (_tmp5_);
 #line 2770 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp5_ = NULL;
-#line 21302 "Photo.c"
+#line 21303 "Photo.c"
 			}
 #line 2767 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp9_ = self->row;
@@ -21318,27 +21319,27 @@ PhotoTransformationState* photo_save_transformation_state (Photo* self) {
 			_pixel_transformation_bundle_unref0 (_tmp5_);
 #line 2767 "/home/jens/Source/shotwell/src/Photo.vala"
 			_pixel_transformer_unref0 (_tmp1_);
-#line 21320 "Photo.c"
+#line 21321 "Photo.c"
 			{
 				PhotoRow* _tmp14_ = NULL;
 #line 2766 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp14_ = self->row;
 #line 2766 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 21327 "Photo.c"
+#line 21328 "Photo.c"
 			}
 #line 2767 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 21331 "Photo.c"
+#line 21332 "Photo.c"
 		}
-		__finally355:
+		__finally368:
 		{
 			PhotoRow* _tmp15_ = NULL;
 #line 2766 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp15_ = self->row;
 #line 2766 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 21340 "Photo.c"
+#line 21341 "Photo.c"
 		}
 #line 2766 "/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);
@@ -21346,7 +21347,7 @@ PhotoTransformationState* photo_save_transformation_state (Photo* self) {
 		g_clear_error (&_inner_error_);
 #line 2766 "/home/jens/Source/shotwell/src/Photo.vala"
 		return NULL;
-#line 21348 "Photo.c"
+#line 21349 "Photo.c"
 	}
 }
 
@@ -21354,14 +21355,14 @@ PhotoTransformationState* photo_save_transformation_state (Photo* self) {
 static gpointer _pixel_transformer_ref0 (gpointer self) {
 #line 2791 "/home/jens/Source/shotwell/src/Photo.vala"
 	return self ? pixel_transformer_ref (self) : NULL;
-#line 21356 "Photo.c"
+#line 21357 "Photo.c"
 }
 
 
 static gpointer _pixel_transformation_bundle_ref0 (gpointer self) {
 #line 2792 "/home/jens/Source/shotwell/src/Photo.vala"
 	return self ? pixel_transformation_bundle_ref (self) : NULL;
-#line 21363 "Photo.c"
+#line 21364 "Photo.c"
 }
 
 
@@ -21406,7 +21407,7 @@ gboolean photo_load_transformation_state (Photo* self, PhotoTransformationState*
 		_g_object_unref0 (state_impl);
 #line 2777 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 21408 "Photo.c"
+#line 21409 "Photo.c"
 	}
 #line 2779 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = state_impl;
@@ -21432,14 +21433,14 @@ gboolean photo_load_transformation_state (Photo* self, PhotoTransformationState*
 	_tmp10_ = photo_photo_transformation_state_impl_get_color_adjustments (_tmp9_);
 #line 2782 "/home/jens/Source/shotwell/src/Photo.vala"
 	saved_adjustments = _tmp10_;
-#line 21434 "Photo.c"
+#line 21435 "Photo.c"
 	{
 		PhotoRow* _tmp11_ = NULL;
 #line 2785 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp11_ = self->row;
 #line 2785 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 21441 "Photo.c"
+#line 21442 "Photo.c"
 		{
 			PhotoTable* _tmp12_ = NULL;
 			PhotoTable* _tmp13_ = NULL;
@@ -21471,7 +21472,7 @@ gboolean photo_load_transformation_state (Photo* self, PhotoTransformationState*
 			_tmp19_ = committed;
 #line 2788 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp19_) {
-#line 21473 "Photo.c"
+#line 21474 "Photo.c"
 				PhotoRow* _tmp20_ = NULL;
 				Orientation _tmp21_ = 0;
 				PhotoRow* _tmp22_ = NULL;
@@ -21513,17 +21514,17 @@ gboolean photo_load_transformation_state (Photo* self, PhotoTransformationState*
 				_pixel_transformation_bundle_unref0 (self->priv->adjustments);
 #line 2792 "/home/jens/Source/shotwell/src/Photo.vala"
 				self->priv->adjustments = _tmp28_;
-#line 21515 "Photo.c"
+#line 21516 "Photo.c"
 			}
 		}
-		__finally356:
+		__finally369:
 		{
 			PhotoRow* _tmp29_ = NULL;
 #line 2785 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp29_ = self->row;
 #line 2785 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 21525 "Photo.c"
+#line 21526 "Photo.c"
 		}
 #line 2785 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -21541,14 +21542,14 @@ gboolean photo_load_transformation_state (Photo* self, PhotoTransformationState*
 			g_clear_error (&_inner_error_);
 #line 2785 "/home/jens/Source/shotwell/src/Photo.vala"
 			return FALSE;
-#line 21543 "Photo.c"
+#line 21544 "Photo.c"
 		}
 	}
 #line 2796 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp30_ = committed;
 #line 2796 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp30_) {
-#line 21550 "Photo.c"
+#line 21551 "Photo.c"
 		Alteration* _tmp31_ = NULL;
 		Alteration* _tmp32_ = NULL;
 #line 2797 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -21559,7 +21560,7 @@ gboolean photo_load_transformation_state (Photo* self, PhotoTransformationState*
 		data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp32_);
 #line 2797 "/home/jens/Source/shotwell/src/Photo.vala"
 		_alteration_unref0 (_tmp32_);
-#line 21561 "Photo.c"
+#line 21562 "Photo.c"
 	}
 #line 2799 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = committed;
@@ -21573,7 +21574,7 @@ gboolean photo_load_transformation_state (Photo* self, PhotoTransformationState*
 	_g_object_unref0 (state_impl);
 #line 2799 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 21575 "Photo.c"
+#line 21576 "Photo.c"
 }
 
 
@@ -21582,7 +21583,7 @@ void photo_remove_all_transformations (Photo* self) {
 	g_return_if_fail (IS_PHOTO (self));
 #line 2803 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_internal_remove_all_transformations (self, TRUE);
-#line 21584 "Photo.c"
+#line 21585 "Photo.c"
 }
 
 
@@ -21595,14 +21596,14 @@ static void photo_internal_remove_all_transformations (Photo* self, gboolean not
 	g_return_if_fail (IS_PHOTO (self));
 #line 2807 "/home/jens/Source/shotwell/src/Photo.vala"
 	is_altered = FALSE;
-#line 21597 "Photo.c"
+#line 21598 "Photo.c"
 	{
 		PhotoRow* _tmp0_ = NULL;
 #line 2808 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
 #line 2808 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 21604 "Photo.c"
+#line 21605 "Photo.c"
 		{
 			PhotoTable* _tmp1_ = NULL;
 			PhotoTable* _tmp2_ = NULL;
@@ -21652,7 +21653,7 @@ static void photo_internal_remove_all_transformations (Photo* self, gboolean not
 			_tmp10_ = _tmp9_->original_orientation;
 #line 2815 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp8_ != _tmp10_) {
-#line 21654 "Photo.c"
+#line 21655 "Photo.c"
 				PhotoTable* _tmp11_ = NULL;
 				PhotoTable* _tmp12_ = NULL;
 				PhotoRow* _tmp13_ = NULL;
@@ -21688,17 +21689,17 @@ static void photo_internal_remove_all_transformations (Photo* self, gboolean not
 				_tmp17_->orientation = _tmp19_;
 #line 2819 "/home/jens/Source/shotwell/src/Photo.vala"
 				is_altered = TRUE;
-#line 21690 "Photo.c"
+#line 21691 "Photo.c"
 			}
 		}
-		__finally357:
+		__finally370:
 		{
 			PhotoRow* _tmp20_ = NULL;
 #line 2808 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp20_ = self->row;
 #line 2808 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 21700 "Photo.c"
+#line 21701 "Photo.c"
 		}
 #line 2808 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -21708,28 +21709,28 @@ static void photo_internal_remove_all_transformations (Photo* self, gboolean not
 			g_clear_error (&_inner_error_);
 #line 2808 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 21710 "Photo.c"
+#line 21711 "Photo.c"
 		}
 	}
 #line 2823 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp22_ = is_altered;
 #line 2823 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp22_) {
-#line 21717 "Photo.c"
+#line 21718 "Photo.c"
 		gboolean _tmp23_ = FALSE;
 #line 2823 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp23_ = notify;
 #line 2823 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp21_ = _tmp23_;
-#line 21723 "Photo.c"
+#line 21724 "Photo.c"
 	} else {
 #line 2823 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp21_ = FALSE;
-#line 21727 "Photo.c"
+#line 21728 "Photo.c"
 	}
 #line 2823 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp21_) {
-#line 21731 "Photo.c"
+#line 21732 "Photo.c"
 		Alteration* _tmp24_ = NULL;
 		Alteration* _tmp25_ = NULL;
 #line 2824 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -21740,7 +21741,7 @@ static void photo_internal_remove_all_transformations (Photo* self, gboolean not
 		data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp25_);
 #line 2824 "/home/jens/Source/shotwell/src/Photo.vala"
 		_alteration_unref0 (_tmp25_);
-#line 21742 "Photo.c"
+#line 21743 "Photo.c"
 	}
 }
 
@@ -21750,14 +21751,14 @@ Orientation photo_get_original_orientation (Photo* self) {
 	GError * _inner_error_ = NULL;
 #line 2827 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), 0);
-#line 21752 "Photo.c"
+#line 21753 "Photo.c"
 	{
 		PhotoRow* _tmp0_ = NULL;
 #line 2828 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
 #line 2828 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 21759 "Photo.c"
+#line 21760 "Photo.c"
 		{
 			BackingPhotoRow* _tmp1_ = NULL;
 			Orientation _tmp2_ = 0;
@@ -21767,27 +21768,27 @@ Orientation photo_get_original_orientation (Photo* self) {
 			_tmp2_ = _tmp1_->original_orientation;
 #line 2829 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp2_;
-#line 21769 "Photo.c"
+#line 21770 "Photo.c"
 			{
 				PhotoRow* _tmp3_ = NULL;
 #line 2828 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp3_ = self->row;
 #line 2828 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 21776 "Photo.c"
+#line 21777 "Photo.c"
 			}
 #line 2829 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 21780 "Photo.c"
+#line 21781 "Photo.c"
 		}
-		__finally358:
+		__finally371:
 		{
 			PhotoRow* _tmp4_ = NULL;
 #line 2828 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp4_ = self->row;
 #line 2828 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 21789 "Photo.c"
+#line 21790 "Photo.c"
 		}
 #line 2828 "/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);
@@ -21795,7 +21796,7 @@ Orientation photo_get_original_orientation (Photo* self) {
 		g_clear_error (&_inner_error_);
 #line 2828 "/home/jens/Source/shotwell/src/Photo.vala"
 		return 0;
-#line 21797 "Photo.c"
+#line 21798 "Photo.c"
 	}
 }
 
@@ -21805,14 +21806,14 @@ Orientation photo_get_orientation (Photo* self) {
 	GError * _inner_error_ = NULL;
 #line 2833 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), 0);
-#line 21807 "Photo.c"
+#line 21808 "Photo.c"
 	{
 		PhotoRow* _tmp0_ = NULL;
 #line 2834 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
 #line 2834 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 21814 "Photo.c"
+#line 21815 "Photo.c"
 		{
 			PhotoRow* _tmp1_ = NULL;
 			Orientation _tmp2_ = 0;
@@ -21822,27 +21823,27 @@ Orientation photo_get_orientation (Photo* self) {
 			_tmp2_ = _tmp1_->orientation;
 #line 2835 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp2_;
-#line 21824 "Photo.c"
+#line 21825 "Photo.c"
 			{
 				PhotoRow* _tmp3_ = NULL;
 #line 2834 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp3_ = self->row;
 #line 2834 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 21831 "Photo.c"
+#line 21832 "Photo.c"
 			}
 #line 2835 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 21835 "Photo.c"
+#line 21836 "Photo.c"
 		}
-		__finally359:
+		__finally372:
 		{
 			PhotoRow* _tmp4_ = NULL;
 #line 2834 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp4_ = self->row;
 #line 2834 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 21844 "Photo.c"
+#line 21845 "Photo.c"
 		}
 #line 2834 "/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);
@@ -21850,7 +21851,7 @@ Orientation photo_get_orientation (Photo* self) {
 		g_clear_error (&_inner_error_);
 #line 2834 "/home/jens/Source/shotwell/src/Photo.vala"
 		return 0;
-#line 21852 "Photo.c"
+#line 21853 "Photo.c"
 	}
 }
 
@@ -21864,14 +21865,14 @@ gboolean photo_set_orientation (Photo* self, Orientation orientation) {
 	g_return_val_if_fail (IS_PHOTO (self), FALSE);
 #line 2840 "/home/jens/Source/shotwell/src/Photo.vala"
 	committed = FALSE;
-#line 21866 "Photo.c"
+#line 21867 "Photo.c"
 	{
 		PhotoRow* _tmp0_ = NULL;
 #line 2841 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
 #line 2841 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 21873 "Photo.c"
+#line 21874 "Photo.c"
 		{
 			PhotoRow* _tmp1_ = NULL;
 			Orientation _tmp2_ = 0;
@@ -21884,7 +21885,7 @@ gboolean photo_set_orientation (Photo* self, Orientation orientation) {
 			_tmp3_ = orientation;
 #line 2842 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp2_ != _tmp3_) {
-#line 21886 "Photo.c"
+#line 21887 "Photo.c"
 				PhotoTable* _tmp4_ = NULL;
 				PhotoTable* _tmp5_ = NULL;
 				PhotoRow* _tmp6_ = NULL;
@@ -21912,7 +21913,7 @@ gboolean photo_set_orientation (Photo* self, Orientation orientation) {
 				_tmp10_ = committed;
 #line 2844 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp10_) {
-#line 21914 "Photo.c"
+#line 21915 "Photo.c"
 					PhotoRow* _tmp11_ = NULL;
 					Orientation _tmp12_ = 0;
 #line 2845 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -21921,18 +21922,18 @@ gboolean photo_set_orientation (Photo* self, Orientation orientation) {
 					_tmp12_ = orientation;
 #line 2845 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp11_->orientation = _tmp12_;
-#line 21923 "Photo.c"
+#line 21924 "Photo.c"
 				}
 			}
 		}
-		__finally360:
+		__finally373:
 		{
 			PhotoRow* _tmp13_ = NULL;
 #line 2841 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp13_ = self->row;
 #line 2841 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 21934 "Photo.c"
+#line 21935 "Photo.c"
 		}
 #line 2841 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -21942,14 +21943,14 @@ gboolean photo_set_orientation (Photo* self, Orientation orientation) {
 			g_clear_error (&_inner_error_);
 #line 2841 "/home/jens/Source/shotwell/src/Photo.vala"
 			return FALSE;
-#line 21944 "Photo.c"
+#line 21945 "Photo.c"
 		}
 	}
 #line 2849 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp14_ = committed;
 #line 2849 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp14_) {
-#line 21951 "Photo.c"
+#line 21952 "Photo.c"
 		Alteration* _tmp15_ = NULL;
 		Alteration* _tmp16_ = NULL;
 #line 2850 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -21960,13 +21961,13 @@ gboolean photo_set_orientation (Photo* self, Orientation orientation) {
 		data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp16_);
 #line 2850 "/home/jens/Source/shotwell/src/Photo.vala"
 		_alteration_unref0 (_tmp16_);
-#line 21962 "Photo.c"
+#line 21963 "Photo.c"
 	}
 #line 2852 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = committed;
 #line 2852 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 21968 "Photo.c"
+#line 21969 "Photo.c"
 }
 
 
@@ -21981,7 +21982,7 @@ gboolean photo_check_can_rotate (Photo* self) {
 	result = _tmp0_;
 #line 2856 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 21983 "Photo.c"
+#line 21984 "Photo.c"
 }
 
 
@@ -21993,7 +21994,7 @@ static void photo_real_rotate (Photo* self, Rotation rotation) {
 		_tmp0_ = self->row;
 #line 2860 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 21995 "Photo.c"
+#line 21996 "Photo.c"
 		{
 			Orientation _tmp1_ = 0;
 			Rotation _tmp2_ = 0;
@@ -22006,16 +22007,16 @@ static void photo_real_rotate (Photo* self, Rotation rotation) {
 			_tmp3_ = orientation_perform (_tmp1_, _tmp2_);
 #line 2861 "/home/jens/Source/shotwell/src/Photo.vala"
 			photo_set_orientation (self, _tmp3_);
-#line 22008 "Photo.c"
+#line 22009 "Photo.c"
 		}
-		__finally361:
+		__finally374:
 		{
 			PhotoRow* _tmp4_ = NULL;
 #line 2860 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp4_ = self->row;
 #line 2860 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 22017 "Photo.c"
+#line 22018 "Photo.c"
 		}
 #line 2860 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -22025,7 +22026,7 @@ static void photo_real_rotate (Photo* self, Rotation rotation) {
 			g_clear_error (&_inner_error_);
 #line 2860 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 22027 "Photo.c"
+#line 22028 "Photo.c"
 		}
 	}
 }
@@ -22036,7 +22037,7 @@ void photo_rotate (Photo* self, Rotation rotation) {
 	g_return_if_fail (IS_PHOTO (self));
 #line 2859 "/home/jens/Source/shotwell/src/Photo.vala"
 	PHOTO_GET_CLASS (self)->rotate (self, rotation);
-#line 22038 "Photo.c"
+#line 22039 "Photo.c"
 }
 
 
@@ -22047,14 +22048,14 @@ static gboolean photo_has_transformation (Photo* self, const gchar* name) {
 	g_return_val_if_fail (IS_PHOTO (self), FALSE);
 #line 2865 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (name != NULL, FALSE);
-#line 22049 "Photo.c"
+#line 22050 "Photo.c"
 	{
 		PhotoRow* _tmp0_ = NULL;
 #line 2866 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
 #line 2866 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 22056 "Photo.c"
+#line 22057 "Photo.c"
 		{
 			gboolean _tmp1_ = FALSE;
 			PhotoRow* _tmp2_ = NULL;
@@ -22065,7 +22066,7 @@ static gboolean photo_has_transformation (Photo* self, const gchar* name) {
 			_tmp3_ = _tmp2_->transformations;
 #line 2867 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp3_ != NULL) {
-#line 22067 "Photo.c"
+#line 22068 "Photo.c"
 				PhotoRow* _tmp4_ = NULL;
 				GeeHashMap* _tmp5_ = NULL;
 				const gchar* _tmp6_ = NULL;
@@ -22080,35 +22081,35 @@ static gboolean photo_has_transformation (Photo* self, const gchar* name) {
 				_tmp7_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp6_);
 #line 2867 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp1_ = _tmp7_;
-#line 22082 "Photo.c"
+#line 22083 "Photo.c"
 			} else {
 #line 2867 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp1_ = FALSE;
-#line 22086 "Photo.c"
+#line 22087 "Photo.c"
 			}
 #line 2867 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp1_;
-#line 22090 "Photo.c"
+#line 22091 "Photo.c"
 			{
 				PhotoRow* _tmp8_ = NULL;
 #line 2866 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp8_ = self->row;
 #line 2866 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 22097 "Photo.c"
+#line 22098 "Photo.c"
 			}
 #line 2867 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 22101 "Photo.c"
+#line 22102 "Photo.c"
 		}
-		__finally362:
+		__finally375:
 		{
 			PhotoRow* _tmp9_ = NULL;
 #line 2866 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp9_ = self->row;
 #line 2866 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 22110 "Photo.c"
+#line 22111 "Photo.c"
 		}
 #line 2866 "/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);
@@ -22116,7 +22117,7 @@ static gboolean photo_has_transformation (Photo* self, const gchar* name) {
 		g_clear_error (&_inner_error_);
 #line 2866 "/home/jens/Source/shotwell/src/Photo.vala"
 		return FALSE;
-#line 22118 "Photo.c"
+#line 22119 "Photo.c"
 	}
 }
 
@@ -22131,14 +22132,14 @@ static KeyValueMap* photo_get_transformation (Photo* self, const gchar* name) {
 	g_return_val_if_fail (name != NULL, NULL);
 #line 2875 "/home/jens/Source/shotwell/src/Photo.vala"
 	map = NULL;
-#line 22133 "Photo.c"
+#line 22134 "Photo.c"
 	{
 		PhotoRow* _tmp0_ = NULL;
 #line 2876 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
 #line 2876 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 22140 "Photo.c"
+#line 22141 "Photo.c"
 		{
 			PhotoRow* _tmp1_ = NULL;
 			GeeHashMap* _tmp2_ = NULL;
@@ -22148,7 +22149,7 @@ static KeyValueMap* photo_get_transformation (Photo* self, const gchar* name) {
 			_tmp2_ = _tmp1_->transformations;
 #line 2877 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp2_ != NULL) {
-#line 22150 "Photo.c"
+#line 22151 "Photo.c"
 				PhotoRow* _tmp3_ = NULL;
 				GeeHashMap* _tmp4_ = NULL;
 				const gchar* _tmp5_ = NULL;
@@ -22170,7 +22171,7 @@ static KeyValueMap* photo_get_transformation (Photo* self, const gchar* name) {
 				_tmp7_ = map;
 #line 2879 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp7_ != NULL) {
-#line 22172 "Photo.c"
+#line 22173 "Photo.c"
 					KeyValueMap* _tmp8_ = NULL;
 					KeyValueMap* _tmp9_ = NULL;
 #line 2880 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -22181,18 +22182,18 @@ static KeyValueMap* photo_get_transformation (Photo* self, const gchar* name) {
 					_key_value_map_unref0 (map);
 #line 2880 "/home/jens/Source/shotwell/src/Photo.vala"
 					map = _tmp9_;
-#line 22183 "Photo.c"
+#line 22184 "Photo.c"
 				}
 			}
 		}
-		__finally363:
+		__finally376:
 		{
 			PhotoRow* _tmp10_ = NULL;
 #line 2876 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp10_ = self->row;
 #line 2876 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 22194 "Photo.c"
+#line 22195 "Photo.c"
 		}
 #line 2876 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -22204,14 +22205,14 @@ static KeyValueMap* photo_get_transformation (Photo* self, const gchar* name) {
 			g_clear_error (&_inner_error_);
 #line 2876 "/home/jens/Source/shotwell/src/Photo.vala"
 			return NULL;
-#line 22206 "Photo.c"
+#line 22207 "Photo.c"
 		}
 	}
 #line 2884 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = map;
 #line 2884 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 22213 "Photo.c"
+#line 22214 "Photo.c"
 }
 
 
@@ -22222,14 +22223,14 @@ static gboolean photo_set_transformation (Photo* self, KeyValueMap* trans) {
 	g_return_val_if_fail (IS_PHOTO (self), FALSE);
 #line 2887 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_KEY_VALUE_MAP (trans), FALSE);
-#line 22224 "Photo.c"
+#line 22225 "Photo.c"
 	{
 		PhotoRow* _tmp0_ = NULL;
 #line 2888 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
 #line 2888 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 22231 "Photo.c"
+#line 22232 "Photo.c"
 		{
 			PhotoRow* _tmp1_ = NULL;
 			GeeHashMap* _tmp2_ = NULL;
@@ -22252,7 +22253,7 @@ static gboolean photo_set_transformation (Photo* self, KeyValueMap* trans) {
 			_tmp2_ = _tmp1_->transformations;
 #line 2889 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp2_ == NULL) {
-#line 22254 "Photo.c"
+#line 22255 "Photo.c"
 				PhotoRow* _tmp3_ = NULL;
 				GeeHashMap* _tmp4_ = NULL;
 #line 2890 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -22263,7 +22264,7 @@ static gboolean photo_set_transformation (Photo* self, KeyValueMap* trans) {
 				_g_object_unref0 (_tmp3_->transformations);
 #line 2890 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp3_->transformations = _tmp4_;
-#line 22265 "Photo.c"
+#line 22266 "Photo.c"
 			}
 #line 2892 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp5_ = self->row;
@@ -22299,27 +22300,27 @@ static gboolean photo_set_transformation (Photo* self, KeyValueMap* trans) {
 			_database_table_unref0 (_tmp12_);
 #line 2894 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp17_;
-#line 22301 "Photo.c"
+#line 22302 "Photo.c"
 			{
 				PhotoRow* _tmp18_ = NULL;
 #line 2888 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp18_ = self->row;
 #line 2888 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 22308 "Photo.c"
+#line 22309 "Photo.c"
 			}
 #line 2894 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 22312 "Photo.c"
+#line 22313 "Photo.c"
 		}
-		__finally364:
+		__finally377:
 		{
 			PhotoRow* _tmp19_ = NULL;
 #line 2888 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp19_ = self->row;
 #line 2888 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 22321 "Photo.c"
+#line 22322 "Photo.c"
 		}
 #line 2888 "/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);
@@ -22327,7 +22328,7 @@ static gboolean photo_set_transformation (Photo* self, KeyValueMap* trans) {
 		g_clear_error (&_inner_error_);
 #line 2888 "/home/jens/Source/shotwell/src/Photo.vala"
 		return FALSE;
-#line 22329 "Photo.c"
+#line 22330 "Photo.c"
 	}
 }
 
@@ -22343,14 +22344,14 @@ static gboolean photo_remove_transformation (Photo* self, const gchar* name) {
 	g_return_val_if_fail (IS_PHOTO (self), FALSE);
 #line 2898 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (name != NULL, FALSE);
-#line 22345 "Photo.c"
+#line 22346 "Photo.c"
 	{
 		PhotoRow* _tmp0_ = NULL;
 #line 2900 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
 #line 2900 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 22352 "Photo.c"
+#line 22353 "Photo.c"
 		{
 			PhotoRow* _tmp1_ = NULL;
 			GeeHashMap* _tmp2_ = NULL;
@@ -22366,7 +22367,7 @@ static gboolean photo_remove_transformation (Photo* self, const gchar* name) {
 			_tmp2_ = _tmp1_->transformations;
 #line 2901 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp2_ != NULL) {
-#line 22368 "Photo.c"
+#line 22369 "Photo.c"
 				PhotoRow* _tmp3_ = NULL;
 				GeeHashMap* _tmp4_ = NULL;
 				const gchar* _tmp5_ = NULL;
@@ -22395,7 +22396,7 @@ static gboolean photo_remove_transformation (Photo* self, const gchar* name) {
 				_tmp10_ = _tmp9_;
 #line 2903 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp10_ == 0) {
-#line 22397 "Photo.c"
+#line 22398 "Photo.c"
 					PhotoRow* _tmp11_ = NULL;
 #line 2904 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp11_ = self->row;
@@ -22403,12 +22404,12 @@ static gboolean photo_remove_transformation (Photo* self, const gchar* name) {
 					_g_object_unref0 (_tmp11_->transformations);
 #line 2904 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp11_->transformations = NULL;
-#line 22405 "Photo.c"
+#line 22406 "Photo.c"
 				}
 			} else {
 #line 2906 "/home/jens/Source/shotwell/src/Photo.vala"
 				altered_cache = FALSE;
-#line 22410 "Photo.c"
+#line 22411 "Photo.c"
 			}
 #line 2909 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp12_ = photo_table_get_instance ();
@@ -22426,16 +22427,16 @@ static gboolean photo_remove_transformation (Photo* self, const gchar* name) {
 			altered_persistent = _tmp17_;
 #line 2909 "/home/jens/Source/shotwell/src/Photo.vala"
 			_database_table_unref0 (_tmp13_);
-#line 22428 "Photo.c"
+#line 22429 "Photo.c"
 		}
-		__finally365:
+		__finally378:
 		{
 			PhotoRow* _tmp18_ = NULL;
 #line 2900 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp18_ = self->row;
 #line 2900 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 22437 "Photo.c"
+#line 22438 "Photo.c"
 		}
 #line 2900 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -22445,7 +22446,7 @@ static gboolean photo_remove_transformation (Photo* self, const gchar* name) {
 			g_clear_error (&_inner_error_);
 #line 2900 "/home/jens/Source/shotwell/src/Photo.vala"
 			return FALSE;
-#line 22447 "Photo.c"
+#line 22448 "Photo.c"
 		}
 	}
 #line 2913 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -22454,17 +22455,17 @@ static gboolean photo_remove_transformation (Photo* self, const gchar* name) {
 	if (_tmp20_) {
 #line 2913 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp19_ = TRUE;
-#line 22456 "Photo.c"
+#line 22457 "Photo.c"
 	} else {
 #line 2913 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp19_ = altered_persistent;
-#line 22460 "Photo.c"
+#line 22461 "Photo.c"
 	}
 #line 2913 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp19_;
 #line 2913 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 22466 "Photo.c"
+#line 22467 "Photo.c"
 }
 
 
@@ -22479,7 +22480,7 @@ gboolean photo_has_crop (Photo* self) {
 	result = _tmp0_;
 #line 2917 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 22481 "Photo.c"
+#line 22482 "Photo.c"
 }
 
 
@@ -22529,11 +22530,11 @@ gboolean photo_get_raw_crop (Photo* self, Box* crop) {
 		if (crop) {
 #line 2926 "/home/jens/Source/shotwell/src/Photo.vala"
 			*crop = _vala_crop;
-#line 22531 "Photo.c"
+#line 22532 "Photo.c"
 		}
 #line 2926 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 22535 "Photo.c"
+#line 22536 "Photo.c"
 	}
 #line 2928 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = map;
@@ -22565,40 +22566,40 @@ gboolean photo_get_raw_crop (Photo* self, Box* crop) {
 	if (_tmp13_ == -1) {
 #line 2933 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp12_ = TRUE;
-#line 22567 "Photo.c"
+#line 22568 "Photo.c"
 	} else {
 		gint _tmp14_ = 0;
 #line 2933 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp14_ = top;
 #line 2933 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp12_ = _tmp14_ == -1;
-#line 22574 "Photo.c"
+#line 22575 "Photo.c"
 	}
 #line 2933 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp12_) {
 #line 2933 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp11_ = TRUE;
-#line 22580 "Photo.c"
+#line 22581 "Photo.c"
 	} else {
 		gint _tmp15_ = 0;
 #line 2933 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp15_ = right;
 #line 2933 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp11_ = _tmp15_ == -1;
-#line 22587 "Photo.c"
+#line 22588 "Photo.c"
 	}
 #line 2933 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp11_) {
 #line 2933 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp10_ = TRUE;
-#line 22593 "Photo.c"
+#line 22594 "Photo.c"
 	} else {
 		gint _tmp16_ = 0;
 #line 2933 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp16_ = bottom;
 #line 2933 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp10_ = _tmp16_ == -1;
-#line 22600 "Photo.c"
+#line 22601 "Photo.c"
 	}
 #line 2933 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp10_) {
@@ -22610,11 +22611,11 @@ gboolean photo_get_raw_crop (Photo* self, Box* crop) {
 		if (crop) {
 #line 2934 "/home/jens/Source/shotwell/src/Photo.vala"
 			*crop = _vala_crop;
-#line 22612 "Photo.c"
+#line 22613 "Photo.c"
 		}
 #line 2934 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 22616 "Photo.c"
+#line 22617 "Photo.c"
 	}
 #line 2936 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp17_ = left;
@@ -22634,11 +22635,11 @@ gboolean photo_get_raw_crop (Photo* self, Box* crop) {
 	if (crop) {
 #line 2938 "/home/jens/Source/shotwell/src/Photo.vala"
 		*crop = _vala_crop;
-#line 22636 "Photo.c"
+#line 22637 "Photo.c"
 	}
 #line 2938 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 22640 "Photo.c"
+#line 22641 "Photo.c"
 }
 
 
@@ -22705,7 +22706,7 @@ static void photo_set_raw_crop (Photo* self, Box* crop) {
 	_tmp14_ = photo_set_transformation (self, _tmp13_);
 #line 2949 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp14_) {
-#line 22707 "Photo.c"
+#line 22708 "Photo.c"
 		Alteration* _tmp15_ = NULL;
 		Alteration* _tmp16_ = NULL;
 #line 2950 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -22716,11 +22717,11 @@ static void photo_set_raw_crop (Photo* self, Box* crop) {
 		data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp16_);
 #line 2950 "/home/jens/Source/shotwell/src/Photo.vala"
 		_alteration_unref0 (_tmp16_);
-#line 22718 "Photo.c"
+#line 22719 "Photo.c"
 	}
 #line 2942 "/home/jens/Source/shotwell/src/Photo.vala"
 	_key_value_map_unref0 (map);
-#line 22722 "Photo.c"
+#line 22723 "Photo.c"
 }
 
 
@@ -22752,11 +22753,11 @@ static gboolean photo_get_raw_straighten (Photo* self, gdouble* angle) {
 		if (angle) {
 #line 2958 "/home/jens/Source/shotwell/src/Photo.vala"
 			*angle = _vala_angle;
-#line 22754 "Photo.c"
+#line 22755 "Photo.c"
 		}
 #line 2958 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 22758 "Photo.c"
+#line 22759 "Photo.c"
 	}
 #line 2961 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = map;
@@ -22772,11 +22773,11 @@ static gboolean photo_get_raw_straighten (Photo* self, gdouble* angle) {
 	if (angle) {
 #line 2963 "/home/jens/Source/shotwell/src/Photo.vala"
 		*angle = _vala_angle;
-#line 22774 "Photo.c"
+#line 22775 "Photo.c"
 	}
 #line 2963 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 22778 "Photo.c"
+#line 22779 "Photo.c"
 }
 
 
@@ -22805,7 +22806,7 @@ static void photo_set_raw_straighten (Photo* self, gdouble theta) {
 	_tmp4_ = photo_set_transformation (self, _tmp3_);
 #line 2970 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp4_) {
-#line 22807 "Photo.c"
+#line 22808 "Photo.c"
 		Alteration* _tmp5_ = NULL;
 		Alteration* _tmp6_ = NULL;
 #line 2971 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -22816,11 +22817,11 @@ static void photo_set_raw_straighten (Photo* self, gdouble theta) {
 		data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp6_);
 #line 2971 "/home/jens/Source/shotwell/src/Photo.vala"
 		_alteration_unref0 (_tmp6_);
-#line 22818 "Photo.c"
+#line 22819 "Photo.c"
 	}
 #line 2966 "/home/jens/Source/shotwell/src/Photo.vala"
 	_key_value_map_unref0 (map);
-#line 22822 "Photo.c"
+#line 22823 "Photo.c"
 }
 
 
@@ -22852,7 +22853,7 @@ static EditingToolsRedeyeInstance* photo_get_raw_redeye_instances (Photo* self,
 	_tmp1_ = map;
 #line 2978 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp1_ == NULL) {
-#line 22854 "Photo.c"
+#line 22855 "Photo.c"
 		EditingToolsRedeyeInstance* _tmp2_ = NULL;
 		EditingToolsRedeyeInstance* _tmp3_ = NULL;
 		gint _tmp3__length1 = 0;
@@ -22866,7 +22867,7 @@ static EditingToolsRedeyeInstance* photo_get_raw_redeye_instances (Photo* self,
 		if (result_length1) {
 #line 2979 "/home/jens/Source/shotwell/src/Photo.vala"
 			*result_length1 = _tmp3__length1;
-#line 22868 "Photo.c"
+#line 22869 "Photo.c"
 		}
 #line 2979 "/home/jens/Source/shotwell/src/Photo.vala"
 		result = _tmp3_;
@@ -22874,7 +22875,7 @@ static EditingToolsRedeyeInstance* photo_get_raw_redeye_instances (Photo* self,
 		_key_value_map_unref0 (map);
 #line 2979 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 22876 "Photo.c"
+#line 22877 "Photo.c"
 	}
 #line 2981 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = map;
@@ -22904,19 +22905,19 @@ static EditingToolsRedeyeInstance* photo_get_raw_redeye_instances (Photo* self,
 	default_point.x = -1;
 #line 2988 "/home/jens/Source/shotwell/src/Photo.vala"
 	default_point.y = -1;
-#line 22906 "Photo.c"
+#line 22907 "Photo.c"
 	{
 		gint i = 0;
 #line 2990 "/home/jens/Source/shotwell/src/Photo.vala"
 		i = 0;
-#line 22911 "Photo.c"
+#line 22912 "Photo.c"
 		{
 			gboolean _tmp10_ = FALSE;
 #line 2990 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp10_ = TRUE;
 #line 2990 "/home/jens/Source/shotwell/src/Photo.vala"
 			while (TRUE) {
-#line 22918 "Photo.c"
+#line 22919 "Photo.c"
 				gint _tmp12_ = 0;
 				gint _tmp13_ = 0;
 				gchar* center_key = NULL;
@@ -22961,13 +22962,13 @@ static EditingToolsRedeyeInstance* photo_get_raw_redeye_instances (Photo* self,
 				gint _tmp46_ = 0;
 #line 2990 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (!_tmp10_) {
-#line 22963 "Photo.c"
+#line 22964 "Photo.c"
 					gint _tmp11_ = 0;
 #line 2990 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp11_ = i;
 #line 2990 "/home/jens/Source/shotwell/src/Photo.vala"
 					i = _tmp11_ + 1;
-#line 22969 "Photo.c"
+#line 22970 "Photo.c"
 				}
 #line 2990 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp10_ = FALSE;
@@ -22979,7 +22980,7 @@ static EditingToolsRedeyeInstance* photo_get_raw_redeye_instances (Photo* self,
 				if (!(_tmp12_ < _tmp13_)) {
 #line 2990 "/home/jens/Source/shotwell/src/Photo.vala"
 					break;
-#line 22981 "Photo.c"
+#line 22982 "Photo.c"
 				}
 #line 2991 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp14_ = i;
@@ -23075,7 +23076,7 @@ static EditingToolsRedeyeInstance* photo_get_raw_redeye_instances (Photo* self,
 				_g_free0 (radius_key);
 #line 2990 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_free0 (center_key);
-#line 23077 "Photo.c"
+#line 23078 "Photo.c"
 			}
 		}
 	}
@@ -23087,7 +23088,7 @@ static EditingToolsRedeyeInstance* photo_get_raw_redeye_instances (Photo* self,
 	if (result_length1) {
 #line 3002 "/home/jens/Source/shotwell/src/Photo.vala"
 		*result_length1 = _tmp47__length1;
-#line 23089 "Photo.c"
+#line 23090 "Photo.c"
 	}
 #line 3002 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp47_;
@@ -23095,7 +23096,7 @@ static EditingToolsRedeyeInstance* photo_get_raw_redeye_instances (Photo* self,
 	_key_value_map_unref0 (map);
 #line 3002 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 23097 "Photo.c"
+#line 23098 "Photo.c"
 }
 
 
@@ -23110,7 +23111,7 @@ gboolean photo_has_redeye_transformations (Photo* self) {
 	result = _tmp0_;
 #line 3006 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 23112 "Photo.c"
+#line 23113 "Photo.c"
 }
 
 
@@ -23153,7 +23154,7 @@ void photo_add_redeye_instance (Photo* self, EditingToolsRedeyeInstance* redeye)
 	_tmp1_ = map;
 #line 3012 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp1_ == NULL) {
-#line 23155 "Photo.c"
+#line 23156 "Photo.c"
 		KeyValueMap* _tmp2_ = NULL;
 		KeyValueMap* _tmp3_ = NULL;
 #line 3013 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -23166,7 +23167,7 @@ void photo_add_redeye_instance (Photo* self, EditingToolsRedeyeInstance* redeye)
 		_tmp3_ = map;
 #line 3014 "/home/jens/Source/shotwell/src/Photo.vala"
 		key_value_map_set_int (_tmp3_, "num_points", 0);
-#line 23168 "Photo.c"
+#line 23169 "Photo.c"
 	}
 #line 3017 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = map;
@@ -23226,7 +23227,7 @@ void photo_add_redeye_instance (Photo* self, EditingToolsRedeyeInstance* redeye)
 	_tmp23_ = photo_set_transformation (self, _tmp22_);
 #line 3030 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp23_) {
-#line 23228 "Photo.c"
+#line 23229 "Photo.c"
 		Alteration* _tmp24_ = NULL;
 		Alteration* _tmp25_ = NULL;
 #line 3031 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -23237,7 +23238,7 @@ void photo_add_redeye_instance (Photo* self, EditingToolsRedeyeInstance* redeye)
 		data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp25_);
 #line 3031 "/home/jens/Source/shotwell/src/Photo.vala"
 		_alteration_unref0 (_tmp25_);
-#line 23239 "Photo.c"
+#line 23240 "Photo.c"
 	}
 #line 3010 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_free0 (center_key);
@@ -23245,7 +23246,7 @@ void photo_add_redeye_instance (Photo* self, EditingToolsRedeyeInstance* redeye)
 	_g_free0 (radius_key);
 #line 3010 "/home/jens/Source/shotwell/src/Photo.vala"
 	_key_value_map_unref0 (map);
-#line 23247 "Photo.c"
+#line 23248 "Photo.c"
 }
 
 
@@ -23258,14 +23259,14 @@ static gboolean photo_calculate_pixbuf_dimensions (Photo* self, Scaling* scaling
 	g_return_val_if_fail (IS_PHOTO (self), FALSE);
 #line 3045 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (scaling != NULL, FALSE);
-#line 23260 "Photo.c"
+#line 23261 "Photo.c"
 	{
 		PhotoRow* _tmp0_ = NULL;
 #line 3047 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
 #line 3047 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 23267 "Photo.c"
+#line 23268 "Photo.c"
 		{
 			Scaling _tmp1_ = {0};
 			PhotoException _tmp2_ = 0;
@@ -23284,39 +23285,39 @@ static gboolean photo_calculate_pixbuf_dimensions (Photo* self, Scaling* scaling
 			_vala_scaled_to_viewport = _tmp4_;
 #line 3049 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp5_;
-#line 23286 "Photo.c"
+#line 23287 "Photo.c"
 			{
 				PhotoRow* _tmp6_ = NULL;
 #line 3047 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp6_ = self->row;
 #line 3047 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 23293 "Photo.c"
+#line 23294 "Photo.c"
 			}
 #line 3049 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (scaled_image) {
 #line 3049 "/home/jens/Source/shotwell/src/Photo.vala"
 				*scaled_image = _vala_scaled_image;
-#line 23299 "Photo.c"
+#line 23300 "Photo.c"
 			}
 #line 3049 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (scaled_to_viewport) {
 #line 3049 "/home/jens/Source/shotwell/src/Photo.vala"
 				*scaled_to_viewport = _vala_scaled_to_viewport;
-#line 23305 "Photo.c"
+#line 23306 "Photo.c"
 			}
 #line 3049 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 23309 "Photo.c"
+#line 23310 "Photo.c"
 		}
-		__finally366:
+		__finally379:
 		{
 			PhotoRow* _tmp7_ = NULL;
 #line 3047 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp7_ = self->row;
 #line 3047 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 23318 "Photo.c"
+#line 23319 "Photo.c"
 		}
 #line 3047 "/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);
@@ -23324,19 +23325,19 @@ static gboolean photo_calculate_pixbuf_dimensions (Photo* self, Scaling* scaling
 		g_clear_error (&_inner_error_);
 #line 3047 "/home/jens/Source/shotwell/src/Photo.vala"
 		return FALSE;
-#line 23326 "Photo.c"
+#line 23327 "Photo.c"
 	}
 #line 3045 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (scaled_image) {
 #line 3045 "/home/jens/Source/shotwell/src/Photo.vala"
 		*scaled_image = _vala_scaled_image;
-#line 23332 "Photo.c"
+#line 23333 "Photo.c"
 	}
 #line 3045 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (scaled_to_viewport) {
 #line 3045 "/home/jens/Source/shotwell/src/Photo.vala"
 		*scaled_to_viewport = _vala_scaled_to_viewport;
-#line 23338 "Photo.c"
+#line 23339 "Photo.c"
 	}
 }
 
@@ -23372,7 +23373,7 @@ static gboolean photo_locked_calculate_pixbuf_dimensions (Photo* self, Scaling*
 	_tmp1_ = scaling_is_unscaled (scaling);
 #line 3059 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp1_) {
-#line 23374 "Photo.c"
+#line 23375 "Photo.c"
 		Dimensions _tmp2_ = {0};
 		Dimensions _tmp3_ = {0};
 #line 3060 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -23389,17 +23390,17 @@ static gboolean photo_locked_calculate_pixbuf_dimensions (Photo* self, Scaling*
 		if (scaled_image) {
 #line 3063 "/home/jens/Source/shotwell/src/Photo.vala"
 			*scaled_image = _vala_scaled_image;
-#line 23391 "Photo.c"
+#line 23392 "Photo.c"
 		}
 #line 3063 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (scaled_to_viewport) {
 #line 3063 "/home/jens/Source/shotwell/src/Photo.vala"
 			*scaled_to_viewport = _vala_scaled_to_viewport;
-#line 23397 "Photo.c"
+#line 23398 "Photo.c"
 		}
 #line 3063 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 23401 "Photo.c"
+#line 23402 "Photo.c"
 	}
 #line 3066 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = photo_get_orientation (self);
@@ -23415,7 +23416,7 @@ static gboolean photo_locked_calculate_pixbuf_dimensions (Photo* self, Scaling*
 	_tmp6_ = photo_exception_allows (_tmp5_, PHOTO_EXCEPTION_CROP);
 #line 3074 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp6_) {
-#line 23417 "Photo.c"
+#line 23418 "Photo.c"
 		Box crop = {0};
 		Box _tmp7_ = {0};
 		gboolean _tmp8_ = FALSE;
@@ -23425,7 +23426,7 @@ static gboolean photo_locked_calculate_pixbuf_dimensions (Photo* self, Scaling*
 		crop = _tmp7_;
 #line 3076 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp8_) {
-#line 23427 "Photo.c"
+#line 23428 "Photo.c"
 			Dimensions rotated_raw = {0};
 			Dimensions _tmp9_ = {0};
 			PhotoException _tmp10_ = 0;
@@ -23453,7 +23454,7 @@ static gboolean photo_locked_calculate_pixbuf_dimensions (Photo* self, Scaling*
 			_tmp11_ = photo_exception_allows (_tmp10_, PHOTO_EXCEPTION_ORIENTATION);
 #line 3080 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp11_) {
-#line 23455 "Photo.c"
+#line 23456 "Photo.c"
 				Orientation _tmp12_ = 0;
 				Dimensions _tmp13_ = {0};
 				Box _tmp14_ = {0};
@@ -23479,7 +23480,7 @@ static gboolean photo_locked_calculate_pixbuf_dimensions (Photo* self, Scaling*
 				orientation_rotate_dimensions (_tmp16_, &_tmp17_, &_tmp18_);
 #line 3082 "/home/jens/Source/shotwell/src/Photo.vala"
 				rotated_raw = _tmp18_;
-#line 23481 "Photo.c"
+#line 23482 "Photo.c"
 			}
 #line 3086 "/home/jens/Source/shotwell/src/Photo.vala"
 			box_get_dimensions (&crop, &_tmp19_);
@@ -23499,7 +23500,7 @@ static gboolean photo_locked_calculate_pixbuf_dimensions (Photo* self, Scaling*
 			_tmp25_ = box_get_width (&scaled_crop);
 #line 3092 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp24_ <= _tmp25_) {
-#line 23501 "Photo.c"
+#line 23502 "Photo.c"
 				gint _tmp26_ = 0;
 				gint _tmp27_ = 0;
 #line 3093 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -23508,15 +23509,15 @@ static gboolean photo_locked_calculate_pixbuf_dimensions (Photo* self, Scaling*
 				_tmp27_ = box_get_height (&scaled_crop);
 #line 3093 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp23_ = _tmp26_ <= _tmp27_;
-#line 23510 "Photo.c"
+#line 23511 "Photo.c"
 			} else {
 #line 3092 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp23_ = FALSE;
-#line 23514 "Photo.c"
+#line 23515 "Photo.c"
 			}
 #line 3092 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp23_) {
-#line 23518 "Photo.c"
+#line 23519 "Photo.c"
 				Dimensions _tmp28_ = {0};
 				Dimensions _tmp29_ = {0};
 #line 3094 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -23533,17 +23534,17 @@ static gboolean photo_locked_calculate_pixbuf_dimensions (Photo* self, Scaling*
 				if (scaled_image) {
 #line 3097 "/home/jens/Source/shotwell/src/Photo.vala"
 					*scaled_image = _vala_scaled_image;
-#line 23535 "Photo.c"
+#line 23536 "Photo.c"
 				}
 #line 3097 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (scaled_to_viewport) {
 #line 3097 "/home/jens/Source/shotwell/src/Photo.vala"
 					*scaled_to_viewport = _vala_scaled_to_viewport;
-#line 23541 "Photo.c"
+#line 23542 "Photo.c"
 				}
 #line 3097 "/home/jens/Source/shotwell/src/Photo.vala"
 				return result;
-#line 23545 "Photo.c"
+#line 23546 "Photo.c"
 			}
 #line 3102 "/home/jens/Source/shotwell/src/Photo.vala"
 			box_get_dimensions (&crop, &_tmp30_);
@@ -23559,7 +23560,7 @@ static gboolean photo_locked_calculate_pixbuf_dimensions (Photo* self, Scaling*
 			_tmp34_ = photo_exception_allows (_tmp33_, PHOTO_EXCEPTION_ORIENTATION);
 #line 3106 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp34_) {
-#line 23561 "Photo.c"
+#line 23562 "Photo.c"
 				Orientation _tmp35_ = 0;
 				Dimensions _tmp36_ = {0};
 				Dimensions _tmp37_ = {0};
@@ -23571,7 +23572,7 @@ static gboolean photo_locked_calculate_pixbuf_dimensions (Photo* self, Scaling*
 				orientation_derotate_dimensions (_tmp35_, &_tmp36_, &_tmp37_);
 #line 3107 "/home/jens/Source/shotwell/src/Photo.vala"
 				_vala_scaled_image = _tmp37_;
-#line 23573 "Photo.c"
+#line 23574 "Photo.c"
 			}
 		}
 	}
@@ -23579,7 +23580,7 @@ static gboolean photo_locked_calculate_pixbuf_dimensions (Photo* self, Scaling*
 	_tmp38_ = dimensions_has_area (&_vala_scaled_image);
 #line 3112 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (!_tmp38_) {
-#line 23581 "Photo.c"
+#line 23582 "Photo.c"
 		Dimensions rotated_raw = {0};
 		Dimensions _tmp39_ = {0};
 		PhotoException _tmp40_ = 0;
@@ -23599,7 +23600,7 @@ static gboolean photo_locked_calculate_pixbuf_dimensions (Photo* self, Scaling*
 		_tmp41_ = photo_exception_allows (_tmp40_, PHOTO_EXCEPTION_ORIENTATION);
 #line 3115 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp41_) {
-#line 23601 "Photo.c"
+#line 23602 "Photo.c"
 			Orientation _tmp42_ = 0;
 			Dimensions _tmp43_ = {0};
 			Dimensions _tmp44_ = {0};
@@ -23611,7 +23612,7 @@ static gboolean photo_locked_calculate_pixbuf_dimensions (Photo* self, Scaling*
 			orientation_rotate_dimensions (_tmp42_, &_tmp43_, &_tmp44_);
 #line 3116 "/home/jens/Source/shotwell/src/Photo.vala"
 			rotated_raw = _tmp44_;
-#line 23613 "Photo.c"
+#line 23614 "Photo.c"
 		}
 #line 3118 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp45_ = rotated_raw;
@@ -23629,7 +23630,7 @@ static gboolean photo_locked_calculate_pixbuf_dimensions (Photo* self, Scaling*
 		_tmp49_ = photo_exception_allows (_tmp48_, PHOTO_EXCEPTION_ORIENTATION);
 #line 3122 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp49_) {
-#line 23631 "Photo.c"
+#line 23632 "Photo.c"
 			Orientation _tmp50_ = 0;
 			Dimensions _tmp51_ = {0};
 			Dimensions _tmp52_ = {0};
@@ -23641,7 +23642,7 @@ static gboolean photo_locked_calculate_pixbuf_dimensions (Photo* self, Scaling*
 			orientation_derotate_dimensions (_tmp50_, &_tmp51_, &_tmp52_);
 #line 3123 "/home/jens/Source/shotwell/src/Photo.vala"
 			_vala_scaled_image = _tmp52_;
-#line 23643 "Photo.c"
+#line 23644 "Photo.c"
 		}
 	}
 #line 3127 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -23654,7 +23655,7 @@ static gboolean photo_locked_calculate_pixbuf_dimensions (Photo* self, Scaling*
 	_tmp57_ = _tmp56_.width;
 #line 3127 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp55_ >= _tmp57_) {
-#line 23656 "Photo.c"
+#line 23657 "Photo.c"
 		Dimensions _tmp58_ = {0};
 		gint _tmp59_ = 0;
 		Dimensions _tmp60_ = {0};
@@ -23669,15 +23670,15 @@ static gboolean photo_locked_calculate_pixbuf_dimensions (Photo* self, Scaling*
 		_tmp61_ = _tmp60_.height;
 #line 3127 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp53_ = _tmp59_ >= _tmp61_;
-#line 23671 "Photo.c"
+#line 23672 "Photo.c"
 	} else {
 #line 3127 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp53_ = FALSE;
-#line 23675 "Photo.c"
+#line 23676 "Photo.c"
 	}
 #line 3127 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp53_) {
-#line 23679 "Photo.c"
+#line 23680 "Photo.c"
 		Dimensions _tmp62_ = {0};
 #line 3128 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp62_ = raw;
@@ -23689,17 +23690,17 @@ static gboolean photo_locked_calculate_pixbuf_dimensions (Photo* self, Scaling*
 		if (scaled_image) {
 #line 3130 "/home/jens/Source/shotwell/src/Photo.vala"
 			*scaled_image = _vala_scaled_image;
-#line 23691 "Photo.c"
+#line 23692 "Photo.c"
 		}
 #line 3130 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (scaled_to_viewport) {
 #line 3130 "/home/jens/Source/shotwell/src/Photo.vala"
 			*scaled_to_viewport = _vala_scaled_to_viewport;
-#line 23697 "Photo.c"
+#line 23698 "Photo.c"
 		}
 #line 3130 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 23701 "Photo.c"
+#line 23702 "Photo.c"
 	}
 #line 3133 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp63_ = dimensions_has_area (&_vala_scaled_image);
@@ -23715,17 +23716,17 @@ static gboolean photo_locked_calculate_pixbuf_dimensions (Photo* self, Scaling*
 	if (scaled_image) {
 #line 3136 "/home/jens/Source/shotwell/src/Photo.vala"
 		*scaled_image = _vala_scaled_image;
-#line 23717 "Photo.c"
+#line 23718 "Photo.c"
 	}
 #line 3136 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (scaled_to_viewport) {
 #line 3136 "/home/jens/Source/shotwell/src/Photo.vala"
 		*scaled_to_viewport = _vala_scaled_to_viewport;
-#line 23723 "Photo.c"
+#line 23724 "Photo.c"
 	}
 #line 3136 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 23727 "Photo.c"
+#line 23728 "Photo.c"
 }
 
 
@@ -23767,7 +23768,7 @@ static GdkPixbuf* photo_load_raw_pixbuf (Photo* self, Scaling* scaling, PhotoExc
 	_tmp2_ = scaling_is_unscaled (scaling);
 #line 3148 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp2_) {
-#line 23769 "Photo.c"
+#line 23770 "Photo.c"
 		GdkPixbuf* _tmp3_ = NULL;
 		PhotoFileReader* _tmp4_ = NULL;
 		GdkPixbuf* _tmp5_ = NULL;
@@ -23786,7 +23787,7 @@ static GdkPixbuf* photo_load_raw_pixbuf (Photo* self, Scaling* scaling, PhotoExc
 			_photo_file_adapter_unref0 (loader);
 #line 3153 "/home/jens/Source/shotwell/src/Photo.vala"
 			return NULL;
-#line 23788 "Photo.c"
+#line 23789 "Photo.c"
 		}
 #line 3153 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp6_ = _tmp3_;
@@ -23800,7 +23801,7 @@ static GdkPixbuf* photo_load_raw_pixbuf (Photo* self, Scaling* scaling, PhotoExc
 		_photo_file_adapter_unref0 (loader);
 #line 3153 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 23802 "Photo.c"
+#line 23803 "Photo.c"
 	}
 #line 3158 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp7_ = *scaling;
@@ -23818,7 +23819,7 @@ static GdkPixbuf* photo_load_raw_pixbuf (Photo* self, Scaling* scaling, PhotoExc
 	_tmp12_ = is_scaled;
 #line 3160 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (!_tmp12_) {
-#line 23820 "Photo.c"
+#line 23821 "Photo.c"
 		GdkPixbuf* _tmp13_ = NULL;
 		PhotoFileReader* _tmp14_ = NULL;
 		GdkPixbuf* _tmp15_ = NULL;
@@ -23837,7 +23838,7 @@ static GdkPixbuf* photo_load_raw_pixbuf (Photo* self, Scaling* scaling, PhotoExc
 			_photo_file_adapter_unref0 (loader);
 #line 3165 "/home/jens/Source/shotwell/src/Photo.vala"
 			return NULL;
-#line 23839 "Photo.c"
+#line 23840 "Photo.c"
 		}
 #line 3165 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp16_ = _tmp13_;
@@ -23851,7 +23852,7 @@ static GdkPixbuf* photo_load_raw_pixbuf (Photo* self, Scaling* scaling, PhotoExc
 		_photo_file_adapter_unref0 (loader);
 #line 3165 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 23853 "Photo.c"
+#line 23854 "Photo.c"
 	}
 #line 3168 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp17_ = loader;
@@ -23871,7 +23872,7 @@ static GdkPixbuf* photo_load_raw_pixbuf (Photo* self, Scaling* scaling, PhotoExc
 		_photo_file_adapter_unref0 (loader);
 #line 3168 "/home/jens/Source/shotwell/src/Photo.vala"
 		return NULL;
-#line 23873 "Photo.c"
+#line 23874 "Photo.c"
 	}
 #line 3176 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp21_ = pixbuf;
@@ -23887,7 +23888,7 @@ static GdkPixbuf* photo_load_raw_pixbuf (Photo* self, Scaling* scaling, PhotoExc
 	_photo_file_adapter_unref0 (loader);
 #line 3178 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 23889 "Photo.c"
+#line 23890 "Photo.c"
 }
 
 
@@ -23917,7 +23918,7 @@ GdkPixbuf* photo_get_master_pixbuf (Photo* self, Scaling* scaling, gboolean rota
 		g_propagate_error (error, _inner_error_);
 #line 3184 "/home/jens/Source/shotwell/src/Photo.vala"
 		return NULL;
-#line 23919 "Photo.c"
+#line 23920 "Photo.c"
 	}
 #line 3184 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = _tmp0_;
@@ -23929,7 +23930,7 @@ GdkPixbuf* photo_get_master_pixbuf (Photo* self, Scaling* scaling, gboolean rota
 	_g_object_unref0 (_tmp0_);
 #line 3184 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 23931 "Photo.c"
+#line 23932 "Photo.c"
 }
 
 
@@ -23959,7 +23960,7 @@ GdkPixbuf* photo_get_unmodified_pixbuf (Photo* self, Scaling* scaling, gboolean
 		g_propagate_error (error, _inner_error_);
 #line 3189 "/home/jens/Source/shotwell/src/Photo.vala"
 		return NULL;
-#line 23961 "Photo.c"
+#line 23962 "Photo.c"
 	}
 #line 3189 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = _tmp0_;
@@ -23971,7 +23972,7 @@ GdkPixbuf* photo_get_unmodified_pixbuf (Photo* self, Scaling* scaling, gboolean
 	_g_object_unref0 (_tmp0_);
 #line 3189 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 23973 "Photo.c"
+#line 23974 "Photo.c"
 }
 
 
@@ -23990,14 +23991,14 @@ static GdkPixbuf* photo_get_untransformed_pixbuf (Photo* self, Scaling* scaling,
 	g_return_val_if_fail (IS_PHOTO (self), NULL);
 #line 3193 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (scaling != NULL, NULL);
-#line 23992 "Photo.c"
+#line 23993 "Photo.c"
 	{
 		PhotoRow* _tmp0_ = NULL;
 #line 3207 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
 #line 3207 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 23999 "Photo.c"
+#line 24000 "Photo.c"
 		{
 			Scaling _tmp1_ = {0};
 			Dimensions _tmp2_ = {0};
@@ -24015,16 +24016,16 @@ static GdkPixbuf* photo_get_untransformed_pixbuf (Photo* self, Scaling* scaling,
 			_tmp4_ = photo_get_original_orientation (self);
 #line 3210 "/home/jens/Source/shotwell/src/Photo.vala"
 			original_orientation = _tmp4_;
-#line 24017 "Photo.c"
+#line 24018 "Photo.c"
 		}
-		__finally367:
+		__finally380:
 		{
 			PhotoRow* _tmp5_ = NULL;
 #line 3207 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp5_ = self->row;
 #line 3207 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 24026 "Photo.c"
+#line 24027 "Photo.c"
 		}
 #line 3207 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -24032,7 +24033,7 @@ static GdkPixbuf* photo_get_untransformed_pixbuf (Photo* self, Scaling* scaling,
 			g_propagate_error (error, _inner_error_);
 #line 3207 "/home/jens/Source/shotwell/src/Photo.vala"
 			return NULL;
-#line 24034 "Photo.c"
+#line 24035 "Photo.c"
 		}
 	}
 #line 3214 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -24049,13 +24050,13 @@ static GdkPixbuf* photo_get_untransformed_pixbuf (Photo* self, Scaling* scaling,
 		g_propagate_error (error, _inner_error_);
 #line 3214 "/home/jens/Source/shotwell/src/Photo.vala"
 		return NULL;
-#line 24051 "Photo.c"
+#line 24052 "Photo.c"
 	}
 #line 3220 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp9_ = rotate;
 #line 3220 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp9_) {
-#line 24057 "Photo.c"
+#line 24058 "Photo.c"
 		GdkPixbuf* _tmp10_ = NULL;
 		GdkPixbuf* _tmp11_ = NULL;
 #line 3221 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -24066,13 +24067,13 @@ static GdkPixbuf* photo_get_untransformed_pixbuf (Photo* self, Scaling* scaling,
 		_g_object_unref0 (pixbuf);
 #line 3221 "/home/jens/Source/shotwell/src/Photo.vala"
 		pixbuf = _tmp11_;
-#line 24068 "Photo.c"
+#line 24069 "Photo.c"
 	}
 #line 3230 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = pixbuf;
 #line 3230 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 24074 "Photo.c"
+#line 24075 "Photo.c"
 }
 
 
@@ -24100,7 +24101,7 @@ static GdkPixbuf* photo_real_get_pixbuf (PhotoSource* base, Scaling* scaling, GE
 		g_propagate_error (error, _inner_error_);
 #line 3234 "/home/jens/Source/shotwell/src/Photo.vala"
 		return NULL;
-#line 24102 "Photo.c"
+#line 24103 "Photo.c"
 	}
 #line 3234 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = _tmp0_;
@@ -24112,7 +24113,7 @@ static GdkPixbuf* photo_real_get_pixbuf (PhotoSource* base, Scaling* scaling, GE
 	_g_object_unref0 (_tmp0_);
 #line 3234 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 24114 "Photo.c"
+#line 24115 "Photo.c"
 }
 
 
@@ -24134,7 +24135,7 @@ static GdkPixbuf* photo_real_get_pixbuf (PhotoSource* base, Scaling* scaling, GE
 static gpointer _photo_cached_pixbuf_ref0 (gpointer self) {
 #line 3269 "/home/jens/Source/shotwell/src/Photo.vala"
 	return self ? photo_cached_pixbuf_ref (self) : NULL;
-#line 24136 "Photo.c"
+#line 24137 "Photo.c"
 }
 
 
@@ -24143,7 +24144,7 @@ static gboolean _photo_trim_source_pixbuf_cache_gsource_func (gpointer self) {
 	result = photo_trim_source_pixbuf_cache ();
 #line 3321 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 24145 "Photo.c"
+#line 24146 "Photo.c"
 }
 
 
@@ -24152,14 +24153,14 @@ static GdkPixbuf* photo_run_source_pixbuf_cache (Photo* locate, gboolean keep, G
 	GError * _inner_error_ = NULL;
 #line 3252 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail ((locate == NULL) || IS_PHOTO (locate), NULL);
-#line 24154 "Photo.c"
+#line 24155 "Photo.c"
 	{
 		GeeLinkedList* _tmp0_ = NULL;
 #line 3253 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = photo_source_pixbuf_cache;
 #line 3253 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&__lock_photo_source_pixbuf_cache);
-#line 24161 "Photo.c"
+#line 24162 "Photo.c"
 		{
 			PhotoCachedPixbuf* found = NULL;
 			gdouble min_elapsed = 0.0;
@@ -24193,7 +24194,7 @@ static GdkPixbuf* photo_run_source_pixbuf_cache (Photo* locate, gboolean keep, G
 			iter = _tmp2_;
 #line 3261 "/home/jens/Source/shotwell/src/Photo.vala"
 			while (TRUE) {
-#line 24195 "Photo.c"
+#line 24196 "Photo.c"
 				GeeIterator* _tmp3_ = NULL;
 				gboolean _tmp4_ = FALSE;
 				PhotoCachedPixbuf* cached_pixbuf = NULL;
@@ -24214,7 +24215,7 @@ static GdkPixbuf* photo_run_source_pixbuf_cache (Photo* locate, gboolean keep, G
 				if (!_tmp4_) {
 #line 3261 "/home/jens/Source/shotwell/src/Photo.vala"
 					break;
-#line 24216 "Photo.c"
+#line 24217 "Photo.c"
 				}
 #line 3262 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp5_ = iter;
@@ -24236,7 +24237,7 @@ static GdkPixbuf* photo_run_source_pixbuf_cache (Photo* locate, gboolean keep, G
 				_tmp12_ = locate;
 #line 3266 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp12_ != NULL) {
-#line 24238 "Photo.c"
+#line 24239 "Photo.c"
 					PhotoCachedPixbuf* _tmp13_ = NULL;
 					Photo* _tmp14_ = NULL;
 					Photo* _tmp15_ = NULL;
@@ -24251,15 +24252,15 @@ static GdkPixbuf* photo_run_source_pixbuf_cache (Photo* locate, gboolean keep, G
 					_tmp16_ = data_source_equals (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_DATA_SOURCE, DataSource), G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_DATA_SOURCE, DataSource));
 #line 3266 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp11_ = _tmp16_;
-#line 24253 "Photo.c"
+#line 24254 "Photo.c"
 				} else {
 #line 3266 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp11_ = FALSE;
-#line 24257 "Photo.c"
+#line 24258 "Photo.c"
 				}
 #line 3266 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp11_) {
-#line 24261 "Photo.c"
+#line 24262 "Photo.c"
 					GeeIterator* _tmp17_ = NULL;
 					PhotoCachedPixbuf* _tmp18_ = NULL;
 					PhotoCachedPixbuf* _tmp19_ = NULL;
@@ -24280,33 +24281,33 @@ static GdkPixbuf* photo_run_source_pixbuf_cache (Photo* locate, gboolean keep, G
 					_tmp20_ = count;
 #line 3272 "/home/jens/Source/shotwell/src/Photo.vala"
 					count = _tmp20_ + 1;
-#line 24282 "Photo.c"
+#line 24283 "Photo.c"
 				} else {
 					gdouble _tmp21_ = 0.0;
 #line 3273 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp21_ = elapsed;
 #line 3273 "/home/jens/Source/shotwell/src/Photo.vala"
 					if (_tmp21_ >= ((gdouble) PHOTO_SOURCE_PIXBUF_TIME_TO_LIVE_SEC)) {
-#line 24289 "Photo.c"
+#line 24290 "Photo.c"
 						GeeIterator* _tmp22_ = NULL;
 #line 3274 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp22_ = iter;
 #line 3274 "/home/jens/Source/shotwell/src/Photo.vala"
 						gee_iterator_remove (_tmp22_);
-#line 24295 "Photo.c"
+#line 24296 "Photo.c"
 					} else {
 						gint _tmp23_ = 0;
 #line 3275 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp23_ = count;
 #line 3275 "/home/jens/Source/shotwell/src/Photo.vala"
 						if (_tmp23_ >= PHOTO_SOURCE_PIXBUF_MAX_LRU_COUNT) {
-#line 24302 "Photo.c"
+#line 24303 "Photo.c"
 							GeeIterator* _tmp24_ = NULL;
 #line 3276 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp24_ = iter;
 #line 3276 "/home/jens/Source/shotwell/src/Photo.vala"
 							gee_iterator_remove (_tmp24_);
-#line 24308 "Photo.c"
+#line 24309 "Photo.c"
 						} else {
 							gdouble _tmp25_ = 0.0;
 							gdouble _tmp26_ = 0.0;
@@ -24324,47 +24325,47 @@ static GdkPixbuf* photo_run_source_pixbuf_cache (Photo* locate, gboolean keep, G
 							_tmp28_ = count;
 #line 3281 "/home/jens/Source/shotwell/src/Photo.vala"
 							count = _tmp28_ + 1;
-#line 24326 "Photo.c"
+#line 24327 "Photo.c"
 						}
 					}
 				}
 #line 3261 "/home/jens/Source/shotwell/src/Photo.vala"
 				_photo_cached_pixbuf_unref0 (cached_pixbuf);
-#line 24332 "Photo.c"
+#line 24333 "Photo.c"
 			}
 #line 3286 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp31_ = found;
 #line 3286 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp31_ == NULL) {
-#line 24338 "Photo.c"
+#line 24339 "Photo.c"
 				Photo* _tmp32_ = NULL;
 #line 3286 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp32_ = locate;
 #line 3286 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp30_ = _tmp32_ != NULL;
-#line 24344 "Photo.c"
+#line 24345 "Photo.c"
 			} else {
 #line 3286 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp30_ = FALSE;
-#line 24348 "Photo.c"
+#line 24349 "Photo.c"
 			}
 #line 3286 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp30_) {
-#line 24352 "Photo.c"
+#line 24353 "Photo.c"
 				gboolean _tmp33_ = FALSE;
 #line 3286 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp33_ = keep;
 #line 3286 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp29_ = _tmp33_;
-#line 24358 "Photo.c"
+#line 24359 "Photo.c"
 			} else {
 #line 3286 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp29_ = FALSE;
-#line 24362 "Photo.c"
+#line 24363 "Photo.c"
 			}
 #line 3286 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp29_) {
-#line 24366 "Photo.c"
+#line 24367 "Photo.c"
 				GdkPixbuf* _tmp34_ = NULL;
 				Photo* _tmp35_ = NULL;
 				Scaling _tmp36_ = {0};
@@ -24385,8 +24386,8 @@ static GdkPixbuf* photo_run_source_pixbuf_cache (Photo* locate, gboolean keep, G
 					_g_object_unref0 (iter);
 #line 3288 "/home/jens/Source/shotwell/src/Photo.vala"
 					_photo_cached_pixbuf_unref0 (found);
-#line 24387 "Photo.c"
-					goto __finally368;
+#line 24388 "Photo.c"
+					goto __finally381;
 				}
 #line 3287 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp38_ = locate;
@@ -24398,14 +24399,14 @@ static GdkPixbuf* photo_run_source_pixbuf_cache (Photo* locate, gboolean keep, G
 				found = _tmp39_;
 #line 3286 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (_tmp34_);
-#line 24400 "Photo.c"
+#line 24401 "Photo.c"
 			} else {
 				PhotoCachedPixbuf* _tmp40_ = NULL;
 #line 3289 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp40_ = found;
 #line 3289 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp40_ != NULL) {
-#line 24407 "Photo.c"
+#line 24408 "Photo.c"
 					PhotoCachedPixbuf* _tmp41_ = NULL;
 					GTimer* _tmp42_ = NULL;
 #line 3291 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -24414,28 +24415,28 @@ static GdkPixbuf* photo_run_source_pixbuf_cache (Photo* locate, gboolean keep, G
 					_tmp42_ = _tmp41_->last_touched;
 #line 3291 "/home/jens/Source/shotwell/src/Photo.vala"
 					g_timer_start (_tmp42_);
-#line 24416 "Photo.c"
+#line 24417 "Photo.c"
 				}
 			}
 #line 3295 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp44_ = found;
 #line 3295 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp44_ != NULL) {
-#line 24423 "Photo.c"
+#line 24424 "Photo.c"
 				gboolean _tmp45_ = FALSE;
 #line 3295 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp45_ = keep;
 #line 3295 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp43_ = _tmp45_;
-#line 24429 "Photo.c"
+#line 24430 "Photo.c"
 			} else {
 #line 3295 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp43_ = FALSE;
-#line 24433 "Photo.c"
+#line 24434 "Photo.c"
 			}
 #line 3295 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp43_) {
-#line 24437 "Photo.c"
+#line 24438 "Photo.c"
 				GeeLinkedList* _tmp46_ = NULL;
 				PhotoCachedPixbuf* _tmp47_ = NULL;
 				PhotoCachedPixbuf* _tmp48_ = NULL;
@@ -24463,7 +24464,7 @@ static GdkPixbuf* photo_run_source_pixbuf_cache (Photo* locate, gboolean keep, G
 				min_elapsed = _tmp52_;
 #line 3305 "/home/jens/Source/shotwell/src/Photo.vala"
 				while (TRUE) {
-#line 24465 "Photo.c"
+#line 24466 "Photo.c"
 					GeeLinkedList* _tmp53_ = NULL;
 					gint _tmp54_ = 0;
 					gint _tmp55_ = 0;
@@ -24480,7 +24481,7 @@ static GdkPixbuf* photo_run_source_pixbuf_cache (Photo* locate, gboolean keep, G
 					if (!(_tmp55_ > PHOTO_SOURCE_PIXBUF_MAX_LRU_COUNT)) {
 #line 3305 "/home/jens/Source/shotwell/src/Photo.vala"
 						break;
-#line 24482 "Photo.c"
+#line 24483 "Photo.c"
 					}
 #line 3306 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp56_ = photo_source_pixbuf_cache;
@@ -24490,14 +24491,14 @@ static GdkPixbuf* photo_run_source_pixbuf_cache (Photo* locate, gboolean keep, G
 					_tmp58_ = (PhotoCachedPixbuf*) _tmp57_;
 #line 3306 "/home/jens/Source/shotwell/src/Photo.vala"
 					_photo_cached_pixbuf_unref0 (_tmp58_);
-#line 24492 "Photo.c"
+#line 24493 "Photo.c"
 				}
 			}
 #line 3310 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp59_ = photo_discard_source_id;
 #line 3310 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp59_ != ((guint) 0)) {
-#line 24499 "Photo.c"
+#line 24500 "Photo.c"
 				guint _tmp60_ = 0U;
 #line 3311 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp60_ = photo_discard_source_id;
@@ -24505,7 +24506,7 @@ static GdkPixbuf* photo_run_source_pixbuf_cache (Photo* locate, gboolean keep, G
 				g_source_remove (_tmp60_);
 #line 3312 "/home/jens/Source/shotwell/src/Photo.vala"
 				photo_discard_source_id = (guint) 0;
-#line 24507 "Photo.c"
+#line 24508 "Photo.c"
 			}
 #line 3316 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp61_ = photo_source_pixbuf_cache;
@@ -24515,7 +24516,7 @@ static GdkPixbuf* photo_run_source_pixbuf_cache (Photo* locate, gboolean keep, G
 			_tmp63_ = _tmp62_;
 #line 3316 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp63_ > PHOTO_SOURCE_PIXBUF_MIN_LRU_COUNT) {
-#line 24517 "Photo.c"
+#line 24518 "Photo.c"
 				gdouble _tmp64_ = 0.0;
 				guint retry_sec = 0U;
 				gdouble _tmp65_ = 0.0;
@@ -24538,13 +24539,13 @@ static GdkPixbuf* photo_run_source_pixbuf_cache (Photo* locate, gboolean keep, G
 				_tmp68_ = g_timeout_add_seconds_full (G_PRIORITY_LOW, _tmp67_, _photo_trim_source_pixbuf_cache_gsource_func, NULL, NULL);
 #line 3321 "/home/jens/Source/shotwell/src/Photo.vala"
 				photo_discard_source_id = _tmp68_;
-#line 24540 "Photo.c"
+#line 24541 "Photo.c"
 			}
 #line 3324 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp70_ = found;
 #line 3324 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp70_ != NULL) {
-#line 24546 "Photo.c"
+#line 24547 "Photo.c"
 				PhotoCachedPixbuf* _tmp71_ = NULL;
 				GdkPixbuf* _tmp72_ = NULL;
 #line 3324 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -24553,11 +24554,11 @@ static GdkPixbuf* photo_run_source_pixbuf_cache (Photo* locate, gboolean keep, G
 				_tmp72_ = _tmp71_->pixbuf;
 #line 3324 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp69_ = _tmp72_;
-#line 24555 "Photo.c"
+#line 24556 "Photo.c"
 			} else {
 #line 3324 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp69_ = NULL;
-#line 24559 "Photo.c"
+#line 24560 "Photo.c"
 			}
 #line 3324 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp73_ = _g_object_ref0 (_tmp69_);
@@ -24567,33 +24568,33 @@ static GdkPixbuf* photo_run_source_pixbuf_cache (Photo* locate, gboolean keep, G
 			_g_object_unref0 (iter);
 #line 3324 "/home/jens/Source/shotwell/src/Photo.vala"
 			_photo_cached_pixbuf_unref0 (found);
-#line 24569 "Photo.c"
+#line 24570 "Photo.c"
 			{
 				GeeLinkedList* _tmp74_ = NULL;
 #line 3253 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp74_ = photo_source_pixbuf_cache;
 #line 3253 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&__lock_photo_source_pixbuf_cache);
-#line 24576 "Photo.c"
+#line 24577 "Photo.c"
 			}
 #line 3324 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 24580 "Photo.c"
+#line 24581 "Photo.c"
 		}
-		__finally368:
+		__finally381:
 		{
 			GeeLinkedList* _tmp75_ = NULL;
 #line 3253 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp75_ = photo_source_pixbuf_cache;
 #line 3253 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&__lock_photo_source_pixbuf_cache);
-#line 24589 "Photo.c"
+#line 24590 "Photo.c"
 		}
 #line 3253 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_propagate_error (error, _inner_error_);
 #line 3253 "/home/jens/Source/shotwell/src/Photo.vala"
 		return NULL;
-#line 24595 "Photo.c"
+#line 24596 "Photo.c"
 	}
 }
 
@@ -24612,12 +24613,12 @@ static gboolean photo_trim_source_pixbuf_cache (void) {
 		_g_object_unref0 (_tmp1_);
 #line 3330 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 24614 "Photo.c"
-			goto __catch369_g_error;
+#line 24615 "Photo.c"
+			goto __catch382_g_error;
 		}
 	}
-	goto __finally369;
-	__catch369_g_error:
+	goto __finally382;
+	__catch382_g_error:
 	{
 		GError* err = NULL;
 #line 3329 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -24626,9 +24627,9 @@ static gboolean photo_trim_source_pixbuf_cache (void) {
 		_inner_error_ = NULL;
 #line 3329 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_error_free0 (err);
-#line 24628 "Photo.c"
+#line 24629 "Photo.c"
 	}
-	__finally369:
+	__finally382:
 #line 3329 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 3329 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -24637,13 +24638,13 @@ static gboolean photo_trim_source_pixbuf_cache (void) {
 		g_clear_error (&_inner_error_);
 #line 3329 "/home/jens/Source/shotwell/src/Photo.vala"
 		return FALSE;
-#line 24639 "Photo.c"
+#line 24640 "Photo.c"
 	}
 #line 3334 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = FALSE;
 #line 3334 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 24645 "Photo.c"
+#line 24646 "Photo.c"
 }
 
 
@@ -24673,7 +24674,7 @@ GdkPixbuf* photo_get_prefetched_copy (Photo* self, GError** error) {
 		g_propagate_error (error, _inner_error_);
 #line 3343 "/home/jens/Source/shotwell/src/Photo.vala"
 		return NULL;
-#line 24675 "Photo.c"
+#line 24676 "Photo.c"
 	}
 #line 3343 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = _tmp0_;
@@ -24693,7 +24694,7 @@ GdkPixbuf* photo_get_prefetched_copy (Photo* self, GError** error) {
 	_g_object_unref0 (_tmp0_);
 #line 3343 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 24695 "Photo.c"
+#line 24696 "Photo.c"
 }
 
 
@@ -24704,7 +24705,7 @@ void photo_discard_prefetched (Photo* self) {
 	GError * _inner_error_ = NULL;
 #line 3349 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
-#line 24706 "Photo.c"
+#line 24707 "Photo.c"
 	{
 		GdkPixbuf* _tmp0_ = NULL;
 		GdkPixbuf* _tmp1_ = NULL;
@@ -24716,12 +24717,12 @@ void photo_discard_prefetched (Photo* self) {
 		_g_object_unref0 (_tmp1_);
 #line 3351 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 24718 "Photo.c"
-			goto __catch370_g_error;
+#line 24719 "Photo.c"
+			goto __catch383_g_error;
 		}
 	}
-	goto __finally370;
-	__catch370_g_error:
+	goto __finally383;
+	__catch383_g_error:
 	{
 		GError* err = NULL;
 #line 3350 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -24730,9 +24731,9 @@ void photo_discard_prefetched (Photo* self) {
 		_inner_error_ = NULL;
 #line 3350 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_error_free0 (err);
-#line 24732 "Photo.c"
+#line 24733 "Photo.c"
 	}
-	__finally370:
+	__finally383:
 #line 3350 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 3350 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -24741,7 +24742,7 @@ void photo_discard_prefetched (Photo* self) {
 		g_clear_error (&_inner_error_);
 #line 3350 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 24743 "Photo.c"
+#line 24744 "Photo.c"
 	}
 }
 
@@ -24803,21 +24804,21 @@ GdkPixbuf* photo_get_pixbuf_with_options (Photo* self, Scaling* scaling, PhotoEx
 	_tmp4_ = _tmp3_;
 #line 3380 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp4_) {
-#line 24805 "Photo.c"
+#line 24806 "Photo.c"
 		PhotoFileFormat _tmp5_ = 0;
 #line 3381 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp5_ = photo_get_master_file_format (self);
 #line 3381 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp2_ = _tmp5_ == PHOTO_FILE_FORMAT_RAW;
-#line 24811 "Photo.c"
+#line 24812 "Photo.c"
 	} else {
 #line 3380 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp2_ = FALSE;
-#line 24815 "Photo.c"
+#line 24816 "Photo.c"
 	}
 #line 3380 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp2_) {
-#line 24819 "Photo.c"
+#line 24820 "Photo.c"
 		gboolean _tmp6_ = FALSE;
 		gboolean _tmp7_ = FALSE;
 		BackingFetchMode _tmp8_ = 0;
@@ -24827,39 +24828,39 @@ GdkPixbuf* photo_get_pixbuf_with_options (Photo* self, Scaling* scaling, PhotoEx
 		if (_tmp8_ == BACKING_FETCH_MODE_BASELINE) {
 #line 3382 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp7_ = TRUE;
-#line 24829 "Photo.c"
+#line 24830 "Photo.c"
 		} else {
 			BackingFetchMode _tmp9_ = 0;
 #line 3382 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp9_ = fetch_mode;
 #line 3382 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp7_ = _tmp9_ == BACKING_FETCH_MODE_UNMODIFIED;
-#line 24836 "Photo.c"
+#line 24837 "Photo.c"
 		}
 #line 3382 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp7_) {
 #line 3382 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp6_ = TRUE;
-#line 24842 "Photo.c"
+#line 24843 "Photo.c"
 		} else {
 			BackingFetchMode _tmp10_ = 0;
 #line 3383 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp10_ = fetch_mode;
 #line 3383 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp6_ = _tmp10_ == BACKING_FETCH_MODE_SOURCE;
-#line 24849 "Photo.c"
+#line 24850 "Photo.c"
 		}
 #line 3382 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp1_ = _tmp6_;
-#line 24853 "Photo.c"
+#line 24854 "Photo.c"
 	} else {
 #line 3380 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp1_ = FALSE;
-#line 24857 "Photo.c"
+#line 24858 "Photo.c"
 	}
 #line 3380 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp1_) {
-#line 24861 "Photo.c"
+#line 24862 "Photo.c"
 		RawDeveloper _tmp11_ = 0;
 		gboolean _tmp12_ = FALSE;
 #line 3384 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -24868,21 +24869,21 @@ GdkPixbuf* photo_get_pixbuf_with_options (Photo* self, Scaling* scaling, PhotoEx
 		_tmp12_ = photo_is_raw_developer_complete (self, _tmp11_);
 #line 3384 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = !_tmp12_;
-#line 24870 "Photo.c"
+#line 24871 "Photo.c"
 	} else {
 #line 3380 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = FALSE;
-#line 24874 "Photo.c"
+#line 24875 "Photo.c"
 	}
 #line 3380 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp0_) {
-#line 24878 "Photo.c"
+#line 24879 "Photo.c"
 		RawDeveloper _tmp13_ = 0;
 #line 3385 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp13_ = photo_get_raw_developer (self);
 #line 3385 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_set_raw_developer (self, _tmp13_);
-#line 24884 "Photo.c"
+#line 24885 "Photo.c"
 	}
 #line 3390 "/home/jens/Source/shotwell/src/Photo.vala"
 	dimensions_init (&original, 0, 0);
@@ -24896,14 +24897,14 @@ GdkPixbuf* photo_get_pixbuf_with_options (Photo* self, Scaling* scaling, PhotoEx
 	_redeye_instances_size_ = redeye_instances_length1;
 #line 3395 "/home/jens/Source/shotwell/src/Photo.vala"
 	transformer = NULL;
-#line 24898 "Photo.c"
+#line 24899 "Photo.c"
 	{
 		PhotoRow* _tmp14_ = NULL;
 #line 3398 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp14_ = self->row;
 #line 3398 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 24905 "Photo.c"
+#line 24906 "Photo.c"
 		{
 			Dimensions _tmp15_ = {0};
 			PhotoException _tmp16_ = 0;
@@ -24971,7 +24972,7 @@ GdkPixbuf* photo_get_pixbuf_with_options (Photo* self, Scaling* scaling, PhotoEx
 			_tmp29_ = photo_has_color_adjustments (self);
 #line 3411 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp29_) {
-#line 24973 "Photo.c"
+#line 24974 "Photo.c"
 				PixelTransformer* _tmp30_ = NULL;
 #line 3412 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp30_ = photo_get_pixel_transformer (self);
@@ -24979,22 +24980,22 @@ GdkPixbuf* photo_get_pixbuf_with_options (Photo* self, Scaling* scaling, PhotoEx
 				_pixel_transformer_unref0 (transformer);
 #line 3412 "/home/jens/Source/shotwell/src/Photo.vala"
 				transformer = _tmp30_;
-#line 24981 "Photo.c"
+#line 24982 "Photo.c"
 			}
 #line 3414 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp31_ = photo_get_orientation (self);
 #line 3414 "/home/jens/Source/shotwell/src/Photo.vala"
 			orientation = _tmp31_;
-#line 24987 "Photo.c"
+#line 24988 "Photo.c"
 		}
-		__finally371:
+		__finally384:
 		{
 			PhotoRow* _tmp32_ = NULL;
 #line 3398 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp32_ = self->row;
 #line 3398 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 24996 "Photo.c"
+#line 24997 "Photo.c"
 		}
 #line 3398 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -25006,7 +25007,7 @@ GdkPixbuf* photo_get_pixbuf_with_options (Photo* self, Scaling* scaling, PhotoEx
 			redeye_instances = (g_free (redeye_instances), NULL);
 #line 3398 "/home/jens/Source/shotwell/src/Photo.vala"
 			return NULL;
-#line 25008 "Photo.c"
+#line 25009 "Photo.c"
 		}
 	}
 #line 3421 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -25023,7 +25024,7 @@ GdkPixbuf* photo_get_pixbuf_with_options (Photo* self, Scaling* scaling, PhotoEx
 		redeye_instances = (g_free (redeye_instances), NULL);
 #line 3421 "/home/jens/Source/shotwell/src/Photo.vala"
 		return NULL;
-#line 25025 "Photo.c"
+#line 25026 "Photo.c"
 	}
 #line 3428 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp34_ = exceptions;
@@ -25031,14 +25032,14 @@ GdkPixbuf* photo_get_pixbuf_with_options (Photo* self, Scaling* scaling, PhotoEx
 	_tmp35_ = photo_exception_allows (_tmp34_, PHOTO_EXCEPTION_REDEYE);
 #line 3428 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp35_) {
-#line 25033 "Photo.c"
+#line 25034 "Photo.c"
 		EditingToolsRedeyeInstance* _tmp36_ = NULL;
 		gint _tmp36__length1 = 0;
 #line 3433 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp36_ = redeye_instances;
 #line 3433 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp36__length1 = redeye_instances_length1;
-#line 25040 "Photo.c"
+#line 25041 "Photo.c"
 		{
 			EditingToolsRedeyeInstance* instance_collection = NULL;
 			gint instance_collection_length1 = 0;
@@ -25050,11 +25051,11 @@ GdkPixbuf* photo_get_pixbuf_with_options (Photo* self, Scaling* scaling, PhotoEx
 			instance_collection_length1 = _tmp36__length1;
 #line 3433 "/home/jens/Source/shotwell/src/Photo.vala"
 			for (instance_it = 0; instance_it < _tmp36__length1; instance_it = instance_it + 1) {
-#line 25052 "Photo.c"
+#line 25053 "Photo.c"
 				EditingToolsRedeyeInstance instance = {0};
 #line 3433 "/home/jens/Source/shotwell/src/Photo.vala"
 				instance = instance_collection[instance_it];
-#line 25056 "Photo.c"
+#line 25057 "Photo.c"
 				{
 					GdkPixbuf* _tmp37_ = NULL;
 					EditingToolsRedeyeInstance _tmp38_ = {0};
@@ -25069,7 +25070,7 @@ GdkPixbuf* photo_get_pixbuf_with_options (Photo* self, Scaling* scaling, PhotoEx
 					_g_object_unref0 (pixbuf);
 #line 3434 "/home/jens/Source/shotwell/src/Photo.vala"
 					pixbuf = _tmp39_;
-#line 25071 "Photo.c"
+#line 25072 "Photo.c"
 				}
 			}
 		}
@@ -25080,13 +25081,13 @@ GdkPixbuf* photo_get_pixbuf_with_options (Photo* self, Scaling* scaling, PhotoEx
 	_tmp41_ = photo_exception_allows (_tmp40_, PHOTO_EXCEPTION_STRAIGHTEN);
 #line 3442 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp41_) {
-#line 25082 "Photo.c"
+#line 25083 "Photo.c"
 		gboolean _tmp42_ = FALSE;
 #line 3446 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp42_ = is_straightened;
 #line 3446 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp42_) {
-#line 25088 "Photo.c"
+#line 25089 "Photo.c"
 			GdkPixbuf* _tmp43_ = NULL;
 			gdouble _tmp44_ = 0.0;
 			GdkPixbuf* _tmp45_ = NULL;
@@ -25100,7 +25101,7 @@ GdkPixbuf* photo_get_pixbuf_with_options (Photo* self, Scaling* scaling, PhotoEx
 			_g_object_unref0 (pixbuf);
 #line 3447 "/home/jens/Source/shotwell/src/Photo.vala"
 			pixbuf = _tmp45_;
-#line 25102 "Photo.c"
+#line 25103 "Photo.c"
 		}
 	}
 #line 3456 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -25109,13 +25110,13 @@ GdkPixbuf* photo_get_pixbuf_with_options (Photo* self, Scaling* scaling, PhotoEx
 	_tmp47_ = photo_exception_allows (_tmp46_, PHOTO_EXCEPTION_CROP);
 #line 3456 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp47_) {
-#line 25111 "Photo.c"
+#line 25112 "Photo.c"
 		gboolean _tmp48_ = FALSE;
 #line 3460 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp48_ = is_cropped;
 #line 3460 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp48_) {
-#line 25117 "Photo.c"
+#line 25118 "Photo.c"
 			Box _tmp49_ = {0};
 			gint _tmp50_ = 0;
 			GdkPixbuf* _tmp51_ = NULL;
@@ -25236,7 +25237,7 @@ GdkPixbuf* photo_get_pixbuf_with_options (Photo* self, Scaling* scaling, PhotoEx
 			_g_object_unref0 (pixbuf);
 #line 3471 "/home/jens/Source/shotwell/src/Photo.vala"
 			pixbuf = _tmp84_;
-#line 25238 "Photo.c"
+#line 25239 "Photo.c"
 		}
 	}
 #line 3481 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -25245,7 +25246,7 @@ GdkPixbuf* photo_get_pixbuf_with_options (Photo* self, Scaling* scaling, PhotoEx
 	_tmp86_ = photo_exception_allows (_tmp85_, PHOTO_EXCEPTION_ORIENTATION);
 #line 3481 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp86_) {
-#line 25247 "Photo.c"
+#line 25248 "Photo.c"
 		GdkPixbuf* _tmp87_ = NULL;
 		GdkPixbuf* _tmp88_ = NULL;
 #line 3485 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -25256,13 +25257,13 @@ GdkPixbuf* photo_get_pixbuf_with_options (Photo* self, Scaling* scaling, PhotoEx
 		_g_object_unref0 (pixbuf);
 #line 3485 "/home/jens/Source/shotwell/src/Photo.vala"
 		pixbuf = _tmp88_;
-#line 25258 "Photo.c"
+#line 25259 "Photo.c"
 	}
 #line 3492 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp89_ = is_scaled;
 #line 3492 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp89_) {
-#line 25264 "Photo.c"
+#line 25265 "Photo.c"
 		GdkPixbuf* _tmp90_ = NULL;
 		Dimensions _tmp91_ = {0};
 		gint _tmp92_ = 0;
@@ -25285,7 +25286,7 @@ GdkPixbuf* photo_get_pixbuf_with_options (Photo* self, Scaling* scaling, PhotoEx
 		_g_object_unref0 (pixbuf);
 #line 3496 "/home/jens/Source/shotwell/src/Photo.vala"
 		pixbuf = _tmp95_;
-#line 25287 "Photo.c"
+#line 25288 "Photo.c"
 	}
 #line 3504 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp96_ = exceptions;
@@ -25293,13 +25294,13 @@ GdkPixbuf* photo_get_pixbuf_with_options (Photo* self, Scaling* scaling, PhotoEx
 	_tmp97_ = photo_exception_allows (_tmp96_, PHOTO_EXCEPTION_ADJUST);
 #line 3504 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp97_) {
-#line 25295 "Photo.c"
+#line 25296 "Photo.c"
 		PixelTransformer* _tmp98_ = NULL;
 #line 3508 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp98_ = transformer;
 #line 3508 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp98_ != NULL) {
-#line 25301 "Photo.c"
+#line 25302 "Photo.c"
 			PixelTransformer* _tmp99_ = NULL;
 			GdkPixbuf* _tmp100_ = NULL;
 #line 3509 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -25308,28 +25309,28 @@ GdkPixbuf* photo_get_pixbuf_with_options (Photo* self, Scaling* scaling, PhotoEx
 			_tmp100_ = pixbuf;
 #line 3509 "/home/jens/Source/shotwell/src/Photo.vala"
 			pixel_transformer_transform_pixbuf (_tmp99_, _tmp100_, NULL);
-#line 25310 "Photo.c"
+#line 25311 "Photo.c"
 		}
 	}
 #line 3518 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp102_ = is_scaled;
 #line 3518 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp102_) {
-#line 25317 "Photo.c"
+#line 25318 "Photo.c"
 		gboolean _tmp103_ = FALSE;
 #line 3518 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp103_ = is_straightened;
 #line 3518 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp101_ = !_tmp103_;
-#line 25323 "Photo.c"
+#line 25324 "Photo.c"
 	} else {
 #line 3518 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp101_ = FALSE;
-#line 25327 "Photo.c"
+#line 25328 "Photo.c"
 	}
 #line 3518 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp101_) {
-#line 25331 "Photo.c"
+#line 25332 "Photo.c"
 		GdkPixbuf* _tmp104_ = NULL;
 		Dimensions _tmp105_ = {0};
 		gboolean _tmp106_ = FALSE;
@@ -25341,7 +25342,7 @@ GdkPixbuf* photo_get_pixbuf_with_options (Photo* self, Scaling* scaling, PhotoEx
 		_tmp106_ = dimensions_approx_equals (&scaled_to_viewport, &_tmp105_, PHOTO_SCALING_FUDGE);
 #line 3519 "/home/jens/Source/shotwell/src/Photo.vala"
 		_vala_assert (_tmp106_, "scaled_to_viewport.approx_equals(Dimensions.for_pixbuf(pixbuf), SCALING_FUDGE)");
-#line 25343 "Photo.c"
+#line 25344 "Photo.c"
 	}
 #line 3527 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = pixbuf;
@@ -25351,7 +25352,7 @@ GdkPixbuf* photo_get_pixbuf_with_options (Photo* self, Scaling* scaling, PhotoEx
 	redeye_instances = (g_free (redeye_instances), NULL);
 #line 3527 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 25353 "Photo.c"
+#line 25354 "Photo.c"
 }
 
 
@@ -25360,7 +25361,7 @@ static gboolean photo_real_has_user_generated_metadata (Photo* self) {
 	g_critical ("Type `%s' does not implement abstract method `photo_has_user_generated_metadata'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
 #line 3535 "/home/jens/Source/shotwell/src/Photo.vala"
 	return FALSE;
-#line 25362 "Photo.c"
+#line 25363 "Photo.c"
 }
 
 
@@ -25369,7 +25370,7 @@ gboolean photo_has_user_generated_metadata (Photo* self) {
 	g_return_val_if_fail (IS_PHOTO (self), FALSE);
 #line 3535 "/home/jens/Source/shotwell/src/Photo.vala"
 	return PHOTO_GET_CLASS (self)->has_user_generated_metadata (self);
-#line 25371 "Photo.c"
+#line 25372 "Photo.c"
 }
 
 
@@ -25378,7 +25379,7 @@ static void photo_real_set_user_metadata_for_export (Photo* self, PhotoMetadata*
 	g_critical ("Type `%s' does not implement abstract method `photo_set_user_metadata_for_export'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
 #line 3539 "/home/jens/Source/shotwell/src/Photo.vala"
 	return;
-#line 25380 "Photo.c"
+#line 25381 "Photo.c"
 }
 
 
@@ -25387,7 +25388,7 @@ void photo_set_user_metadata_for_export (Photo* self, PhotoMetadata* metadata) {
 	g_return_if_fail (IS_PHOTO (self));
 #line 3539 "/home/jens/Source/shotwell/src/Photo.vala"
 	PHOTO_GET_CLASS (self)->set_user_metadata_for_export (self, metadata);
-#line 25389 "Photo.c"
+#line 25390 "Photo.c"
 }
 
 
@@ -25400,7 +25401,7 @@ gchar* photo_get_export_basename (Photo* self, PhotoFileFormat* file_format) {
 	_tmp0_ = file_format;
 #line 3547 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp0_ != NULL) {
-#line 25402 "Photo.c"
+#line 25403 "Photo.c"
 		PhotoFileFormat* _tmp1_ = NULL;
 		PhotoFileFormatProperties* _tmp2_ = NULL;
 		PhotoFileFormatProperties* _tmp3_ = NULL;
@@ -25438,7 +25439,7 @@ gchar* photo_get_export_basename (Photo* self, PhotoFileFormat* file_format) {
 		result = _tmp9_;
 #line 3548 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 25440 "Photo.c"
+#line 25441 "Photo.c"
 	} else {
 		PhotoFileFormat _tmp10_ = 0;
 		gboolean _tmp11_ = FALSE;
@@ -25448,7 +25449,7 @@ gchar* photo_get_export_basename (Photo* self, PhotoFileFormat* file_format) {
 		_tmp11_ = photo_file_format_can_write (_tmp10_);
 #line 3550 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp11_) {
-#line 25450 "Photo.c"
+#line 25451 "Photo.c"
 			PhotoFileFormat _tmp12_ = 0;
 			PhotoFileFormatProperties* _tmp13_ = NULL;
 			PhotoFileFormatProperties* _tmp14_ = NULL;
@@ -25486,7 +25487,7 @@ gchar* photo_get_export_basename (Photo* self, PhotoFileFormat* file_format) {
 			result = _tmp20_;
 #line 3551 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 25488 "Photo.c"
+#line 25489 "Photo.c"
 		} else {
 			PhotoFileFormat _tmp21_ = 0;
 			PhotoFileFormatProperties* _tmp22_ = NULL;
@@ -25525,7 +25526,7 @@ gchar* photo_get_export_basename (Photo* self, PhotoFileFormat* file_format) {
 			result = _tmp29_;
 #line 3554 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 25527 "Photo.c"
+#line 25528 "Photo.c"
 		}
 	}
 }
@@ -25587,14 +25588,14 @@ static gboolean photo_export_fullsized_backing (Photo* self, GFile* file, gboole
 	export_reader = NULL;
 #line 3564 "/home/jens/Source/shotwell/src/Photo.vala"
 	is_master = TRUE;
-#line 25589 "Photo.c"
+#line 25590 "Photo.c"
 	{
 		PhotoBackingReaders* _tmp0_ = NULL;
 #line 3565 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->priv->readers;
 #line 3565 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_readers);
-#line 25596 "Photo.c"
+#line 25597 "Photo.c"
 		{
 			gboolean _tmp1_ = FALSE;
 			PhotoBackingReaders* _tmp2_ = NULL;
@@ -25605,7 +25606,7 @@ static gboolean photo_export_fullsized_backing (Photo* self, GFile* file, gboole
 			_tmp3_ = _tmp2_->editable;
 #line 3566 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp3_ != NULL) {
-#line 25607 "Photo.c"
+#line 25608 "Photo.c"
 				PhotoBackingReaders* _tmp4_ = NULL;
 				PhotoFileReader* _tmp5_ = NULL;
 				PhotoFileFormat _tmp6_ = 0;
@@ -25620,15 +25621,15 @@ static gboolean photo_export_fullsized_backing (Photo* self, GFile* file, gboole
 				_tmp7_ = photo_file_format_can_write_metadata (_tmp6_);
 #line 3566 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp1_ = _tmp7_;
-#line 25622 "Photo.c"
+#line 25623 "Photo.c"
 			} else {
 #line 3566 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp1_ = FALSE;
-#line 25626 "Photo.c"
+#line 25627 "Photo.c"
 			}
 #line 3566 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp1_) {
-#line 25630 "Photo.c"
+#line 25631 "Photo.c"
 				PhotoBackingReaders* _tmp8_ = NULL;
 				PhotoFileReader* _tmp9_ = NULL;
 				PhotoFileReader* _tmp10_ = NULL;
@@ -25644,7 +25645,7 @@ static gboolean photo_export_fullsized_backing (Photo* self, GFile* file, gboole
 				export_reader = _tmp10_;
 #line 3568 "/home/jens/Source/shotwell/src/Photo.vala"
 				is_master = FALSE;
-#line 25646 "Photo.c"
+#line 25647 "Photo.c"
 			} else {
 				gboolean _tmp11_ = FALSE;
 				PhotoBackingReaders* _tmp12_ = NULL;
@@ -25655,7 +25656,7 @@ static gboolean photo_export_fullsized_backing (Photo* self, GFile* file, gboole
 				_tmp13_ = _tmp12_->developer;
 #line 3569 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp13_ != NULL) {
-#line 25657 "Photo.c"
+#line 25658 "Photo.c"
 					PhotoBackingReaders* _tmp14_ = NULL;
 					PhotoFileReader* _tmp15_ = NULL;
 					PhotoFileFormat _tmp16_ = 0;
@@ -25670,15 +25671,15 @@ static gboolean photo_export_fullsized_backing (Photo* self, GFile* file, gboole
 					_tmp17_ = photo_file_format_can_write_metadata (_tmp16_);
 #line 3569 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp11_ = _tmp17_;
-#line 25672 "Photo.c"
+#line 25673 "Photo.c"
 				} else {
 #line 3569 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp11_ = FALSE;
-#line 25676 "Photo.c"
+#line 25677 "Photo.c"
 				}
 #line 3569 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp11_) {
-#line 25680 "Photo.c"
+#line 25681 "Photo.c"
 					PhotoBackingReaders* _tmp18_ = NULL;
 					PhotoFileReader* _tmp19_ = NULL;
 					PhotoFileReader* _tmp20_ = NULL;
@@ -25694,7 +25695,7 @@ static gboolean photo_export_fullsized_backing (Photo* self, GFile* file, gboole
 					export_reader = _tmp20_;
 #line 3571 "/home/jens/Source/shotwell/src/Photo.vala"
 					is_master = FALSE;
-#line 25696 "Photo.c"
+#line 25697 "Photo.c"
 				} else {
 					PhotoBackingReaders* _tmp21_ = NULL;
 					PhotoFileReader* _tmp22_ = NULL;
@@ -25710,7 +25711,7 @@ static gboolean photo_export_fullsized_backing (Photo* self, GFile* file, gboole
 					_tmp24_ = photo_file_format_can_write_metadata (_tmp23_);
 #line 3572 "/home/jens/Source/shotwell/src/Photo.vala"
 					if (_tmp24_) {
-#line 25712 "Photo.c"
+#line 25713 "Photo.c"
 						PhotoBackingReaders* _tmp25_ = NULL;
 						PhotoFileReader* _tmp26_ = NULL;
 						PhotoFileReader* _tmp27_ = NULL;
@@ -25724,19 +25725,19 @@ static gboolean photo_export_fullsized_backing (Photo* self, GFile* file, gboole
 						_photo_file_adapter_unref0 (export_reader);
 #line 3573 "/home/jens/Source/shotwell/src/Photo.vala"
 						export_reader = _tmp27_;
-#line 25726 "Photo.c"
+#line 25727 "Photo.c"
 					}
 				}
 			}
 		}
-		__finally372:
+		__finally385:
 		{
 			PhotoBackingReaders* _tmp28_ = NULL;
 #line 3565 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp28_ = self->priv->readers;
 #line 3565 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 25738 "Photo.c"
+#line 25739 "Photo.c"
 		}
 #line 3565 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -25746,7 +25747,7 @@ static gboolean photo_export_fullsized_backing (Photo* self, GFile* file, gboole
 			_photo_file_adapter_unref0 (export_reader);
 #line 3565 "/home/jens/Source/shotwell/src/Photo.vala"
 			return FALSE;
-#line 25748 "Photo.c"
+#line 25749 "Photo.c"
 		}
 	}
 #line 3577 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -25759,7 +25760,7 @@ static gboolean photo_export_fullsized_backing (Photo* self, GFile* file, gboole
 		_photo_file_adapter_unref0 (export_reader);
 #line 3578 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 25761 "Photo.c"
+#line 25762 "Photo.c"
 	}
 #line 3580 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp30_ = export_reader;
@@ -25807,7 +25808,7 @@ static gboolean photo_export_fullsized_backing (Photo* self, GFile* file, gboole
 		_photo_file_adapter_unref0 (export_reader);
 #line 3586 "/home/jens/Source/shotwell/src/Photo.vala"
 		return FALSE;
-#line 25809 "Photo.c"
+#line 25810 "Photo.c"
 	}
 #line 3589 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp43_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject));
@@ -25851,41 +25852,41 @@ static gboolean photo_export_fullsized_backing (Photo* self, GFile* file, gboole
 		_photo_file_adapter_unref0 (export_reader);
 #line 3591 "/home/jens/Source/shotwell/src/Photo.vala"
 		return FALSE;
-#line 25853 "Photo.c"
+#line 25854 "Photo.c"
 	}
 #line 3596 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp57_ = photo_has_alterations (self);
 #line 3596 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (!_tmp57_) {
-#line 25859 "Photo.c"
+#line 25860 "Photo.c"
 		gboolean _tmp58_ = FALSE;
 #line 3596 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp58_ = is_master;
 #line 3596 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp56_ = _tmp58_;
-#line 25865 "Photo.c"
+#line 25866 "Photo.c"
 	} else {
 #line 3596 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp56_ = FALSE;
-#line 25869 "Photo.c"
+#line 25870 "Photo.c"
 	}
 #line 3596 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp56_) {
-#line 25873 "Photo.c"
+#line 25874 "Photo.c"
 		gboolean _tmp59_ = FALSE;
 #line 3596 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp59_ = photo_has_user_generated_metadata (self);
 #line 3596 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp55_ = !_tmp59_;
-#line 25879 "Photo.c"
+#line 25880 "Photo.c"
 	} else {
 #line 3596 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp55_ = FALSE;
-#line 25883 "Photo.c"
+#line 25884 "Photo.c"
 	}
 #line 3596 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp55_) {
-#line 25887 "Photo.c"
+#line 25888 "Photo.c"
 		gchar* _tmp60_ = NULL;
 		gchar* _tmp61_ = NULL;
 #line 3597 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -25896,15 +25897,15 @@ static gboolean photo_export_fullsized_backing (Photo* self, GFile* file, gboole
 		_tmp54_ = _tmp61_ == NULL;
 #line 3597 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_free0 (_tmp61_);
-#line 25898 "Photo.c"
+#line 25899 "Photo.c"
 	} else {
 #line 3596 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp54_ = FALSE;
-#line 25902 "Photo.c"
+#line 25903 "Photo.c"
 	}
 #line 3596 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp54_) {
-#line 25906 "Photo.c"
+#line 25907 "Photo.c"
 		gchar* _tmp62_ = NULL;
 		gchar* _tmp63_ = NULL;
 #line 3597 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -25915,25 +25916,25 @@ static gboolean photo_export_fullsized_backing (Photo* self, GFile* file, gboole
 		_tmp53_ = _tmp63_ == NULL;
 #line 3597 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_free0 (_tmp63_);
-#line 25917 "Photo.c"
+#line 25918 "Photo.c"
 	} else {
 #line 3596 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp53_ = FALSE;
-#line 25921 "Photo.c"
+#line 25922 "Photo.c"
 	}
 #line 3596 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp53_) {
-#line 25925 "Photo.c"
+#line 25926 "Photo.c"
 		gboolean _tmp64_ = FALSE;
 #line 3597 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp64_ = export_metadata;
 #line 3597 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp52_ = _tmp64_;
-#line 25931 "Photo.c"
+#line 25932 "Photo.c"
 	} else {
 #line 3596 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp52_ = FALSE;
-#line 25935 "Photo.c"
+#line 25936 "Photo.c"
 	}
 #line 3596 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp52_) {
@@ -25949,7 +25950,7 @@ static gboolean photo_export_fullsized_backing (Photo* self, GFile* file, gboole
 		_photo_file_adapter_unref0 (export_reader);
 #line 3598 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 25951 "Photo.c"
+#line 25952 "Photo.c"
 	}
 #line 3601 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp65_ = export_reader;
@@ -25971,13 +25972,13 @@ static gboolean photo_export_fullsized_backing (Photo* self, GFile* file, gboole
 		_photo_file_adapter_unref0 (export_reader);
 #line 3601 "/home/jens/Source/shotwell/src/Photo.vala"
 		return FALSE;
-#line 25973 "Photo.c"
+#line 25974 "Photo.c"
 	}
 #line 3602 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp67_ = metadata;
 #line 3602 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp67_ == NULL) {
-#line 25979 "Photo.c"
+#line 25980 "Photo.c"
 		PhotoFileReader* _tmp68_ = NULL;
 		PhotoFileFormat _tmp69_ = 0;
 		PhotoMetadata* _tmp70_ = NULL;
@@ -25991,7 +25992,7 @@ static gboolean photo_export_fullsized_backing (Photo* self, GFile* file, gboole
 		_media_metadata_unref0 (metadata);
 #line 3603 "/home/jens/Source/shotwell/src/Photo.vala"
 		metadata = _tmp70_;
-#line 25993 "Photo.c"
+#line 25994 "Photo.c"
 	}
 #line 3605 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp71_ = writer;
@@ -26007,7 +26008,7 @@ static gboolean photo_export_fullsized_backing (Photo* self, GFile* file, gboole
 	_tmp74_ = media_source_get_exposure_time (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource));
 #line 3607 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp74_ != ((time_t) 0)) {
-#line 26009 "Photo.c"
+#line 26010 "Photo.c"
 		PhotoMetadata* _tmp75_ = NULL;
 		time_t _tmp76_ = 0;
 		MetadataDateTime* _tmp77_ = NULL;
@@ -26024,20 +26025,20 @@ static gboolean photo_export_fullsized_backing (Photo* self, GFile* file, gboole
 		photo_metadata_set_exposure_date_time (_tmp75_, _tmp78_, PHOTO_METADATA_SET_OPTION_ALL_DOMAINS);
 #line 3608 "/home/jens/Source/shotwell/src/Photo.vala"
 		_metadata_date_time_unref0 (_tmp78_);
-#line 26026 "Photo.c"
+#line 26027 "Photo.c"
 	} else {
 		PhotoMetadata* _tmp79_ = NULL;
 #line 3610 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp79_ = metadata;
 #line 3610 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_metadata_set_exposure_date_time (_tmp79_, NULL, PHOTO_METADATA_SET_OPTION_ALL_DOMAINS);
-#line 26033 "Photo.c"
+#line 26034 "Photo.c"
 	}
 #line 3612 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp80_ = export_metadata;
 #line 3612 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp80_) {
-#line 26039 "Photo.c"
+#line 26040 "Photo.c"
 		PhotoMetadata* _tmp81_ = NULL;
 		gchar* _tmp82_ = NULL;
 		gchar* _tmp83_ = NULL;
@@ -26069,7 +26070,7 @@ static gboolean photo_export_fullsized_backing (Photo* self, GFile* file, gboole
 #line 3615 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp86_ = _tmp85_;
 #line 3615 "/home/jens/Source/shotwell/src/Photo.vala"
-		photo_metadata_set_comment (_tmp84_, _tmp86_);
+		photo_metadata_set_comment (_tmp84_, _tmp86_, PHOTO_METADATA_SET_OPTION_ALL_DOMAINS);
 #line 3615 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_free0 (_tmp86_);
 #line 3616 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -26094,26 +26095,26 @@ static gboolean photo_export_fullsized_backing (Photo* self, GFile* file, gboole
 		_tmp93_ = photo_get_original_orientation (self);
 #line 3620 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp92_ != _tmp93_) {
-#line 26096 "Photo.c"
+#line 26097 "Photo.c"
 			PhotoMetadata* _tmp94_ = NULL;
 #line 3621 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp94_ = metadata;
 #line 3621 "/home/jens/Source/shotwell/src/Photo.vala"
 			photo_metadata_remove_exif_thumbnail (_tmp94_);
-#line 26102 "Photo.c"
+#line 26103 "Photo.c"
 		}
 #line 3623 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp95_ = metadata;
 #line 3623 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_set_user_metadata_for_export (self, _tmp95_);
-#line 26108 "Photo.c"
+#line 26109 "Photo.c"
 	} else {
 		PhotoMetadata* _tmp96_ = NULL;
 #line 3627 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp96_ = metadata;
 #line 3627 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_metadata_clear (_tmp96_);
-#line 26115 "Photo.c"
+#line 26116 "Photo.c"
 	}
 #line 3629 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp97_ = writer;
@@ -26137,7 +26138,7 @@ static gboolean photo_export_fullsized_backing (Photo* self, GFile* file, gboole
 		_photo_file_adapter_unref0 (export_reader);
 #line 3629 "/home/jens/Source/shotwell/src/Photo.vala"
 		return FALSE;
-#line 26139 "Photo.c"
+#line 26140 "Photo.c"
 	}
 #line 3631 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = TRUE;
@@ -26153,7 +26154,7 @@ static gboolean photo_export_fullsized_backing (Photo* self, GFile* file, gboole
 	_photo_file_adapter_unref0 (export_reader);
 #line 3631 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 26155 "Photo.c"
+#line 26156 "Photo.c"
 }
 
 
@@ -26173,33 +26174,33 @@ gboolean photo_is_export_required (Photo* self, Scaling* scaling, PhotoFileForma
 	if (!_tmp3_) {
 #line 3638 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp2_ = TRUE;
-#line 26175 "Photo.c"
+#line 26176 "Photo.c"
 	} else {
 		gboolean _tmp4_ = FALSE;
 #line 3638 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp4_ = photo_has_alterations (self);
 #line 3638 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp2_ = _tmp4_;
-#line 26182 "Photo.c"
+#line 26183 "Photo.c"
 	}
 #line 3638 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp2_) {
 #line 3638 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp1_ = TRUE;
-#line 26188 "Photo.c"
+#line 26189 "Photo.c"
 	} else {
 		gboolean _tmp5_ = FALSE;
 #line 3638 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp5_ = photo_has_user_generated_metadata (self);
 #line 3638 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp1_ = _tmp5_;
-#line 26195 "Photo.c"
+#line 26196 "Photo.c"
 	}
 #line 3638 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp1_) {
 #line 3638 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = TRUE;
-#line 26201 "Photo.c"
+#line 26202 "Photo.c"
 	} else {
 		PhotoFileFormat _tmp6_ = 0;
 		PhotoFileFormat _tmp7_ = 0;
@@ -26209,13 +26210,13 @@ gboolean photo_is_export_required (Photo* self, Scaling* scaling, PhotoFileForma
 		_tmp7_ = photo_get_file_format (self);
 #line 3639 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = _tmp6_ != _tmp7_;
-#line 26211 "Photo.c"
+#line 26212 "Photo.c"
 	}
 #line 3638 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp0_;
 #line 3638 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 26217 "Photo.c"
+#line 26218 "Photo.c"
 }
 
 
@@ -26277,7 +26278,7 @@ void photo_export (Photo* self, GFile* dest_file, Scaling* scaling, JpegQuality
 	_tmp0_ = direct_copy_unmodified;
 #line 3647 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp0_) {
-#line 26279 "Photo.c"
+#line 26280 "Photo.c"
 		GFile* _tmp1_ = NULL;
 		GFile* _tmp2_ = NULL;
 		GFile* _tmp3_ = NULL;
@@ -26297,17 +26298,17 @@ void photo_export (Photo* self, GFile* dest_file, Scaling* scaling, JpegQuality
 			g_propagate_error (error, _inner_error_);
 #line 3648 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 26299 "Photo.c"
+#line 26300 "Photo.c"
 		}
 #line 3650 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 26303 "Photo.c"
+#line 26304 "Photo.c"
 	}
 #line 3657 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp7_ = scaling_is_unscaled (scaling);
 #line 3657 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp7_) {
-#line 26309 "Photo.c"
+#line 26310 "Photo.c"
 		gboolean _tmp8_ = FALSE;
 		gboolean _tmp9_ = FALSE;
 #line 3657 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -26316,26 +26317,26 @@ void photo_export (Photo* self, GFile* dest_file, Scaling* scaling, JpegQuality
 		if (!_tmp9_) {
 #line 3657 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp8_ = TRUE;
-#line 26318 "Photo.c"
+#line 26319 "Photo.c"
 		} else {
 			gboolean _tmp10_ = FALSE;
 #line 3657 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp10_ = photo_only_metadata_changed (self);
 #line 3657 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp8_ = _tmp10_;
-#line 26325 "Photo.c"
+#line 26326 "Photo.c"
 		}
 #line 3657 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp6_ = _tmp8_;
-#line 26329 "Photo.c"
+#line 26330 "Photo.c"
 	} else {
 #line 3657 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp6_ = FALSE;
-#line 26333 "Photo.c"
+#line 26334 "Photo.c"
 	}
 #line 3657 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp6_) {
-#line 26337 "Photo.c"
+#line 26338 "Photo.c"
 		PhotoFileFormat _tmp11_ = 0;
 		PhotoFileFormat _tmp12_ = 0;
 #line 3658 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -26344,29 +26345,29 @@ void photo_export (Photo* self, GFile* dest_file, Scaling* scaling, JpegQuality
 		_tmp12_ = photo_get_file_format (self);
 #line 3658 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp5_ = _tmp11_ == _tmp12_;
-#line 26346 "Photo.c"
+#line 26347 "Photo.c"
 	} else {
 #line 3657 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp5_ = FALSE;
-#line 26350 "Photo.c"
+#line 26351 "Photo.c"
 	}
 #line 3657 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp5_) {
-#line 26354 "Photo.c"
+#line 26355 "Photo.c"
 		PhotoFileFormat _tmp13_ = 0;
 #line 3658 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp13_ = photo_get_file_format (self);
 #line 3658 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp4_ = _tmp13_ == PHOTO_FILE_FORMAT_JFIF;
-#line 26360 "Photo.c"
+#line 26361 "Photo.c"
 	} else {
 #line 3657 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp4_ = FALSE;
-#line 26364 "Photo.c"
+#line 26365 "Photo.c"
 	}
 #line 3657 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp4_) {
-#line 26368 "Photo.c"
+#line 26369 "Photo.c"
 		gboolean _tmp14_ = FALSE;
 		GFile* _tmp15_ = NULL;
 		gboolean _tmp16_ = FALSE;
@@ -26385,13 +26386,13 @@ void photo_export (Photo* self, GFile* dest_file, Scaling* scaling, JpegQuality
 			g_propagate_error (error, _inner_error_);
 #line 3659 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 26387 "Photo.c"
+#line 26388 "Photo.c"
 		}
 #line 3659 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp14_) {
 #line 3660 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 26393 "Photo.c"
+#line 26394 "Photo.c"
 		}
 	}
 #line 3666 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -26402,7 +26403,7 @@ void photo_export (Photo* self, GFile* dest_file, Scaling* scaling, JpegQuality
 	_tmp19_ = metadata;
 #line 3667 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp19_ == NULL) {
-#line 26404 "Photo.c"
+#line 26405 "Photo.c"
 		PhotoFileFormat _tmp20_ = 0;
 		PhotoMetadata* _tmp21_ = NULL;
 #line 3668 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -26413,7 +26414,7 @@ void photo_export (Photo* self, GFile* dest_file, Scaling* scaling, JpegQuality
 		_media_metadata_unref0 (metadata);
 #line 3668 "/home/jens/Source/shotwell/src/Photo.vala"
 		metadata = _tmp21_;
-#line 26415 "Photo.c"
+#line 26416 "Photo.c"
 	}
 #line 3670 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp22_ = export_format;
@@ -26421,13 +26422,13 @@ void photo_export (Photo* self, GFile* dest_file, Scaling* scaling, JpegQuality
 	_tmp23_ = photo_file_format_can_write (_tmp22_);
 #line 3670 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (!_tmp23_) {
-#line 26423 "Photo.c"
+#line 26424 "Photo.c"
 		PhotoFileFormat _tmp24_ = 0;
 #line 3671 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp24_ = photo_file_format_get_system_default_format ();
 #line 3671 "/home/jens/Source/shotwell/src/Photo.vala"
 		export_format = _tmp24_;
-#line 26429 "Photo.c"
+#line 26430 "Photo.c"
 	}
 #line 3673 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp25_ = export_format;
@@ -26453,7 +26454,7 @@ void photo_export (Photo* self, GFile* dest_file, Scaling* scaling, JpegQuality
 		_media_metadata_unref0 (metadata);
 #line 3673 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 26455 "Photo.c"
+#line 26456 "Photo.c"
 	}
 #line 3675 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp31_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject));
@@ -26482,18 +26483,18 @@ void photo_export (Photo* self, GFile* dest_file, Scaling* scaling, JpegQuality
 	if (_tmp39_ == PHOTO_FILE_FORMAT_JFIF) {
 #line 3682 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp38_ = TRUE;
-#line 26483 "Photo.c"
+#line 26484 "Photo.c"
 	} else {
 		PhotoFileFormat _tmp40_ = 0;
 #line 3683 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp40_ = photo_get_file_format (self);
 #line 3683 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp38_ = _tmp40_ == PHOTO_FILE_FORMAT_RAW;
-#line 26490 "Photo.c"
+#line 26491 "Photo.c"
 	}
 #line 3682 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp38_) {
-#line 26494 "Photo.c"
+#line 26495 "Photo.c"
 		GdkPixbuf* _tmp41_ = NULL;
 		Scaling _tmp42_ = {0};
 		GdkPixbuf* _tmp43_ = NULL;
@@ -26516,7 +26517,7 @@ void photo_export (Photo* self, GFile* dest_file, Scaling* scaling, JpegQuality
 			_media_metadata_unref0 (metadata);
 #line 3684 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 26517 "Photo.c"
+#line 26518 "Photo.c"
 		}
 #line 3684 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp44_ = _tmp41_;
@@ -26528,7 +26529,7 @@ void photo_export (Photo* self, GFile* dest_file, Scaling* scaling, JpegQuality
 		pixbuf = _tmp44_;
 #line 3682 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_tmp41_);
-#line 26529 "Photo.c"
+#line 26530 "Photo.c"
 	} else {
 		GdkPixbuf* _tmp45_ = NULL;
 		Scaling _tmp46_ = {0};
@@ -26552,7 +26553,7 @@ void photo_export (Photo* self, GFile* dest_file, Scaling* scaling, JpegQuality
 			_media_metadata_unref0 (metadata);
 #line 3688 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 26553 "Photo.c"
+#line 26554 "Photo.c"
 		}
 #line 3688 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp48_ = _tmp45_;
@@ -26564,7 +26565,7 @@ void photo_export (Photo* self, GFile* dest_file, Scaling* scaling, JpegQuality
 		pixbuf = _tmp48_;
 #line 3682 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_tmp45_);
-#line 26565 "Photo.c"
+#line 26566 "Photo.c"
 	}
 #line 3692 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp49_ = writer;
@@ -26586,7 +26587,7 @@ void photo_export (Photo* self, GFile* dest_file, Scaling* scaling, JpegQuality
 		_media_metadata_unref0 (metadata);
 #line 3692 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 26587 "Photo.c"
+#line 26588 "Photo.c"
 	}
 #line 3694 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp52_ = writer;
@@ -26602,7 +26603,7 @@ void photo_export (Photo* self, GFile* dest_file, Scaling* scaling, JpegQuality
 	_tmp55_ = export_metadata;
 #line 3697 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp55_) {
-#line 26603 "Photo.c"
+#line 26604 "Photo.c"
 		PhotoMetadata* _tmp56_ = NULL;
 		gchar* _tmp57_ = NULL;
 		gchar* _tmp58_ = NULL;
@@ -26632,7 +26633,7 @@ void photo_export (Photo* self, GFile* dest_file, Scaling* scaling, JpegQuality
 #line 3700 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp61_ = _tmp60_;
 #line 3700 "/home/jens/Source/shotwell/src/Photo.vala"
-		photo_metadata_set_comment (_tmp59_, _tmp61_);
+		photo_metadata_set_comment (_tmp59_, _tmp61_, PHOTO_METADATA_SET_OPTION_ALL_DOMAINS);
 #line 3700 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_free0 (_tmp61_);
 #line 3701 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -26643,7 +26644,7 @@ void photo_export (Photo* self, GFile* dest_file, Scaling* scaling, JpegQuality
 		_tmp63_ = media_source_get_exposure_time (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource));
 #line 3703 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp63_ != ((time_t) 0)) {
-#line 26644 "Photo.c"
+#line 26645 "Photo.c"
 			PhotoMetadata* _tmp64_ = NULL;
 			time_t _tmp65_ = 0;
 			MetadataDateTime* _tmp66_ = NULL;
@@ -26660,14 +26661,14 @@ void photo_export (Photo* self, GFile* dest_file, Scaling* scaling, JpegQuality
 			photo_metadata_set_exposure_date_time (_tmp64_, _tmp67_, PHOTO_METADATA_SET_OPTION_ALL_DOMAINS);
 #line 3704 "/home/jens/Source/shotwell/src/Photo.vala"
 			_metadata_date_time_unref0 (_tmp67_);
-#line 26661 "Photo.c"
+#line 26662 "Photo.c"
 		} else {
 			PhotoMetadata* _tmp68_ = NULL;
 #line 3706 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp68_ = metadata;
 #line 3706 "/home/jens/Source/shotwell/src/Photo.vala"
 			photo_metadata_set_exposure_date_time (_tmp68_, NULL, PHOTO_METADATA_SET_OPTION_ALL_DOMAINS);
-#line 26668 "Photo.c"
+#line 26669 "Photo.c"
 		}
 #line 3708 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp69_ = metadata;
@@ -26685,13 +26686,13 @@ void photo_export (Photo* self, GFile* dest_file, Scaling* scaling, JpegQuality
 		_tmp72_ = photo_has_user_generated_metadata (self);
 #line 3712 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp72_) {
-#line 26686 "Photo.c"
+#line 26687 "Photo.c"
 			PhotoMetadata* _tmp73_ = NULL;
 #line 3713 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp73_ = metadata;
 #line 3713 "/home/jens/Source/shotwell/src/Photo.vala"
 			photo_set_user_metadata_for_export (self, _tmp73_);
-#line 26692 "Photo.c"
+#line 26693 "Photo.c"
 		}
 	} else {
 		PhotoMetadata* _tmp74_ = NULL;
@@ -26699,7 +26700,7 @@ void photo_export (Photo* self, GFile* dest_file, Scaling* scaling, JpegQuality
 		_tmp74_ = metadata;
 #line 3717 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_metadata_clear (_tmp74_);
-#line 26700 "Photo.c"
+#line 26701 "Photo.c"
 	}
 #line 3724 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp76_ = photo_get_file_format (self);
@@ -26707,18 +26708,18 @@ void photo_export (Photo* self, GFile* dest_file, Scaling* scaling, JpegQuality
 	if (_tmp76_ == PHOTO_FILE_FORMAT_JFIF) {
 #line 3724 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp75_ = TRUE;
-#line 26708 "Photo.c"
+#line 26709 "Photo.c"
 	} else {
 		PhotoFileFormat _tmp77_ = 0;
 #line 3725 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp77_ = photo_get_file_format (self);
 #line 3725 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp75_ = _tmp77_ == PHOTO_FILE_FORMAT_RAW;
-#line 26715 "Photo.c"
+#line 26716 "Photo.c"
 	}
 #line 3724 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp75_) {
-#line 26719 "Photo.c"
+#line 26720 "Photo.c"
 		PhotoMetadata* _tmp78_ = NULL;
 		Dimensions _tmp79_ = {0};
 		PhotoMetadata* _tmp80_ = NULL;
@@ -26735,7 +26736,7 @@ void photo_export (Photo* self, GFile* dest_file, Scaling* scaling, JpegQuality
 		_tmp81_ = photo_get_orientation (self);
 #line 3727 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_metadata_set_orientation (_tmp80_, _tmp81_);
-#line 26736 "Photo.c"
+#line 26737 "Photo.c"
 	} else {
 		PhotoMetadata* _tmp82_ = NULL;
 		GdkPixbuf* _tmp83_ = NULL;
@@ -26753,7 +26754,7 @@ void photo_export (Photo* self, GFile* dest_file, Scaling* scaling, JpegQuality
 		_tmp85_ = metadata;
 #line 3731 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_metadata_set_orientation (_tmp85_, ORIENTATION_TOP_LEFT);
-#line 26754 "Photo.c"
+#line 26755 "Photo.c"
 	}
 #line 3734 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp87_ = export_format;
@@ -26783,7 +26784,7 @@ void photo_export (Photo* self, GFile* dest_file, Scaling* scaling, JpegQuality
 		_media_metadata_unref0 (metadata);
 #line 3734 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 26784 "Photo.c"
+#line 26785 "Photo.c"
 	}
 #line 3734 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp93_ = _tmp86_;
@@ -26811,7 +26812,7 @@ void photo_export (Photo* self, GFile* dest_file, Scaling* scaling, JpegQuality
 		_media_metadata_unref0 (metadata);
 #line 3734 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 26812 "Photo.c"
+#line 26813 "Photo.c"
 	}
 #line 3645 "/home/jens/Source/shotwell/src/Photo.vala"
 	_photo_file_adapter_unref0 (_tmp86_);
@@ -26821,7 +26822,7 @@ void photo_export (Photo* self, GFile* dest_file, Scaling* scaling, JpegQuality
 	_photo_file_adapter_unref0 (writer);
 #line 3645 "/home/jens/Source/shotwell/src/Photo.vala"
 	_media_metadata_unref0 (metadata);
-#line 26822 "Photo.c"
+#line 26823 "Photo.c"
 }
 
 
@@ -26855,14 +26856,14 @@ static GFile* photo_generate_new_editable_file (Photo* self, PhotoFileFormat* fi
 	GError * _inner_error_ = NULL;
 #line 3737 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), NULL);
-#line 26856 "Photo.c"
+#line 26857 "Photo.c"
 	{
 		PhotoRow* _tmp0_ = NULL;
 #line 3739 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
 #line 3739 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 26863 "Photo.c"
+#line 26864 "Photo.c"
 		{
 			PhotoFileFormat _tmp1_ = 0;
 			GFile* _tmp2_ = NULL;
@@ -26876,16 +26877,16 @@ static GFile* photo_generate_new_editable_file (Photo* self, PhotoFileFormat* fi
 			_g_object_unref0 (backing);
 #line 3741 "/home/jens/Source/shotwell/src/Photo.vala"
 			backing = _tmp2_;
-#line 26877 "Photo.c"
+#line 26878 "Photo.c"
 		}
-		__finally373:
+		__finally386:
 		{
 			PhotoRow* _tmp3_ = NULL;
 #line 3739 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp3_ = self->row;
 #line 3739 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 26886 "Photo.c"
+#line 26887 "Photo.c"
 		}
 #line 3739 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -26895,7 +26896,7 @@ static GFile* photo_generate_new_editable_file (Photo* self, PhotoFileFormat* fi
 			_g_object_unref0 (backing);
 #line 3739 "/home/jens/Source/shotwell/src/Photo.vala"
 			return NULL;
-#line 26896 "Photo.c"
+#line 26897 "Photo.c"
 		}
 	}
 #line 3744 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -26904,13 +26905,13 @@ static GFile* photo_generate_new_editable_file (Photo* self, PhotoFileFormat* fi
 	_tmp5_ = photo_file_format_can_write (_tmp4_);
 #line 3744 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (!_tmp5_) {
-#line 26905 "Photo.c"
+#line 26906 "Photo.c"
 		PhotoFileFormat _tmp6_ = 0;
 #line 3745 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp6_ = photo_file_format_get_system_default_format ();
 #line 3745 "/home/jens/Source/shotwell/src/Photo.vala"
 		_vala_file_format = _tmp6_;
-#line 26911 "Photo.c"
+#line 26912 "Photo.c"
 	}
 #line 3748 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp7_ = g_file_get_basename (backing);
@@ -26934,7 +26935,7 @@ static GFile* photo_generate_new_editable_file (Photo* self, PhotoFileFormat* fi
 	if (_tmp12_ == NULL) {
 #line 3750 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp11_ = TRUE;
-#line 26935 "Photo.c"
+#line 26936 "Photo.c"
 	} else {
 		PhotoFileFormat _tmp13_ = 0;
 		PhotoFileFormatProperties* _tmp14_ = NULL;
@@ -26955,11 +26956,11 @@ static GFile* photo_generate_new_editable_file (Photo* self, PhotoFileFormat* fi
 		_tmp11_ = !_tmp17_;
 #line 3750 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_format_properties_unref0 (_tmp15_);
-#line 26956 "Photo.c"
+#line 26957 "Photo.c"
 	}
 #line 3750 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp11_) {
-#line 26960 "Photo.c"
+#line 26961 "Photo.c"
 		PhotoFileFormat _tmp18_ = 0;
 		PhotoFileFormatProperties* _tmp19_ = NULL;
 		PhotoFileFormatProperties* _tmp20_ = NULL;
@@ -26978,7 +26979,7 @@ static GFile* photo_generate_new_editable_file (Photo* self, PhotoFileFormat* fi
 		ext = _tmp21_;
 #line 3751 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_format_properties_unref0 (_tmp20_);
-#line 26979 "Photo.c"
+#line 26980 "Photo.c"
 	}
 #line 3753 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp22_ = name;
@@ -27018,7 +27019,7 @@ static GFile* photo_generate_new_editable_file (Photo* self, PhotoFileFormat* fi
 		_g_object_unref0 (backing);
 #line 3756 "/home/jens/Source/shotwell/src/Photo.vala"
 		return NULL;
-#line 27019 "Photo.c"
+#line 27020 "Photo.c"
 	}
 #line 3756 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp32_ = _tmp26_;
@@ -27040,18 +27041,18 @@ static GFile* photo_generate_new_editable_file (Photo* self, PhotoFileFormat* fi
 	if (file_format) {
 #line 3756 "/home/jens/Source/shotwell/src/Photo.vala"
 		*file_format = _vala_file_format;
-#line 27041 "Photo.c"
+#line 27042 "Photo.c"
 	}
 #line 3756 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 27045 "Photo.c"
+#line 27046 "Photo.c"
 }
 
 
 static void _g_object_unref0_ (gpointer var) {
 #line 3778 "/home/jens/Source/shotwell/src/Photo.vala"
 	(var == NULL) ? NULL : (var = (g_object_unref (var), NULL));
-#line 27052 "Photo.c"
+#line 27053 "Photo.c"
 }
 
 
@@ -27060,7 +27061,7 @@ static void _g_list_free__g_object_unref0_ (GList* self) {
 	g_list_foreach (self, (GFunc) _g_object_unref0_, NULL);
 #line 3778 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_list_free (self);
-#line 27061 "Photo.c"
+#line 27062 "Photo.c"
 }
 
 
@@ -27104,7 +27105,7 @@ static gboolean photo_launch_editor (GFile* file, PhotoFileFormat file_format, G
 	_tmp1_ = file_format;
 #line 3760 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp1_ == PHOTO_FILE_FORMAT_RAW) {
-#line 27105 "Photo.c"
+#line 27106 "Photo.c"
 		ConfigFacade* _tmp2_ = NULL;
 		ConfigFacade* _tmp3_ = NULL;
 		gchar* _tmp4_ = NULL;
@@ -27120,7 +27121,7 @@ static gboolean photo_launch_editor (GFile* file, PhotoFileFormat file_format, G
 		_tmp0_ = _tmp4_;
 #line 3760 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_tmp3_);
-#line 27121 "Photo.c"
+#line 27122 "Photo.c"
 	} else {
 		ConfigFacade* _tmp5_ = NULL;
 		ConfigFacade* _tmp6_ = NULL;
@@ -27137,7 +27138,7 @@ static gboolean photo_launch_editor (GFile* file, PhotoFileFormat file_format, G
 		_tmp0_ = _tmp7_;
 #line 3761 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_tmp6_);
-#line 27138 "Photo.c"
+#line 27139 "Photo.c"
 	}
 #line 3760 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp8_ = g_strdup (_tmp0_);
@@ -27157,7 +27158,7 @@ static gboolean photo_launch_editor (GFile* file, PhotoFileFormat file_format, G
 		_g_free0 (_tmp0_);
 #line 3764 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 27158 "Photo.c"
+#line 27159 "Photo.c"
 	}
 	{
 		GAppInfo* _tmp11_ = NULL;
@@ -27172,8 +27173,8 @@ static gboolean photo_launch_editor (GFile* file, PhotoFileFormat file_format, G
 		_tmp11_ = _tmp13_;
 #line 3768 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 27173 "Photo.c"
-			goto __catch374_g_error;
+#line 27174 "Photo.c"
+			goto __catch387_g_error;
 		}
 #line 3768 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp14_ = _tmp11_;
@@ -27185,10 +27186,10 @@ static gboolean photo_launch_editor (GFile* file, PhotoFileFormat file_format, G
 		app = _tmp14_;
 #line 3767 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_tmp11_);
-#line 27186 "Photo.c"
+#line 27187 "Photo.c"
 	}
-	goto __finally374;
-	__catch374_g_error:
+	goto __finally387;
+	__catch387_g_error:
 	{
 		GError* er = NULL;
 #line 3767 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -27201,9 +27202,9 @@ static gboolean photo_launch_editor (GFile* file, PhotoFileFormat file_format, G
 		app = NULL;
 #line 3767 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_error_free0 (er);
-#line 27202 "Photo.c"
+#line 27203 "Photo.c"
 	}
-	__finally374:
+	__finally387:
 #line 3767 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 3767 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -27216,7 +27217,7 @@ static gboolean photo_launch_editor (GFile* file, PhotoFileFormat file_format, G
 		_g_free0 (_tmp0_);
 #line 3767 "/home/jens/Source/shotwell/src/Photo.vala"
 		return FALSE;
-#line 27217 "Photo.c"
+#line 27218 "Photo.c"
 	}
 #line 3774 "/home/jens/Source/shotwell/src/Photo.vala"
 	files = NULL;
@@ -27230,7 +27231,7 @@ static gboolean photo_launch_editor (GFile* file, PhotoFileFormat file_format, G
 	_tmp17_ = app;
 #line 3777 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp17_ != NULL) {
-#line 27231 "Photo.c"
+#line 27232 "Photo.c"
 		gboolean _tmp18_ = FALSE;
 		GAppInfo* _tmp19_ = NULL;
 		GList* _tmp20_ = NULL;
@@ -27257,7 +27258,7 @@ static gboolean photo_launch_editor (GFile* file, PhotoFileFormat file_format, G
 			_g_free0 (_tmp0_);
 #line 3778 "/home/jens/Source/shotwell/src/Photo.vala"
 			return FALSE;
-#line 27258 "Photo.c"
+#line 27259 "Photo.c"
 		}
 #line 3778 "/home/jens/Source/shotwell/src/Photo.vala"
 		result = _tmp18_;
@@ -27271,7 +27272,7 @@ static gboolean photo_launch_editor (GFile* file, PhotoFileFormat file_format, G
 		_g_free0 (_tmp0_);
 #line 3778 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 27272 "Photo.c"
+#line 27273 "Photo.c"
 	}
 #line 3780 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp22_ = g_new0 (gchar*, 2 + 1);
@@ -27335,7 +27336,7 @@ static gboolean photo_launch_editor (GFile* file, PhotoFileFormat file_format, G
 		_g_free0 (_tmp0_);
 #line 3786 "/home/jens/Source/shotwell/src/Photo.vala"
 		return FALSE;
-#line 27336 "Photo.c"
+#line 27337 "Photo.c"
 	}
 #line 3786 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp31_;
@@ -27351,7 +27352,7 @@ static gboolean photo_launch_editor (GFile* file, PhotoFileFormat file_format, G
 	_g_free0 (_tmp0_);
 #line 3786 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 27352 "Photo.c"
+#line 27353 "Photo.c"
 }
 
 
@@ -27378,7 +27379,7 @@ void photo_open_with_raw_external_editor (Photo* self, GError** error) {
 		g_propagate_error (error, _inner_error_);
 #line 3797 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 27379 "Photo.c"
+#line 27380 "Photo.c"
 	}
 }
 
@@ -27403,14 +27404,14 @@ void photo_open_with_external_editor (Photo* self, GError** error) {
 	current_editable_file = NULL;
 #line 3803 "/home/jens/Source/shotwell/src/Photo.vala"
 	create_editable_file = NULL;
-#line 27404 "Photo.c"
+#line 27405 "Photo.c"
 	{
 		PhotoBackingReaders* _tmp0_ = NULL;
 #line 3805 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->priv->readers;
 #line 3805 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_readers);
-#line 27411 "Photo.c"
+#line 27412 "Photo.c"
 		{
 			PhotoBackingReaders* _tmp1_ = NULL;
 			PhotoFileReader* _tmp2_ = NULL;
@@ -27421,7 +27422,7 @@ void photo_open_with_external_editor (Photo* self, GError** error) {
 			_tmp2_ = _tmp1_->editable;
 #line 3806 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp2_ != NULL) {
-#line 27422 "Photo.c"
+#line 27423 "Photo.c"
 				PhotoBackingReaders* _tmp3_ = NULL;
 				PhotoFileReader* _tmp4_ = NULL;
 				GFile* _tmp5_ = NULL;
@@ -27435,13 +27436,13 @@ void photo_open_with_external_editor (Photo* self, GError** error) {
 				_g_object_unref0 (current_editable_file);
 #line 3807 "/home/jens/Source/shotwell/src/Photo.vala"
 				current_editable_file = _tmp5_;
-#line 27436 "Photo.c"
+#line 27437 "Photo.c"
 			}
 #line 3809 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp6_ = current_editable_file;
 #line 3809 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp6_ == NULL) {
-#line 27442 "Photo.c"
+#line 27443 "Photo.c"
 				GFile* _tmp7_ = NULL;
 				PhotoFileFormat _tmp8_ = 0;
 				GFile* _tmp9_ = NULL;
@@ -27454,8 +27455,8 @@ void photo_open_with_external_editor (Photo* self, GError** error) {
 				_tmp7_ = _tmp9_;
 #line 3810 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 27455 "Photo.c"
-					goto __finally375;
+#line 27456 "Photo.c"
+					goto __finally388;
 				}
 #line 3810 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp10_ = _tmp7_;
@@ -27467,7 +27468,7 @@ void photo_open_with_external_editor (Photo* self, GError** error) {
 				create_editable_file = _tmp10_;
 #line 3809 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (_tmp7_);
-#line 27468 "Photo.c"
+#line 27469 "Photo.c"
 			} else {
 				PhotoBackingReaders* _tmp11_ = NULL;
 				PhotoFileReader* _tmp12_ = NULL;
@@ -27480,17 +27481,17 @@ void photo_open_with_external_editor (Photo* self, GError** error) {
 				_tmp13_ = photo_file_adapter_get_file_format (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter));
 #line 3812 "/home/jens/Source/shotwell/src/Photo.vala"
 				editable_file_format = _tmp13_;
-#line 27481 "Photo.c"
+#line 27482 "Photo.c"
 			}
 		}
-		__finally375:
+		__finally388:
 		{
 			PhotoBackingReaders* _tmp14_ = NULL;
 #line 3805 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp14_ = self->priv->readers;
 #line 3805 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 27491 "Photo.c"
+#line 27492 "Photo.c"
 		}
 #line 3805 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -27502,28 +27503,28 @@ void photo_open_with_external_editor (Photo* self, GError** error) {
 			_g_object_unref0 (current_editable_file);
 #line 3805 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 27503 "Photo.c"
+#line 27504 "Photo.c"
 		}
 	}
 #line 3817 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp17_ = create_editable_file;
 #line 3817 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp17_ == NULL) {
-#line 27510 "Photo.c"
+#line 27511 "Photo.c"
 		GFile* _tmp18_ = NULL;
 #line 3817 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp18_ = current_editable_file;
 #line 3817 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp16_ = _tmp18_ != NULL;
-#line 27516 "Photo.c"
+#line 27517 "Photo.c"
 	} else {
 #line 3817 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp16_ = FALSE;
-#line 27520 "Photo.c"
+#line 27521 "Photo.c"
 	}
 #line 3817 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp16_) {
-#line 27524 "Photo.c"
+#line 27525 "Photo.c"
 		gboolean _tmp19_ = FALSE;
 		GFile* _tmp20_ = NULL;
 		gboolean _tmp21_ = FALSE;
@@ -27535,26 +27536,26 @@ void photo_open_with_external_editor (Photo* self, GError** error) {
 		if (!_tmp21_) {
 #line 3818 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp19_ = TRUE;
-#line 27536 "Photo.c"
+#line 27537 "Photo.c"
 		} else {
 			gboolean _tmp22_ = FALSE;
 #line 3818 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp22_ = photo_has_transformations (self);
 #line 3818 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp19_ = _tmp22_;
-#line 27543 "Photo.c"
+#line 27544 "Photo.c"
 		}
 #line 3818 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp15_ = _tmp19_;
-#line 27547 "Photo.c"
+#line 27548 "Photo.c"
 	} else {
 #line 3817 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp15_ = FALSE;
-#line 27551 "Photo.c"
+#line 27552 "Photo.c"
 	}
 #line 3817 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp15_) {
-#line 27555 "Photo.c"
+#line 27556 "Photo.c"
 		GFile* _tmp23_ = NULL;
 		GFile* _tmp24_ = NULL;
 #line 3819 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -27565,13 +27566,13 @@ void photo_open_with_external_editor (Photo* self, GError** error) {
 		_g_object_unref0 (create_editable_file);
 #line 3819 "/home/jens/Source/shotwell/src/Photo.vala"
 		create_editable_file = _tmp24_;
-#line 27566 "Photo.c"
+#line 27567 "Photo.c"
 	}
 #line 3822 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp26_ = create_editable_file;
 #line 3822 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp26_ != NULL) {
-#line 27572 "Photo.c"
+#line 27573 "Photo.c"
 		PhotoFileFormat _tmp27_ = 0;
 		gboolean _tmp28_ = FALSE;
 #line 3822 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -27580,22 +27581,22 @@ void photo_open_with_external_editor (Photo* self, GError** error) {
 		_tmp28_ = photo_file_format_can_write (_tmp27_);
 #line 3822 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp25_ = _tmp28_;
-#line 27581 "Photo.c"
+#line 27582 "Photo.c"
 	} else {
 #line 3822 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp25_ = FALSE;
-#line 27585 "Photo.c"
+#line 27586 "Photo.c"
 	}
 #line 3822 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp25_) {
-#line 27589 "Photo.c"
+#line 27590 "Photo.c"
 		PhotoFileFormat _tmp40_ = 0;
 		GFile* _tmp41_ = NULL;
 		GFile* _tmp42_ = NULL;
 		GFile* _tmp43_ = NULL;
 #line 3823 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_halt_monitoring_editable (self);
-#line 27596 "Photo.c"
+#line 27597 "Photo.c"
 		{
 			GFile* _tmp29_ = NULL;
 			Scaling _tmp30_ = {0};
@@ -27610,12 +27611,12 @@ void photo_open_with_external_editor (Photo* self, GError** error) {
 			photo_export (self, _tmp29_, &_tmp30_, JPEG_QUALITY_MAXIMUM, _tmp31_, FALSE, TRUE, &_inner_error_);
 #line 3826 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 27611 "Photo.c"
-				goto __catch376_g_error;
+#line 27612 "Photo.c"
+				goto __catch389_g_error;
 			}
 		}
-		goto __finally376;
-		__catch376_g_error:
+		goto __finally389;
+		__catch389_g_error:
 		{
 			GError* err = NULL;
 			GError* _tmp38_ = NULL;
@@ -27624,7 +27625,7 @@ void photo_open_with_external_editor (Photo* self, GError** error) {
 			err = _inner_error_;
 #line 3825 "/home/jens/Source/shotwell/src/Photo.vala"
 			_inner_error_ = NULL;
-#line 27625 "Photo.c"
+#line 27626 "Photo.c"
 			{
 				GFile* _tmp32_ = NULL;
 #line 3831 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -27633,12 +27634,12 @@ void photo_open_with_external_editor (Photo* self, GError** error) {
 				g_file_delete (_tmp32_, NULL, &_inner_error_);
 #line 3831 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 27634 "Photo.c"
-					goto __catch377_g_error;
+#line 27635 "Photo.c"
+					goto __catch390_g_error;
 				}
 			}
-			goto __finally377;
-			__catch377_g_error:
+			goto __finally390;
+			__catch390_g_error:
 			{
 				GError* delete_err = NULL;
 				GFile* _tmp33_ = NULL;
@@ -27667,9 +27668,9 @@ void photo_open_with_external_editor (Photo* self, GError** error) {
 				_g_free0 (_tmp35_);
 #line 3830 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_error_free0 (delete_err);
-#line 27667 "Photo.c"
+#line 27668 "Photo.c"
 			}
-			__finally377:
+			__finally390:
 #line 3830 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 3830 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -27686,7 +27687,7 @@ void photo_open_with_external_editor (Photo* self, GError** error) {
 				g_clear_error (&_inner_error_);
 #line 3830 "/home/jens/Source/shotwell/src/Photo.vala"
 				return;
-#line 27686 "Photo.c"
+#line 27687 "Photo.c"
 			}
 #line 3838 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp38_ = err;
@@ -27696,10 +27697,10 @@ void photo_open_with_external_editor (Photo* self, GError** error) {
 			_inner_error_ = _tmp39_;
 #line 3838 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_error_free0 (err);
-#line 27696 "Photo.c"
-			goto __finally376;
+#line 27697 "Photo.c"
+			goto __finally389;
 		}
-		__finally376:
+		__finally389:
 #line 3825 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 3825 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -27710,7 +27711,7 @@ void photo_open_with_external_editor (Photo* self, GError** error) {
 			_g_object_unref0 (current_editable_file);
 #line 3825 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 27710 "Photo.c"
+#line 27711 "Photo.c"
 		}
 #line 3842 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp40_ = editable_file_format;
@@ -27728,7 +27729,7 @@ void photo_open_with_external_editor (Photo* self, GError** error) {
 			_g_object_unref0 (current_editable_file);
 #line 3842 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 27728 "Photo.c"
+#line 27729 "Photo.c"
 		}
 #line 3844 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp42_ = create_editable_file;
@@ -27738,7 +27739,7 @@ void photo_open_with_external_editor (Photo* self, GError** error) {
 		_g_object_unref0 (current_editable_file);
 #line 3844 "/home/jens/Source/shotwell/src/Photo.vala"
 		current_editable_file = _tmp43_;
-#line 27738 "Photo.c"
+#line 27739 "Photo.c"
 	}
 #line 3847 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp44_ = current_editable_file;
@@ -27748,7 +27749,7 @@ void photo_open_with_external_editor (Photo* self, GError** error) {
 	_tmp45_ = self->priv->editable_monitor;
 #line 3850 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp45_ == NULL) {
-#line 27748 "Photo.c"
+#line 27749 "Photo.c"
 		GFile* _tmp46_ = NULL;
 #line 3851 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp46_ = current_editable_file;
@@ -27764,7 +27765,7 @@ void photo_open_with_external_editor (Photo* self, GError** error) {
 			_g_object_unref0 (current_editable_file);
 #line 3851 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 27764 "Photo.c"
+#line 27765 "Photo.c"
 		}
 	}
 #line 3853 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -27783,13 +27784,13 @@ void photo_open_with_external_editor (Photo* self, GError** error) {
 		_g_object_unref0 (current_editable_file);
 #line 3853 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 27783 "Photo.c"
+#line 27784 "Photo.c"
 	}
 #line 3801 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (create_editable_file);
 #line 3801 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (current_editable_file);
-#line 27789 "Photo.c"
+#line 27790 "Photo.c"
 }
 
 
@@ -27801,14 +27802,14 @@ void photo_revert_to_master (Photo* self, gboolean notify) {
 	_tmp0_ = notify;
 #line 3857 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_detach_editable (self, TRUE, TRUE, _tmp0_);
-#line 27801 "Photo.c"
+#line 27802 "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"
 	photo_on_editable_file_changed ((Photo*) self, file, other_file, event_type);
-#line 27808 "Photo.c"
+#line 27809 "Photo.c"
 }
 
 
@@ -27842,7 +27843,7 @@ static void photo_start_monitoring_editable (Photo* self, GFile* file, GError**
 		g_propagate_error (error, _inner_error_);
 #line 3866 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 27842 "Photo.c"
+#line 27843 "Photo.c"
 	}
 #line 3866 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = _tmp1_;
@@ -27858,7 +27859,7 @@ static void photo_start_monitoring_editable (Photo* self, GFile* file, GError**
 	g_signal_connect_object (_tmp5_, "changed", (GCallback) _photo_on_editable_file_changed_g_file_monitor_changed, self, 0);
 #line 3860 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (_tmp1_);
-#line 27858 "Photo.c"
+#line 27859 "Photo.c"
 }
 
 
@@ -27878,7 +27879,7 @@ static void photo_halt_monitoring_editable (Photo* self) {
 	if (_tmp0_ == NULL) {
 #line 3872 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 27878 "Photo.c"
+#line 27879 "Photo.c"
 	}
 #line 3875 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = photo_get_editable_file (self);
@@ -27888,13 +27889,13 @@ static void photo_halt_monitoring_editable (Photo* self) {
 	_tmp2_ = file;
 #line 3876 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp2_ != NULL) {
-#line 27888 "Photo.c"
+#line 27889 "Photo.c"
 		GFile* _tmp3_ = NULL;
 #line 3877 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp3_ = file;
 #line 3877 "/home/jens/Source/shotwell/src/Photo.vala"
 		library_monitor_unblacklist_file (_tmp3_);
-#line 27894 "Photo.c"
+#line 27895 "Photo.c"
 	}
 #line 3879 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = self->priv->editable_monitor;
@@ -27912,7 +27913,7 @@ static void photo_halt_monitoring_editable (Photo* self) {
 	self->priv->editable_monitor = NULL;
 #line 3870 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (file);
-#line 27912 "Photo.c"
+#line 27913 "Photo.c"
 }
 
 
@@ -27954,7 +27955,7 @@ static void photo_attach_editable (Photo* self, PhotoFileFormat file_format, GFi
 		g_propagate_error (error, _inner_error_);
 #line 3890 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 27954 "Photo.c"
+#line 27955 "Photo.c"
 	}
 }
 
@@ -27971,7 +27972,7 @@ static void photo_update_editable_attributes (Photo* self, GError** error) {
 		g_propagate_error (error, _inner_error_);
 #line 3894 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 27971 "Photo.c"
+#line 27972 "Photo.c"
 	}
 }
 
@@ -27988,7 +27989,7 @@ void photo_reimport_editable (Photo* self, GError** error) {
 		g_propagate_error (error, _inner_error_);
 #line 3898 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 27988 "Photo.c"
+#line 27989 "Photo.c"
 	}
 }
 
@@ -28000,13 +28001,13 @@ static void _vala_array_add269 (gchar*** array, int* length, int* size, gchar* v
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 4005 "/home/jens/Source/shotwell/src/Photo.vala"
 		*array = g_renew (gchar*, *array, (*size) + 1);
-#line 28000 "Photo.c"
+#line 28001 "Photo.c"
 	}
 #line 4005 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[(*length)++] = value;
 #line 4005 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[*length] = NULL;
-#line 28006 "Photo.c"
+#line 28007 "Photo.c"
 }
 
 
@@ -28017,13 +28018,13 @@ static void _vala_array_add270 (gchar*** array, int* length, int* size, gchar* v
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 4006 "/home/jens/Source/shotwell/src/Photo.vala"
 		*array = g_renew (gchar*, *array, (*size) + 1);
-#line 28017 "Photo.c"
+#line 28018 "Photo.c"
 	}
 #line 4006 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[(*length)++] = value;
 #line 4006 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[*length] = NULL;
-#line 28023 "Photo.c"
+#line 28024 "Photo.c"
 }
 
 
@@ -28034,13 +28035,13 @@ static void _vala_array_add271 (gchar*** array, int* length, int* size, gchar* v
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 4009 "/home/jens/Source/shotwell/src/Photo.vala"
 		*array = g_renew (gchar*, *array, (*size) + 1);
-#line 28034 "Photo.c"
+#line 28035 "Photo.c"
 	}
 #line 4009 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[(*length)++] = value;
 #line 4009 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[*length] = NULL;
-#line 28040 "Photo.c"
+#line 28041 "Photo.c"
 }
 
 
@@ -28051,13 +28052,13 @@ static void _vala_array_add272 (gchar*** array, int* length, int* size, gchar* v
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 4013 "/home/jens/Source/shotwell/src/Photo.vala"
 		*array = g_renew (gchar*, *array, (*size) + 1);
-#line 28051 "Photo.c"
+#line 28052 "Photo.c"
 	}
 #line 4013 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[(*length)++] = value;
 #line 4013 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[*length] = NULL;
-#line 28057 "Photo.c"
+#line 28058 "Photo.c"
 }
 
 
@@ -28068,13 +28069,13 @@ static void _vala_array_add273 (gchar*** array, int* length, int* size, gchar* v
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 4014 "/home/jens/Source/shotwell/src/Photo.vala"
 		*array = g_renew (gchar*, *array, (*size) + 1);
-#line 28068 "Photo.c"
+#line 28069 "Photo.c"
 	}
 #line 4014 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[(*length)++] = value;
 #line 4014 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[*length] = NULL;
-#line 28074 "Photo.c"
+#line 28075 "Photo.c"
 }
 
 
@@ -28085,13 +28086,13 @@ static void _vala_array_add274 (gchar*** array, int* length, int* size, gchar* v
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 4017 "/home/jens/Source/shotwell/src/Photo.vala"
 		*array = g_renew (gchar*, *array, (*size) + 1);
-#line 28085 "Photo.c"
+#line 28086 "Photo.c"
 	}
 #line 4017 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[(*length)++] = value;
 #line 4017 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[*length] = NULL;
-#line 28091 "Photo.c"
+#line 28092 "Photo.c"
 }
 
 
@@ -28142,30 +28143,30 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF
 	_tmp2_ = only_attributes;
 #line 3905 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp2_) {
-#line 28142 "Photo.c"
+#line 28143 "Photo.c"
 		PhotoFileReader* _tmp3_ = NULL;
 #line 3905 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp3_ = new_reader;
 #line 3905 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp1_ = _tmp3_ == NULL;
-#line 28148 "Photo.c"
+#line 28149 "Photo.c"
 	} else {
 #line 3905 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp1_ = FALSE;
-#line 28152 "Photo.c"
+#line 28153 "Photo.c"
 	}
 #line 3905 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp1_) {
 #line 3905 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = TRUE;
-#line 28158 "Photo.c"
+#line 28159 "Photo.c"
 	} else {
 		gboolean _tmp4_ = FALSE;
 #line 3905 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp4_ = only_attributes;
 #line 3905 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = !_tmp4_;
-#line 28165 "Photo.c"
+#line 28166 "Photo.c"
 	}
 #line 3905 "/home/jens/Source/shotwell/src/Photo.vala"
 	_vala_assert (_tmp0_, "(only_attributes && new_reader == null) || (!only_attributes)");
@@ -28179,13 +28180,13 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF
 	_tmp6_ = _tmp7_;
 #line 3909 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp6_ == NULL) {
-#line 28179 "Photo.c"
+#line 28180 "Photo.c"
 		PhotoFileReader* _tmp8_ = NULL;
 #line 3909 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp8_ = old_reader;
 #line 3909 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp6_ = _tmp8_;
-#line 28185 "Photo.c"
+#line 28186 "Photo.c"
 	}
 #line 3909 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp9_ = _photo_file_adapter_ref0 (_tmp6_);
@@ -28203,7 +28204,7 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF
 		_photo_file_adapter_unref0 (old_reader);
 #line 3913 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 28203 "Photo.c"
+#line 28204 "Photo.c"
 	}
 #line 3916 "/home/jens/Source/shotwell/src/Photo.vala"
 	timestamp_changed = FALSE;
@@ -28245,19 +28246,19 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF
 		_photo_file_adapter_unref0 (old_reader);
 #line 3924 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 28245 "Photo.c"
+#line 28246 "Photo.c"
 	}
 #line 3928 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp17_ = backing_photo_id_is_invalid (&editable_id);
 #line 3928 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp17_) {
-#line 28251 "Photo.c"
+#line 28252 "Photo.c"
 		BackingPhotoRow* _tmp18_ = NULL;
 #line 3930 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp18_ = backing;
 #line 3930 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp18_ != NULL) {
-#line 28257 "Photo.c"
+#line 28258 "Photo.c"
 			BackingPhotoTable* _tmp19_ = NULL;
 			BackingPhotoTable* _tmp20_ = NULL;
 			BackingPhotoRow* _tmp21_ = NULL;
@@ -28287,7 +28288,7 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF
 				_photo_file_adapter_unref0 (old_reader);
 #line 3931 "/home/jens/Source/shotwell/src/Photo.vala"
 				return;
-#line 28287 "Photo.c"
+#line 28288 "Photo.c"
 			}
 			{
 				PhotoRow* _tmp22_ = NULL;
@@ -28295,7 +28296,7 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF
 				_tmp22_ = self->row;
 #line 3932 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_lock (&self->priv->__lock_row);
-#line 28295 "Photo.c"
+#line 28296 "Photo.c"
 				{
 					PhotoTable* _tmp23_ = NULL;
 					PhotoTable* _tmp24_ = NULL;
@@ -28328,8 +28329,8 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF
 					_database_table_unref0 (_tmp24_);
 #line 3936 "/home/jens/Source/shotwell/src/Photo.vala"
 					if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 28328 "Photo.c"
-						goto __finally378;
+#line 28329 "Photo.c"
+						goto __finally391;
 					}
 #line 3937 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp28_ = backing;
@@ -28353,16 +28354,16 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF
 					_tmp33_ = _tmp32_->original_orientation;
 #line 3939 "/home/jens/Source/shotwell/src/Photo.vala"
 					photo_set_orientation (self, _tmp33_);
-#line 28353 "Photo.c"
+#line 28354 "Photo.c"
 				}
-				__finally378:
+				__finally391:
 				{
 					PhotoRow* _tmp34_ = NULL;
 #line 3932 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp34_ = self->row;
 #line 3932 "/home/jens/Source/shotwell/src/Photo.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 28362 "Photo.c"
+#line 28363 "Photo.c"
 				}
 #line 3932 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -28380,19 +28381,19 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF
 					_photo_file_adapter_unref0 (old_reader);
 #line 3932 "/home/jens/Source/shotwell/src/Photo.vala"
 					return;
-#line 28380 "Photo.c"
+#line 28381 "Photo.c"
 				}
 			}
 		}
 #line 3942 "/home/jens/Source/shotwell/src/Photo.vala"
 		is_new_editable = TRUE;
-#line 28386 "Photo.c"
+#line 28387 "Photo.c"
 	}
 #line 3945 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp35_ = only_attributes;
 #line 3945 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp35_) {
-#line 28392 "Photo.c"
+#line 28393 "Photo.c"
 		gboolean _tmp36_ = FALSE;
 		GFileInfo* info = NULL;
 		GTimeVal timestamp = {0};
@@ -28409,7 +28410,7 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF
 		_tmp36_ = backing_photo_id_is_valid (&editable_id);
 #line 3947 "/home/jens/Source/shotwell/src/Photo.vala"
 		_vala_assert (_tmp36_, "editable_id.is_valid()");
-#line 28409 "Photo.c"
+#line 28410 "Photo.c"
 		{
 			GFileInfo* _tmp37_ = NULL;
 			GFile* _tmp38_ = NULL;
@@ -28423,8 +28424,8 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF
 			_tmp37_ = _tmp39_;
 #line 3951 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 28423 "Photo.c"
-				goto __catch379_g_error;
+#line 28424 "Photo.c"
+				goto __catch392_g_error;
 			}
 #line 3951 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp40_ = _tmp37_;
@@ -28436,10 +28437,10 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF
 			info = _tmp40_;
 #line 3950 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (_tmp37_);
-#line 28436 "Photo.c"
+#line 28437 "Photo.c"
 		}
-		goto __finally379;
-		__catch379_g_error:
+		goto __finally392;
+		__catch392_g_error:
 		{
 			GError* err = NULL;
 			gchar* _tmp41_ = NULL;
@@ -28480,9 +28481,9 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF
 			_photo_file_adapter_unref0 (old_reader);
 #line 3956 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 28480 "Photo.c"
+#line 28481 "Photo.c"
 		}
-		__finally379:
+		__finally392:
 #line 3950 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 3950 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -28501,7 +28502,7 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF
 			_photo_file_adapter_unref0 (old_reader);
 #line 3950 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 28501 "Photo.c"
+#line 28502 "Photo.c"
 		}
 #line 3959 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp45_ = info;
@@ -28545,7 +28546,7 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF
 			_photo_file_adapter_unref0 (old_reader);
 #line 3961 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 28545 "Photo.c"
+#line 28546 "Photo.c"
 		}
 		{
 			PhotoRow* _tmp54_ = NULL;
@@ -28553,7 +28554,7 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF
 			_tmp54_ = self->row;
 #line 3963 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_lock (&self->priv->__lock_row);
-#line 28553 "Photo.c"
+#line 28554 "Photo.c"
 			{
 				BackingPhotoRow* _tmp55_ = NULL;
 				time_t _tmp56_ = 0;
@@ -28605,16 +28606,16 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF
 				_tmp68_ = g_file_info_get_size (_tmp67_);
 #line 3968 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp66_->filesize = _tmp68_;
-#line 28605 "Photo.c"
+#line 28606 "Photo.c"
 			}
-			__finally380:
+			__finally393:
 			{
 				PhotoRow* _tmp69_ = NULL;
 #line 3963 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp69_ = self->row;
 #line 3963 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 28614 "Photo.c"
+#line 28615 "Photo.c"
 			}
 #line 3963 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -28634,12 +28635,12 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF
 				_photo_file_adapter_unref0 (old_reader);
 #line 3963 "/home/jens/Source/shotwell/src/Photo.vala"
 				return;
-#line 28634 "Photo.c"
+#line 28635 "Photo.c"
 			}
 		}
 #line 3945 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (info);
-#line 28639 "Photo.c"
+#line 28640 "Photo.c"
 	} else {
 		gboolean _tmp70_ = FALSE;
 		gboolean _tmp71_ = FALSE;
@@ -28647,21 +28648,21 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF
 		_tmp71_ = backing_photo_id_is_valid (&editable_id);
 #line 3972 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp71_) {
-#line 28647 "Photo.c"
+#line 28648 "Photo.c"
 			gboolean _tmp72_ = FALSE;
 #line 3972 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp72_ = is_new_editable;
 #line 3972 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp70_ = !_tmp72_;
-#line 28653 "Photo.c"
+#line 28654 "Photo.c"
 		} else {
 #line 3972 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp70_ = FALSE;
-#line 28657 "Photo.c"
+#line 28658 "Photo.c"
 		}
 #line 3972 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp70_) {
-#line 28661 "Photo.c"
+#line 28662 "Photo.c"
 			BackingPhotoRow* _tmp73_ = NULL;
 			BackingPhotoID _tmp74_ = {0};
 			BackingPhotoTable* _tmp75_ = NULL;
@@ -28699,7 +28700,7 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF
 				_photo_file_adapter_unref0 (old_reader);
 #line 3978 "/home/jens/Source/shotwell/src/Photo.vala"
 				return;
-#line 28699 "Photo.c"
+#line 28700 "Photo.c"
 			}
 			{
 				PhotoRow* _tmp78_ = NULL;
@@ -28707,7 +28708,7 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF
 				_tmp78_ = self->row;
 #line 3979 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_lock (&self->priv->__lock_row);
-#line 28707 "Photo.c"
+#line 28708 "Photo.c"
 				{
 					BackingPhotoRow* _tmp79_ = NULL;
 					time_t _tmp80_ = 0;
@@ -28765,16 +28766,16 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF
 					_tmp92_ = _tmp91_->original_orientation;
 #line 3985 "/home/jens/Source/shotwell/src/Photo.vala"
 					photo_set_orientation (self, _tmp92_);
-#line 28765 "Photo.c"
+#line 28766 "Photo.c"
 				}
-				__finally381:
+				__finally394:
 				{
 					PhotoRow* _tmp93_ = NULL;
 #line 3979 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp93_ = self->row;
 #line 3979 "/home/jens/Source/shotwell/src/Photo.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 28774 "Photo.c"
+#line 28775 "Photo.c"
 				}
 #line 3979 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -28792,7 +28793,7 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF
 					_photo_file_adapter_unref0 (old_reader);
 #line 3979 "/home/jens/Source/shotwell/src/Photo.vala"
 					return;
-#line 28792 "Photo.c"
+#line 28793 "Photo.c"
 				}
 			}
 		}
@@ -28801,14 +28802,14 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF
 	_tmp94_ = new_reader;
 #line 3991 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp94_ != NULL) {
-#line 28801 "Photo.c"
+#line 28802 "Photo.c"
 		{
 			PhotoBackingReaders* _tmp95_ = NULL;
 #line 3992 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp95_ = self->priv->readers;
 #line 3992 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_lock (&self->priv->__lock_readers);
-#line 28808 "Photo.c"
+#line 28809 "Photo.c"
 			{
 				PhotoBackingReaders* _tmp96_ = NULL;
 				PhotoFileReader* _tmp97_ = NULL;
@@ -28823,16 +28824,16 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF
 				_photo_file_adapter_unref0 (_tmp96_->editable);
 #line 3993 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp96_->editable = _tmp98_;
-#line 28823 "Photo.c"
+#line 28824 "Photo.c"
 			}
-			__finally382:
+			__finally395:
 			{
 				PhotoBackingReaders* _tmp99_ = NULL;
 #line 3992 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp99_ = self->priv->readers;
 #line 3992 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 28832 "Photo.c"
+#line 28833 "Photo.c"
 			}
 #line 3992 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -28850,7 +28851,7 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF
 				_photo_file_adapter_unref0 (old_reader);
 #line 3992 "/home/jens/Source/shotwell/src/Photo.vala"
 				return;
-#line 28850 "Photo.c"
+#line 28851 "Photo.c"
 			}
 		}
 	}
@@ -28858,7 +28859,7 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF
 	_tmp101_ = only_attributes;
 #line 3997 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (!_tmp101_) {
-#line 28858 "Photo.c"
+#line 28859 "Photo.c"
 		PhotoFileReader* _tmp102_ = NULL;
 		PhotoFileReader* _tmp103_ = NULL;
 #line 3997 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -28867,15 +28868,15 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF
 		_tmp103_ = old_reader;
 #line 3997 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp100_ = _tmp102_ != _tmp103_;
-#line 28867 "Photo.c"
+#line 28868 "Photo.c"
 	} else {
 #line 3997 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp100_ = FALSE;
-#line 28871 "Photo.c"
+#line 28872 "Photo.c"
 	}
 #line 3997 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp100_) {
-#line 28875 "Photo.c"
+#line 28876 "Photo.c"
 		GFile* _tmp104_ = NULL;
 		PhotoFileReader* _tmp105_ = NULL;
 		GFile* _tmp108_ = NULL;
@@ -28886,7 +28887,7 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF
 		_tmp105_ = old_reader;
 #line 3999 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp105_ != NULL) {
-#line 28886 "Photo.c"
+#line 28887 "Photo.c"
 			PhotoFileReader* _tmp106_ = NULL;
 			GFile* _tmp107_ = NULL;
 #line 3999 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -28897,19 +28898,19 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF
 			_g_object_unref0 (_tmp104_);
 #line 3999 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp104_ = _tmp107_;
-#line 28897 "Photo.c"
+#line 28898 "Photo.c"
 		} else {
 #line 3999 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (_tmp104_);
 #line 3999 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp104_ = NULL;
-#line 28903 "Photo.c"
+#line 28904 "Photo.c"
 		}
 #line 4000 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp109_ = new_reader;
 #line 4000 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp109_ != NULL) {
-#line 28909 "Photo.c"
+#line 28910 "Photo.c"
 			PhotoFileReader* _tmp110_ = NULL;
 			GFile* _tmp111_ = NULL;
 #line 4000 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -28920,13 +28921,13 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF
 			_g_object_unref0 (_tmp108_);
 #line 4000 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp108_ = _tmp111_;
-#line 28920 "Photo.c"
+#line 28921 "Photo.c"
 		} else {
 #line 4000 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (_tmp108_);
 #line 4000 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp108_ = NULL;
-#line 28926 "Photo.c"
+#line 28927 "Photo.c"
 		}
 #line 3999 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_notify_editable_replaced (self, _tmp104_, _tmp108_);
@@ -28934,7 +28935,7 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF
 		_g_object_unref0 (_tmp108_);
 #line 3997 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_tmp104_);
-#line 28934 "Photo.c"
+#line 28935 "Photo.c"
 	}
 #line 4003 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp112_ = g_new0 (gchar*, 0 + 1);
@@ -28948,7 +28949,7 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF
 	_tmp113_ = timestamp_changed;
 #line 4004 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp113_) {
-#line 28948 "Photo.c"
+#line 28949 "Photo.c"
 		gchar** _tmp114_ = NULL;
 		gint _tmp114__length1 = 0;
 		gchar* _tmp115_ = NULL;
@@ -28976,7 +28977,7 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF
 		_tmp118_ = photo_is_editable_source (self);
 #line 4008 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp118_) {
-#line 28976 "Photo.c"
+#line 28977 "Photo.c"
 			gchar** _tmp119_ = NULL;
 			gint _tmp119__length1 = 0;
 			gchar* _tmp120_ = NULL;
@@ -28988,7 +28989,7 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF
 			_tmp120_ = g_strdup ("metadata:source-timestamp");
 #line 4009 "/home/jens/Source/shotwell/src/Photo.vala"
 			_vala_array_add271 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp120_);
-#line 28988 "Photo.c"
+#line 28989 "Photo.c"
 		}
 	}
 #line 4012 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -28997,18 +28998,18 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF
 	if (_tmp122_) {
 #line 4012 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp121_ = TRUE;
-#line 28997 "Photo.c"
+#line 28998 "Photo.c"
 	} else {
 		PhotoFileReader* _tmp123_ = NULL;
 #line 4012 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp123_ = new_reader;
 #line 4012 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp121_ = _tmp123_ != NULL;
-#line 29004 "Photo.c"
+#line 29005 "Photo.c"
 	}
 #line 4012 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp121_) {
-#line 29008 "Photo.c"
+#line 29009 "Photo.c"
 		gchar** _tmp124_ = NULL;
 		gint _tmp124__length1 = 0;
 		gchar* _tmp125_ = NULL;
@@ -29036,7 +29037,7 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF
 		_tmp128_ = photo_is_editable_source (self);
 #line 4016 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp128_) {
-#line 29036 "Photo.c"
+#line 29037 "Photo.c"
 			gchar** _tmp129_ = NULL;
 			gint _tmp129__length1 = 0;
 			gchar* _tmp130_ = NULL;
@@ -29048,7 +29049,7 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF
 			_tmp130_ = g_strdup ("image:source");
 #line 4017 "/home/jens/Source/shotwell/src/Photo.vala"
 			_vala_array_add274 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp130_);
-#line 29048 "Photo.c"
+#line 29049 "Photo.c"
 		}
 	}
 #line 4020 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -29057,7 +29058,7 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF
 	_tmp131__length1 = alteration_list_length1;
 #line 4020 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp131__length1 > 0) {
-#line 29057 "Photo.c"
+#line 29058 "Photo.c"
 		gchar** _tmp132_ = NULL;
 		gint _tmp132__length1 = 0;
 		Alteration* _tmp133_ = NULL;
@@ -29074,7 +29075,7 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF
 		data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp134_);
 #line 4021 "/home/jens/Source/shotwell/src/Photo.vala"
 		_alteration_unref0 (_tmp134_);
-#line 29074 "Photo.c"
+#line 29075 "Photo.c"
 	}
 #line 3903 "/home/jens/Source/shotwell/src/Photo.vala"
 	alteration_list = (_vala_array_free (alteration_list, alteration_list_length1, (GDestroyNotify) g_free), NULL);
@@ -29088,7 +29089,7 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF
 	_photo_file_adapter_unref0 (reader);
 #line 3903 "/home/jens/Source/shotwell/src/Photo.vala"
 	_photo_file_adapter_unref0 (old_reader);
-#line 29088 "Photo.c"
+#line 29089 "Photo.c"
 }
 
 
@@ -29112,14 +29113,14 @@ static void photo_detach_editable (Photo* self, gboolean delete_editable, gboole
 	has_editable = FALSE;
 #line 4028 "/home/jens/Source/shotwell/src/Photo.vala"
 	editable_file = NULL;
-#line 29112 "Photo.c"
+#line 29113 "Photo.c"
 	{
 		PhotoBackingReaders* _tmp0_ = NULL;
 #line 4029 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->priv->readers;
 #line 4029 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_readers);
-#line 29119 "Photo.c"
+#line 29120 "Photo.c"
 		{
 			PhotoBackingReaders* _tmp1_ = NULL;
 			PhotoFileReader* _tmp2_ = NULL;
@@ -29129,7 +29130,7 @@ static void photo_detach_editable (Photo* self, gboolean delete_editable, gboole
 			_tmp2_ = _tmp1_->editable;
 #line 4030 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp2_ != NULL) {
-#line 29129 "Photo.c"
+#line 29130 "Photo.c"
 				PhotoBackingReaders* _tmp3_ = NULL;
 				PhotoFileReader* _tmp4_ = NULL;
 				GFile* _tmp5_ = NULL;
@@ -29152,17 +29153,17 @@ static void photo_detach_editable (Photo* self, gboolean delete_editable, gboole
 				_tmp6_->editable = NULL;
 #line 4033 "/home/jens/Source/shotwell/src/Photo.vala"
 				has_editable = TRUE;
-#line 29152 "Photo.c"
+#line 29153 "Photo.c"
 			}
 		}
-		__finally383:
+		__finally396:
 		{
 			PhotoBackingReaders* _tmp7_ = NULL;
 #line 4029 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp7_ = self->priv->readers;
 #line 4029 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 29162 "Photo.c"
+#line 29163 "Photo.c"
 		}
 #line 4029 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -29174,18 +29175,18 @@ static void photo_detach_editable (Photo* self, gboolean delete_editable, gboole
 			g_clear_error (&_inner_error_);
 #line 4029 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 29174 "Photo.c"
+#line 29175 "Photo.c"
 		}
 	}
 #line 4037 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp8_ = has_editable;
 #line 4037 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp8_) {
-#line 29181 "Photo.c"
+#line 29182 "Photo.c"
 		BackingPhotoID editable_id = {0};
 #line 4038 "/home/jens/Source/shotwell/src/Photo.vala"
 		backing_photo_id_init (&editable_id, BACKING_PHOTO_ID_INVALID);
-#line 29185 "Photo.c"
+#line 29186 "Photo.c"
 		{
 			{
 				PhotoRow* _tmp9_ = NULL;
@@ -29193,7 +29194,7 @@ static void photo_detach_editable (Photo* self, gboolean delete_editable, gboole
 				_tmp9_ = self->row;
 #line 4040 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_lock (&self->priv->__lock_row);
-#line 29193 "Photo.c"
+#line 29194 "Photo.c"
 				{
 					PhotoRow* _tmp10_ = NULL;
 					BackingPhotoID _tmp11_ = {0};
@@ -29211,7 +29212,7 @@ static void photo_detach_editable (Photo* self, gboolean delete_editable, gboole
 					_tmp12_ = backing_photo_id_is_valid (&editable_id);
 #line 4042 "/home/jens/Source/shotwell/src/Photo.vala"
 					if (_tmp12_) {
-#line 29211 "Photo.c"
+#line 29212 "Photo.c"
 						PhotoTable* _tmp13_ = NULL;
 						PhotoTable* _tmp14_ = NULL;
 						PhotoRow* _tmp15_ = NULL;
@@ -29227,8 +29228,8 @@ static void photo_detach_editable (Photo* self, gboolean delete_editable, gboole
 						_database_table_unref0 (_tmp14_);
 #line 4043 "/home/jens/Source/shotwell/src/Photo.vala"
 						if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 29227 "Photo.c"
-							goto __finally385;
+#line 29228 "Photo.c"
+							goto __finally398;
 						}
 					}
 #line 4044 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -29241,23 +29242,23 @@ static void photo_detach_editable (Photo* self, gboolean delete_editable, gboole
 					_backing_photo_row_unref0 (self->backing_photo_row);
 #line 4044 "/home/jens/Source/shotwell/src/Photo.vala"
 					self->backing_photo_row = _tmp18_;
-#line 29241 "Photo.c"
+#line 29242 "Photo.c"
 				}
-				__finally385:
+				__finally398:
 				{
 					PhotoRow* _tmp19_ = NULL;
 #line 4040 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp19_ = self->row;
 #line 4040 "/home/jens/Source/shotwell/src/Photo.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 29250 "Photo.c"
+#line 29251 "Photo.c"
 				}
 #line 4040 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 4040 "/home/jens/Source/shotwell/src/Photo.vala"
 					if (_inner_error_->domain == DATABASE_ERROR) {
-#line 29256 "Photo.c"
-						goto __catch384_database_error;
+#line 29257 "Photo.c"
+						goto __catch397_database_error;
 					}
 #line 4040 "/home/jens/Source/shotwell/src/Photo.vala"
 					_g_object_unref0 (editable_file);
@@ -29267,12 +29268,12 @@ static void photo_detach_editable (Photo* self, gboolean delete_editable, gboole
 					g_clear_error (&_inner_error_);
 #line 4040 "/home/jens/Source/shotwell/src/Photo.vala"
 					return;
-#line 29267 "Photo.c"
+#line 29268 "Photo.c"
 				}
 			}
 		}
-		goto __finally384;
-		__catch384_database_error:
+		goto __finally397;
+		__catch397_database_error:
 		{
 			GError* err = NULL;
 			GError* _tmp20_ = NULL;
@@ -29289,9 +29290,9 @@ static void photo_detach_editable (Photo* self, gboolean delete_editable, gboole
 			g_warning ("Photo.vala:4047: Unable to remove editable from PhotoTable: %s", _tmp21_);
 #line 4039 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_error_free0 (err);
-#line 29289 "Photo.c"
+#line 29290 "Photo.c"
 		}
-		__finally384:
+		__finally397:
 #line 4039 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 4039 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -29302,7 +29303,7 @@ static void photo_detach_editable (Photo* self, gboolean delete_editable, gboole
 			g_clear_error (&_inner_error_);
 #line 4039 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 29302 "Photo.c"
+#line 29303 "Photo.c"
 		}
 		{
 			gboolean _tmp22_ = FALSE;
@@ -29310,7 +29311,7 @@ static void photo_detach_editable (Photo* self, gboolean delete_editable, gboole
 			_tmp22_ = backing_photo_id_is_valid (&editable_id);
 #line 4051 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp22_) {
-#line 29310 "Photo.c"
+#line 29311 "Photo.c"
 				BackingPhotoTable* _tmp23_ = NULL;
 				BackingPhotoTable* _tmp24_ = NULL;
 				BackingPhotoID _tmp25_ = {0};
@@ -29328,8 +29329,8 @@ static void photo_detach_editable (Photo* self, gboolean delete_editable, gboole
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 4052 "/home/jens/Source/shotwell/src/Photo.vala"
 					if (_inner_error_->domain == DATABASE_ERROR) {
-#line 29328 "Photo.c"
-						goto __catch386_database_error;
+#line 29329 "Photo.c"
+						goto __catch399_database_error;
 					}
 #line 4052 "/home/jens/Source/shotwell/src/Photo.vala"
 					_g_object_unref0 (editable_file);
@@ -29339,12 +29340,12 @@ static void photo_detach_editable (Photo* self, gboolean delete_editable, gboole
 					g_clear_error (&_inner_error_);
 #line 4052 "/home/jens/Source/shotwell/src/Photo.vala"
 					return;
-#line 29339 "Photo.c"
+#line 29340 "Photo.c"
 				}
 			}
 		}
-		goto __finally386;
-		__catch386_database_error:
+		goto __finally399;
+		__catch399_database_error:
 		{
 			GError* err = NULL;
 			GError* _tmp26_ = NULL;
@@ -29361,9 +29362,9 @@ static void photo_detach_editable (Photo* self, gboolean delete_editable, gboole
 			g_warning ("Photo.vala:4054: Unable to remove editable from BackingPhotoTable: %s", _tmp27_);
 #line 4050 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_error_free0 (err);
-#line 29361 "Photo.c"
+#line 29362 "Photo.c"
 		}
-		__finally386:
+		__finally399:
 #line 4050 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 4050 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -29374,7 +29375,7 @@ static void photo_detach_editable (Photo* self, gboolean delete_editable, gboole
 			g_clear_error (&_inner_error_);
 #line 4050 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 29374 "Photo.c"
+#line 29375 "Photo.c"
 		}
 	}
 #line 4058 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -29383,13 +29384,13 @@ static void photo_detach_editable (Photo* self, gboolean delete_editable, gboole
 	if (_tmp28_) {
 #line 4059 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_internal_remove_all_transformations (self, FALSE);
-#line 29383 "Photo.c"
+#line 29384 "Photo.c"
 	}
 #line 4061 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp29_ = has_editable;
 #line 4061 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp29_) {
-#line 29389 "Photo.c"
+#line 29390 "Photo.c"
 		GFile* _tmp30_ = NULL;
 #line 4062 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_notify_baseline_replaced (self);
@@ -29397,27 +29398,27 @@ static void photo_detach_editable (Photo* self, gboolean delete_editable, gboole
 		_tmp30_ = editable_file;
 #line 4063 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_notify_editable_replaced (self, _tmp30_, NULL);
-#line 29397 "Photo.c"
+#line 29398 "Photo.c"
 	}
 #line 4066 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp32_ = delete_editable;
 #line 4066 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp32_) {
-#line 29403 "Photo.c"
+#line 29404 "Photo.c"
 		GFile* _tmp33_ = NULL;
 #line 4066 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp33_ = editable_file;
 #line 4066 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp31_ = _tmp33_ != NULL;
-#line 29409 "Photo.c"
+#line 29410 "Photo.c"
 	} else {
 #line 4066 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp31_ = FALSE;
-#line 29413 "Photo.c"
+#line 29414 "Photo.c"
 	}
 #line 4066 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp31_) {
-#line 29417 "Photo.c"
+#line 29418 "Photo.c"
 		{
 			GFile* _tmp34_ = NULL;
 #line 4068 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -29426,12 +29427,12 @@ static void photo_detach_editable (Photo* self, gboolean delete_editable, gboole
 			g_file_trash (_tmp34_, NULL, &_inner_error_);
 #line 4068 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 29426 "Photo.c"
-				goto __catch387_g_error;
+#line 29427 "Photo.c"
+				goto __catch400_g_error;
 			}
 		}
-		goto __finally387;
-		__catch387_g_error:
+		goto __finally400;
+		__catch400_g_error:
 		{
 			GError* err = NULL;
 			GFile* _tmp35_ = NULL;
@@ -29467,9 +29468,9 @@ static void photo_detach_editable (Photo* self, gboolean delete_editable, gboole
 			_g_free0 (_tmp37_);
 #line 4067 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_error_free0 (err);
-#line 29467 "Photo.c"
+#line 29468 "Photo.c"
 		}
-		__finally387:
+		__finally400:
 #line 4067 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 4067 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -29480,7 +29481,7 @@ static void photo_detach_editable (Photo* self, gboolean delete_editable, gboole
 			g_clear_error (&_inner_error_);
 #line 4067 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 29480 "Photo.c"
+#line 29481 "Photo.c"
 		}
 	}
 #line 4075 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -29489,32 +29490,32 @@ static void photo_detach_editable (Photo* self, gboolean delete_editable, gboole
 	if (_tmp44_) {
 #line 4075 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp43_ = TRUE;
-#line 29489 "Photo.c"
+#line 29490 "Photo.c"
 	} else {
 		gboolean _tmp45_ = FALSE;
 #line 4075 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp45_ = remove_transformations;
 #line 4075 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp43_ = _tmp45_;
-#line 29496 "Photo.c"
+#line 29497 "Photo.c"
 	}
 #line 4075 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp43_) {
-#line 29500 "Photo.c"
+#line 29501 "Photo.c"
 		gboolean _tmp46_ = FALSE;
 #line 4075 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp46_ = notify;
 #line 4075 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp42_ = _tmp46_;
-#line 29506 "Photo.c"
+#line 29507 "Photo.c"
 	} else {
 #line 4075 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp42_ = FALSE;
-#line 29510 "Photo.c"
+#line 29511 "Photo.c"
 	}
 #line 4075 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp42_) {
-#line 29514 "Photo.c"
+#line 29515 "Photo.c"
 		Alteration* _tmp47_ = NULL;
 		Alteration* _tmp48_ = NULL;
 #line 4076 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -29525,32 +29526,32 @@ static void photo_detach_editable (Photo* self, gboolean delete_editable, gboole
 		data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp48_);
 #line 4076 "/home/jens/Source/shotwell/src/Photo.vala"
 		_alteration_unref0 (_tmp48_);
-#line 29525 "Photo.c"
+#line 29526 "Photo.c"
 	}
 #line 4024 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (editable_file);
-#line 29529 "Photo.c"
+#line 29530 "Photo.c"
 }
 
 
 static void _photo_on_reimport_editable_one_shot_callback (gpointer self) {
 #line 4098 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_on_reimport_editable ((Photo*) self);
-#line 29536 "Photo.c"
+#line 29537 "Photo.c"
 }
 
 
 static void _photo_on_update_editable_attributes_one_shot_callback (gpointer self) {
 #line 4107 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_on_update_editable_attributes ((Photo*) self);
-#line 29543 "Photo.c"
+#line 29544 "Photo.c"
 }
 
 
 static void _photo_on_remove_editable_one_shot_callback (gpointer self) {
 #line 4116 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_on_remove_editable ((Photo*) self);
-#line 29550 "Photo.c"
+#line 29551 "Photo.c"
 }
 
 
@@ -29568,14 +29569,14 @@ static void photo_on_editable_file_changed (Photo* self, GFile* file, GFile* oth
 	g_return_if_fail (G_IS_FILE (file));
 #line 4079 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail ((other_file == NULL) || G_IS_FILE (other_file));
-#line 29568 "Photo.c"
+#line 29569 "Photo.c"
 	{
 		PhotoBackingReaders* _tmp0_ = NULL;
 #line 4081 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->priv->readers;
 #line 4081 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_readers);
-#line 29575 "Photo.c"
+#line 29576 "Photo.c"
 		{
 			PhotoBackingReaders* _tmp1_ = NULL;
 			PhotoFileReader* _tmp2_ = NULL;
@@ -29610,28 +29611,28 @@ static void photo_on_editable_file_changed (Photo* self, GFile* file, GFile* oth
 			_g_object_unref0 (_tmp7_);
 #line 4084 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp9_) {
-#line 29610 "Photo.c"
+#line 29611 "Photo.c"
 				{
 					PhotoBackingReaders* _tmp10_ = NULL;
 #line 4081 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp10_ = self->priv->readers;
 #line 4081 "/home/jens/Source/shotwell/src/Photo.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 29617 "Photo.c"
+#line 29618 "Photo.c"
 				}
 #line 4088 "/home/jens/Source/shotwell/src/Photo.vala"
 				return;
-#line 29621 "Photo.c"
+#line 29622 "Photo.c"
 			}
 		}
-		__finally388:
+		__finally401:
 		{
 			PhotoBackingReaders* _tmp11_ = NULL;
 #line 4081 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp11_ = self->priv->readers;
 #line 4081 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 29631 "Photo.c"
+#line 29632 "Photo.c"
 		}
 #line 4081 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -29641,7 +29642,7 @@ static void photo_on_editable_file_changed (Photo* self, GFile* file, GFile* oth
 			g_clear_error (&_inner_error_);
 #line 4081 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 29641 "Photo.c"
+#line 29642 "Photo.c"
 		}
 	}
 #line 4092 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -29666,7 +29667,7 @@ static void photo_on_editable_file_changed (Photo* self, GFile* file, GFile* oth
 		case G_FILE_MONITOR_EVENT_CHANGED:
 #line 4094 "/home/jens/Source/shotwell/src/Photo.vala"
 		case G_FILE_MONITOR_EVENT_CREATED:
-#line 29666 "Photo.c"
+#line 29667 "Photo.c"
 		{
 			OneShotScheduler* _tmp18_ = NULL;
 			OneShotScheduler* _tmp20_ = NULL;
@@ -29674,7 +29675,7 @@ static void photo_on_editable_file_changed (Photo* self, GFile* file, GFile* oth
 			_tmp18_ = self->priv->reimport_editable_scheduler;
 #line 4097 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp18_ == NULL) {
-#line 29674 "Photo.c"
+#line 29675 "Photo.c"
 				OneShotScheduler* _tmp19_ = NULL;
 #line 4098 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp19_ = one_shot_scheduler_new ("Photo.reimport_editable", _photo_on_reimport_editable_one_shot_callback, self);
@@ -29682,7 +29683,7 @@ static void photo_on_editable_file_changed (Photo* self, GFile* file, GFile* oth
 				_one_shot_scheduler_unref0 (self->priv->reimport_editable_scheduler);
 #line 4098 "/home/jens/Source/shotwell/src/Photo.vala"
 				self->priv->reimport_editable_scheduler = _tmp19_;
-#line 29682 "Photo.c"
+#line 29683 "Photo.c"
 			}
 #line 4102 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp20_ = self->priv->reimport_editable_scheduler;
@@ -29690,11 +29691,11 @@ static void photo_on_editable_file_changed (Photo* self, GFile* file, GFile* oth
 			one_shot_scheduler_after_timeout (_tmp20_, (guint) 1000, TRUE);
 #line 4103 "/home/jens/Source/shotwell/src/Photo.vala"
 			break;
-#line 29690 "Photo.c"
+#line 29691 "Photo.c"
 		}
 #line 4094 "/home/jens/Source/shotwell/src/Photo.vala"
 		case G_FILE_MONITOR_EVENT_ATTRIBUTE_CHANGED:
-#line 29694 "Photo.c"
+#line 29695 "Photo.c"
 		{
 			OneShotScheduler* _tmp21_ = NULL;
 			OneShotScheduler* _tmp23_ = NULL;
@@ -29702,7 +29703,7 @@ static void photo_on_editable_file_changed (Photo* self, GFile* file, GFile* oth
 			_tmp21_ = self->priv->update_editable_attributes_scheduler;
 #line 4106 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp21_ == NULL) {
-#line 29702 "Photo.c"
+#line 29703 "Photo.c"
 				OneShotScheduler* _tmp22_ = NULL;
 #line 4107 "/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);
@@ -29710,7 +29711,7 @@ static void photo_on_editable_file_changed (Photo* self, GFile* file, GFile* oth
 				_one_shot_scheduler_unref0 (self->priv->update_editable_attributes_scheduler);
 #line 4107 "/home/jens/Source/shotwell/src/Photo.vala"
 				self->priv->update_editable_attributes_scheduler = _tmp22_;
-#line 29710 "Photo.c"
+#line 29711 "Photo.c"
 			}
 #line 4111 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp23_ = self->priv->update_editable_attributes_scheduler;
@@ -29718,11 +29719,11 @@ static void photo_on_editable_file_changed (Photo* self, GFile* file, GFile* oth
 			one_shot_scheduler_after_timeout (_tmp23_, (guint) 1000, TRUE);
 #line 4112 "/home/jens/Source/shotwell/src/Photo.vala"
 			break;
-#line 29718 "Photo.c"
+#line 29719 "Photo.c"
 		}
 #line 4094 "/home/jens/Source/shotwell/src/Photo.vala"
 		case G_FILE_MONITOR_EVENT_DELETED:
-#line 29722 "Photo.c"
+#line 29723 "Photo.c"
 		{
 			OneShotScheduler* _tmp24_ = NULL;
 			OneShotScheduler* _tmp26_ = NULL;
@@ -29730,7 +29731,7 @@ static void photo_on_editable_file_changed (Photo* self, GFile* file, GFile* oth
 			_tmp24_ = self->priv->remove_editable_scheduler;
 #line 4115 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp24_ == NULL) {
-#line 29730 "Photo.c"
+#line 29731 "Photo.c"
 				OneShotScheduler* _tmp25_ = NULL;
 #line 4116 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp25_ = one_shot_scheduler_new ("Photo.remove_editable", _photo_on_remove_editable_one_shot_callback, self);
@@ -29738,7 +29739,7 @@ static void photo_on_editable_file_changed (Photo* self, GFile* file, GFile* oth
 				_one_shot_scheduler_unref0 (self->priv->remove_editable_scheduler);
 #line 4116 "/home/jens/Source/shotwell/src/Photo.vala"
 				self->priv->remove_editable_scheduler = _tmp25_;
-#line 29738 "Photo.c"
+#line 29739 "Photo.c"
 			}
 #line 4120 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp26_ = self->priv->remove_editable_scheduler;
@@ -29746,21 +29747,21 @@ static void photo_on_editable_file_changed (Photo* self, GFile* file, GFile* oth
 			one_shot_scheduler_after_timeout (_tmp26_, (guint) 3000, TRUE);
 #line 4121 "/home/jens/Source/shotwell/src/Photo.vala"
 			break;
-#line 29746 "Photo.c"
+#line 29747 "Photo.c"
 		}
 		default:
 #line 4094 "/home/jens/Source/shotwell/src/Photo.vala"
 		case G_FILE_MONITOR_EVENT_CHANGES_DONE_HINT:
-#line 29751 "Photo.c"
+#line 29752 "Photo.c"
 		{
 #line 4126 "/home/jens/Source/shotwell/src/Photo.vala"
 			break;
-#line 29755 "Photo.c"
+#line 29756 "Photo.c"
 		}
 	}
 #line 4131 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_discard_prefetched (self);
-#line 29760 "Photo.c"
+#line 29761 "Photo.c"
 }
 
 
@@ -29780,18 +29781,18 @@ static void photo_on_reimport_editable (Photo* self) {
 	g_debug ("Photo.vala:4138: Reimporting editable for %s", _tmp1_);
 #line 4138 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_free0 (_tmp1_);
-#line 29780 "Photo.c"
+#line 29781 "Photo.c"
 	{
 #line 4140 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_reimport_editable (self, &_inner_error_);
 #line 4140 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 29786 "Photo.c"
-			goto __catch389_g_error;
+#line 29787 "Photo.c"
+			goto __catch402_g_error;
 		}
 	}
-	goto __finally389;
-	__catch389_g_error:
+	goto __finally402;
+	__catch402_g_error:
 	{
 		GError* err = NULL;
 		gchar* _tmp2_ = NULL;
@@ -29817,9 +29818,9 @@ static void photo_on_reimport_editable (Photo* self) {
 		_g_free0 (_tmp3_);
 #line 4139 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_error_free0 (err);
-#line 29816 "Photo.c"
+#line 29817 "Photo.c"
 	}
-	__finally389:
+	__finally402:
 #line 4139 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 4139 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -29828,7 +29829,7 @@ static void photo_on_reimport_editable (Photo* self) {
 		g_clear_error (&_inner_error_);
 #line 4139 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 29827 "Photo.c"
+#line 29828 "Photo.c"
 	}
 }
 
@@ -29847,18 +29848,18 @@ static void photo_on_update_editable_attributes (Photo* self) {
 	g_debug ("Photo.vala:4148: Updating editable attributes for %s", _tmp1_);
 #line 4148 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_free0 (_tmp1_);
-#line 29846 "Photo.c"
+#line 29847 "Photo.c"
 	{
 #line 4150 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_update_editable_attributes (self, &_inner_error_);
 #line 4150 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 29852 "Photo.c"
-			goto __catch390_g_error;
+#line 29853 "Photo.c"
+			goto __catch403_g_error;
 		}
 	}
-	goto __finally390;
-	__catch390_g_error:
+	goto __finally403;
+	__catch403_g_error:
 	{
 		GError* err = NULL;
 		GError* _tmp2_ = NULL;
@@ -29875,9 +29876,9 @@ static void photo_on_update_editable_attributes (Photo* self) {
 		g_warning ("Photo.vala:4152: Unable to update editable attributes: %s", _tmp3_);
 #line 4149 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_error_free0 (err);
-#line 29874 "Photo.c"
+#line 29875 "Photo.c"
 	}
-	__finally390:
+	__finally403:
 #line 4149 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 4149 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -29886,7 +29887,7 @@ static void photo_on_update_editable_attributes (Photo* self) {
 		g_clear_error (&_inner_error_);
 #line 4149 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 29885 "Photo.c"
+#line 29886 "Photo.c"
 	}
 }
 
@@ -29916,7 +29917,7 @@ static void photo_on_remove_editable (Photo* self) {
 		_photo_file_adapter_unref0 (reader);
 #line 4159 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 29915 "Photo.c"
+#line 29916 "Photo.c"
 	}
 #line 4161 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = reader;
@@ -29930,7 +29931,7 @@ static void photo_on_remove_editable (Photo* self) {
 	_tmp5_ = g_file_query_exists (_tmp4_, NULL);
 #line 4162 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp5_) {
-#line 29929 "Photo.c"
+#line 29930 "Photo.c"
 		gchar* _tmp6_ = NULL;
 		gchar* _tmp7_ = NULL;
 #line 4163 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -29947,7 +29948,7 @@ static void photo_on_remove_editable (Photo* self) {
 		_photo_file_adapter_unref0 (reader);
 #line 4165 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 29946 "Photo.c"
+#line 29947 "Photo.c"
 	}
 #line 4168 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp8_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject));
@@ -29963,7 +29964,7 @@ static void photo_on_remove_editable (Photo* self) {
 	_g_object_unref0 (file);
 #line 4156 "/home/jens/Source/shotwell/src/Photo.vala"
 	_photo_file_adapter_unref0 (reader);
-#line 29962 "Photo.c"
+#line 29963 "Photo.c"
 }
 
 
@@ -29992,7 +29993,7 @@ void photo_get_original_dimensions (Photo* self, Dimensions* result) {
 	*result = _tmp3_;
 #line 4181 "/home/jens/Source/shotwell/src/Photo.vala"
 	return;
-#line 29991 "Photo.c"
+#line 29992 "Photo.c"
 }
 
 
@@ -30012,7 +30013,7 @@ void photo_get_master_dimensions (Photo* self, Dimensions* result) {
 	*result = _tmp2_;
 #line 4186 "/home/jens/Source/shotwell/src/Photo.vala"
 	return;
-#line 30011 "Photo.c"
+#line 30012 "Photo.c"
 }
 
 
@@ -30044,11 +30045,11 @@ gboolean photo_get_crop (Photo* self, Box* crop, PhotoException exceptions) {
 		if (crop) {
 #line 4195 "/home/jens/Source/shotwell/src/Photo.vala"
 			*crop = _vala_crop;
-#line 30043 "Photo.c"
+#line 30044 "Photo.c"
 		}
 #line 4195 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 30047 "Photo.c"
+#line 30048 "Photo.c"
 	}
 #line 4198 "/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_);
@@ -30064,7 +30065,7 @@ gboolean photo_get_crop (Photo* self, Box* crop, PhotoException exceptions) {
 	_tmp5_ = photo_exception_allows (_tmp4_, PHOTO_EXCEPTION_ORIENTATION);
 #line 4201 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp5_) {
-#line 30063 "Photo.c"
+#line 30064 "Photo.c"
 		Orientation _tmp6_ = 0;
 		Dimensions _tmp7_ = {0};
 		Box _tmp8_ = {0};
@@ -30079,14 +30080,14 @@ gboolean photo_get_crop (Photo* self, Box* crop, PhotoException exceptions) {
 		orientation_rotate_box (_tmp6_, &_tmp7_, &_tmp8_, &_tmp9_);
 #line 4202 "/home/jens/Source/shotwell/src/Photo.vala"
 		_vala_crop = _tmp9_;
-#line 30078 "Photo.c"
+#line 30079 "Photo.c"
 	} else {
 		Box _tmp10_ = {0};
 #line 4204 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp10_ = raw;
 #line 4204 "/home/jens/Source/shotwell/src/Photo.vala"
 		_vala_crop = _tmp10_;
-#line 30085 "Photo.c"
+#line 30086 "Photo.c"
 	}
 #line 4206 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = TRUE;
@@ -30094,11 +30095,11 @@ gboolean photo_get_crop (Photo* self, Box* crop, PhotoException exceptions) {
 	if (crop) {
 #line 4206 "/home/jens/Source/shotwell/src/Photo.vala"
 		*crop = _vala_crop;
-#line 30093 "Photo.c"
+#line 30094 "Photo.c"
 	}
 #line 4206 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 30097 "Photo.c"
+#line 30098 "Photo.c"
 }
 
 
@@ -30216,7 +30217,7 @@ void photo_set_crop (Photo* self, Box* crop) {
 	_tmp29_ = derotated;
 #line 4222 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_set_raw_crop (self, &_tmp29_);
-#line 30215 "Photo.c"
+#line 30216 "Photo.c"
 }
 
 
@@ -30239,11 +30240,11 @@ gboolean photo_get_straighten (Photo* self, gdouble* theta) {
 		if (theta) {
 #line 4227 "/home/jens/Source/shotwell/src/Photo.vala"
 			*theta = _vala_theta;
-#line 30238 "Photo.c"
+#line 30239 "Photo.c"
 		}
 #line 4227 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 30242 "Photo.c"
+#line 30243 "Photo.c"
 	}
 #line 4229 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = TRUE;
@@ -30251,11 +30252,11 @@ gboolean photo_get_straighten (Photo* self, gdouble* theta) {
 	if (theta) {
 #line 4229 "/home/jens/Source/shotwell/src/Photo.vala"
 		*theta = _vala_theta;
-#line 30250 "Photo.c"
+#line 30251 "Photo.c"
 	}
 #line 4229 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 30254 "Photo.c"
+#line 30255 "Photo.c"
 }
 
 
@@ -30267,7 +30268,7 @@ void photo_set_straighten (Photo* self, gdouble theta) {
 	_tmp0_ = theta;
 #line 4233 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_set_raw_straighten (self, _tmp0_);
-#line 30266 "Photo.c"
+#line 30267 "Photo.c"
 }
 
 
@@ -30351,7 +30352,7 @@ static GdkPixbuf* photo_do_redeye (Photo* self, GdkPixbuf* pixbuf, EditingToolsR
 	_x_insets_first_quadrant_size_ = x_insets_first_quadrant_length1;
 #line 4249 "/home/jens/Source/shotwell/src/Photo.vala"
 	i = 0;
-#line 30350 "Photo.c"
+#line 30351 "Photo.c"
 	{
 		gdouble y = 0.0;
 		gdouble _tmp5_ = 0.0;
@@ -30359,14 +30360,14 @@ static GdkPixbuf* photo_do_redeye (Photo* self, GdkPixbuf* pixbuf, EditingToolsR
 		_tmp5_ = r;
 #line 4250 "/home/jens/Source/shotwell/src/Photo.vala"
 		y = _tmp5_;
-#line 30358 "Photo.c"
+#line 30359 "Photo.c"
 		{
 			gboolean _tmp6_ = FALSE;
 #line 4250 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp6_ = TRUE;
 #line 4250 "/home/jens/Source/shotwell/src/Photo.vala"
 			while (TRUE) {
-#line 30365 "Photo.c"
+#line 30366 "Photo.c"
 				gdouble _tmp8_ = 0.0;
 				gdouble theta = 0.0;
 				gdouble _tmp9_ = 0.0;
@@ -30386,13 +30387,13 @@ static GdkPixbuf* photo_do_redeye (Photo* self, GdkPixbuf* pixbuf, EditingToolsR
 				gint _tmp21_ = 0;
 #line 4250 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (!_tmp6_) {
-#line 30385 "Photo.c"
+#line 30386 "Photo.c"
 					gdouble _tmp7_ = 0.0;
 #line 4250 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp7_ = y;
 #line 4250 "/home/jens/Source/shotwell/src/Photo.vala"
 					y = _tmp7_ - 1.0;
-#line 30391 "Photo.c"
+#line 30392 "Photo.c"
 				}
 #line 4250 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp6_ = FALSE;
@@ -30402,7 +30403,7 @@ static GdkPixbuf* photo_do_redeye (Photo* self, GdkPixbuf* pixbuf, EditingToolsR
 				if (!(_tmp8_ >= 0.0)) {
 #line 4250 "/home/jens/Source/shotwell/src/Photo.vala"
 					break;
-#line 30401 "Photo.c"
+#line 30402 "Photo.c"
 				}
 #line 4251 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp9_ = y;
@@ -30440,7 +30441,7 @@ static GdkPixbuf* photo_do_redeye (Photo* self, GdkPixbuf* pixbuf, EditingToolsR
 				_tmp21_ = i;
 #line 4255 "/home/jens/Source/shotwell/src/Photo.vala"
 				i = _tmp21_ + 1;
-#line 30439 "Photo.c"
+#line 30440 "Photo.c"
 			}
 		}
 	}
@@ -30486,14 +30487,14 @@ static GdkPixbuf* photo_do_redeye (Photo* self, GdkPixbuf* pixbuf, EditingToolsR
 	if (_tmp38_ < 0) {
 #line 4261 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp37_ = 0;
-#line 30485 "Photo.c"
+#line 30486 "Photo.c"
 	} else {
 		gint _tmp39_ = 0;
 #line 4261 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp39_ = ymin;
 #line 4261 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp37_ = _tmp39_;
-#line 30492 "Photo.c"
+#line 30493 "Photo.c"
 	}
 #line 4261 "/home/jens/Source/shotwell/src/Photo.vala"
 	ymin = _tmp37_;
@@ -30515,7 +30516,7 @@ static GdkPixbuf* photo_do_redeye (Photo* self, GdkPixbuf* pixbuf, EditingToolsR
 	_tmp47_ = _tmp46_;
 #line 4263 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp44_ > (_tmp47_ - 1)) {
-#line 30514 "Photo.c"
+#line 30515 "Photo.c"
 		GdkPixbuf* _tmp48_ = NULL;
 		gint _tmp49_ = 0;
 		gint _tmp50_ = 0;
@@ -30527,20 +30528,20 @@ static GdkPixbuf* photo_do_redeye (Photo* self, GdkPixbuf* pixbuf, EditingToolsR
 		_tmp50_ = _tmp49_;
 #line 4263 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp43_ = _tmp50_ - 1;
-#line 30526 "Photo.c"
+#line 30527 "Photo.c"
 	} else {
 		gint _tmp51_ = 0;
 #line 4263 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp51_ = ymax;
 #line 4263 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp43_ = _tmp51_;
-#line 30533 "Photo.c"
+#line 30534 "Photo.c"
 	}
 #line 4263 "/home/jens/Source/shotwell/src/Photo.vala"
 	ymax = _tmp43_;
 #line 4267 "/home/jens/Source/shotwell/src/Photo.vala"
 	inset_index = 0;
-#line 30539 "Photo.c"
+#line 30540 "Photo.c"
 	{
 		gint y_it = 0;
 		gint _tmp52_ = 0;
@@ -30548,14 +30549,14 @@ static GdkPixbuf* photo_do_redeye (Photo* self, GdkPixbuf* pixbuf, EditingToolsR
 		_tmp52_ = ymin;
 #line 4268 "/home/jens/Source/shotwell/src/Photo.vala"
 		y_it = _tmp52_;
-#line 30547 "Photo.c"
+#line 30548 "Photo.c"
 		{
 			gboolean _tmp53_ = FALSE;
 #line 4268 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp53_ = TRUE;
 #line 4268 "/home/jens/Source/shotwell/src/Photo.vala"
 			while (TRUE) {
-#line 30554 "Photo.c"
+#line 30555 "Photo.c"
 				gint _tmp55_ = 0;
 				gint _tmp56_ = 0;
 				gint xmin = 0;
@@ -30580,13 +30581,13 @@ static GdkPixbuf* photo_do_redeye (Photo* self, GdkPixbuf* pixbuf, EditingToolsR
 				gint _tmp87_ = 0;
 #line 4268 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (!_tmp53_) {
-#line 30579 "Photo.c"
+#line 30580 "Photo.c"
 					gint _tmp54_ = 0;
 #line 4268 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp54_ = y_it;
 #line 4268 "/home/jens/Source/shotwell/src/Photo.vala"
 					y_it = _tmp54_ + 1;
-#line 30585 "Photo.c"
+#line 30586 "Photo.c"
 				}
 #line 4268 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp53_ = FALSE;
@@ -30598,7 +30599,7 @@ static GdkPixbuf* photo_do_redeye (Photo* self, GdkPixbuf* pixbuf, EditingToolsR
 				if (!(_tmp55_ <= _tmp56_)) {
 #line 4268 "/home/jens/Source/shotwell/src/Photo.vala"
 					break;
-#line 30597 "Photo.c"
+#line 30598 "Photo.c"
 				}
 #line 4269 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp57_ = x_bounds_min;
@@ -30618,14 +30619,14 @@ static GdkPixbuf* photo_do_redeye (Photo* self, GdkPixbuf* pixbuf, EditingToolsR
 				if (_tmp62_ < 0) {
 #line 4270 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp61_ = 0;
-#line 30617 "Photo.c"
+#line 30618 "Photo.c"
 				} else {
 					gint _tmp63_ = 0;
 #line 4270 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp63_ = xmin;
 #line 4270 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp61_ = _tmp63_;
-#line 30624 "Photo.c"
+#line 30625 "Photo.c"
 				}
 #line 4270 "/home/jens/Source/shotwell/src/Photo.vala"
 				xmin = _tmp61_;
@@ -30651,7 +30652,7 @@ static GdkPixbuf* photo_do_redeye (Photo* self, GdkPixbuf* pixbuf, EditingToolsR
 				_tmp72_ = _tmp71_;
 #line 4272 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp69_ > (_tmp72_ - 1)) {
-#line 30650 "Photo.c"
+#line 30651 "Photo.c"
 					GdkPixbuf* _tmp73_ = NULL;
 					gint _tmp74_ = 0;
 					gint _tmp75_ = 0;
@@ -30663,18 +30664,18 @@ static GdkPixbuf* photo_do_redeye (Photo* self, GdkPixbuf* pixbuf, EditingToolsR
 					_tmp75_ = _tmp74_;
 #line 4272 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp68_ = _tmp75_ - 1;
-#line 30662 "Photo.c"
+#line 30663 "Photo.c"
 				} else {
 					gint _tmp76_ = 0;
 #line 4272 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp76_ = xmax;
 #line 4272 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp68_ = _tmp76_;
-#line 30669 "Photo.c"
+#line 30670 "Photo.c"
 				}
 #line 4272 "/home/jens/Source/shotwell/src/Photo.vala"
 				xmax = _tmp68_;
-#line 30673 "Photo.c"
+#line 30674 "Photo.c"
 				{
 					gint x_it = 0;
 					gint _tmp77_ = 0;
@@ -30682,14 +30683,14 @@ static GdkPixbuf* photo_do_redeye (Photo* self, GdkPixbuf* pixbuf, EditingToolsR
 					_tmp77_ = xmin;
 #line 4274 "/home/jens/Source/shotwell/src/Photo.vala"
 					x_it = _tmp77_;
-#line 30681 "Photo.c"
+#line 30682 "Photo.c"
 					{
 						gboolean _tmp78_ = FALSE;
 #line 4274 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp78_ = TRUE;
 #line 4274 "/home/jens/Source/shotwell/src/Photo.vala"
 						while (TRUE) {
-#line 30688 "Photo.c"
+#line 30689 "Photo.c"
 							gint _tmp80_ = 0;
 							gint _tmp81_ = 0;
 							GdkPixbuf* _tmp82_ = NULL;
@@ -30699,13 +30700,13 @@ static GdkPixbuf* photo_do_redeye (Photo* self, GdkPixbuf* pixbuf, EditingToolsR
 							GdkPixbuf* _tmp86_ = NULL;
 #line 4274 "/home/jens/Source/shotwell/src/Photo.vala"
 							if (!_tmp78_) {
-#line 30698 "Photo.c"
+#line 30699 "Photo.c"
 								gint _tmp79_ = 0;
 #line 4274 "/home/jens/Source/shotwell/src/Photo.vala"
 								_tmp79_ = x_it;
 #line 4274 "/home/jens/Source/shotwell/src/Photo.vala"
 								x_it = _tmp79_ + 1;
-#line 30704 "Photo.c"
+#line 30705 "Photo.c"
 							}
 #line 4274 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp78_ = FALSE;
@@ -30717,7 +30718,7 @@ static GdkPixbuf* photo_do_redeye (Photo* self, GdkPixbuf* pixbuf, EditingToolsR
 							if (!(_tmp80_ <= _tmp81_)) {
 #line 4274 "/home/jens/Source/shotwell/src/Photo.vala"
 								break;
-#line 30716 "Photo.c"
+#line 30717 "Photo.c"
 							}
 #line 4275 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp82_ = pixbuf;
@@ -30731,7 +30732,7 @@ static GdkPixbuf* photo_do_redeye (Photo* self, GdkPixbuf* pixbuf, EditingToolsR
 							_tmp86_ = _tmp85_;
 #line 4275 "/home/jens/Source/shotwell/src/Photo.vala"
 							_g_object_unref0 (_tmp86_);
-#line 30730 "Photo.c"
+#line 30731 "Photo.c"
 						}
 					}
 				}
@@ -30739,7 +30740,7 @@ static GdkPixbuf* photo_do_redeye (Photo* self, GdkPixbuf* pixbuf, EditingToolsR
 				_tmp87_ = inset_index;
 #line 4277 "/home/jens/Source/shotwell/src/Photo.vala"
 				inset_index = _tmp87_ + 1;
-#line 30738 "Photo.c"
+#line 30739 "Photo.c"
 			}
 		}
 	}
@@ -30769,7 +30770,7 @@ static GdkPixbuf* photo_do_redeye (Photo* self, GdkPixbuf* pixbuf, EditingToolsR
 	_tmp96__length1 = x_insets_first_quadrant_length1;
 #line 4284 "/home/jens/Source/shotwell/src/Photo.vala"
 	inset_index = _tmp96__length1 - 1;
-#line 30768 "Photo.c"
+#line 30769 "Photo.c"
 	{
 		gint y_it = 0;
 		gint _tmp97_ = 0;
@@ -30777,14 +30778,14 @@ static GdkPixbuf* photo_do_redeye (Photo* self, GdkPixbuf* pixbuf, EditingToolsR
 		_tmp97_ = ymin;
 #line 4285 "/home/jens/Source/shotwell/src/Photo.vala"
 		y_it = _tmp97_;
-#line 30776 "Photo.c"
+#line 30777 "Photo.c"
 		{
 			gboolean _tmp98_ = FALSE;
 #line 4285 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp98_ = TRUE;
 #line 4285 "/home/jens/Source/shotwell/src/Photo.vala"
 			while (TRUE) {
-#line 30783 "Photo.c"
+#line 30784 "Photo.c"
 				gint _tmp100_ = 0;
 				gint _tmp101_ = 0;
 				gint xmin = 0;
@@ -30809,13 +30810,13 @@ static GdkPixbuf* photo_do_redeye (Photo* self, GdkPixbuf* pixbuf, EditingToolsR
 				gint _tmp132_ = 0;
 #line 4285 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (!_tmp98_) {
-#line 30808 "Photo.c"
+#line 30809 "Photo.c"
 					gint _tmp99_ = 0;
 #line 4285 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp99_ = y_it;
 #line 4285 "/home/jens/Source/shotwell/src/Photo.vala"
 					y_it = _tmp99_ + 1;
-#line 30814 "Photo.c"
+#line 30815 "Photo.c"
 				}
 #line 4285 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp98_ = FALSE;
@@ -30827,7 +30828,7 @@ static GdkPixbuf* photo_do_redeye (Photo* self, GdkPixbuf* pixbuf, EditingToolsR
 				if (!(_tmp100_ <= _tmp101_)) {
 #line 4285 "/home/jens/Source/shotwell/src/Photo.vala"
 					break;
-#line 30826 "Photo.c"
+#line 30827 "Photo.c"
 				}
 #line 4286 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp102_ = x_bounds_min;
@@ -30847,14 +30848,14 @@ static GdkPixbuf* photo_do_redeye (Photo* self, GdkPixbuf* pixbuf, EditingToolsR
 				if (_tmp107_ < 0) {
 #line 4287 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp106_ = 0;
-#line 30846 "Photo.c"
+#line 30847 "Photo.c"
 				} else {
 					gint _tmp108_ = 0;
 #line 4287 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp108_ = xmin;
 #line 4287 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp106_ = _tmp108_;
-#line 30853 "Photo.c"
+#line 30854 "Photo.c"
 				}
 #line 4287 "/home/jens/Source/shotwell/src/Photo.vala"
 				xmin = _tmp106_;
@@ -30880,7 +30881,7 @@ static GdkPixbuf* photo_do_redeye (Photo* self, GdkPixbuf* pixbuf, EditingToolsR
 				_tmp117_ = _tmp116_;
 #line 4289 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp114_ > (_tmp117_ - 1)) {
-#line 30879 "Photo.c"
+#line 30880 "Photo.c"
 					GdkPixbuf* _tmp118_ = NULL;
 					gint _tmp119_ = 0;
 					gint _tmp120_ = 0;
@@ -30892,18 +30893,18 @@ static GdkPixbuf* photo_do_redeye (Photo* self, GdkPixbuf* pixbuf, EditingToolsR
 					_tmp120_ = _tmp119_;
 #line 4289 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp113_ = _tmp120_ - 1;
-#line 30891 "Photo.c"
+#line 30892 "Photo.c"
 				} else {
 					gint _tmp121_ = 0;
 #line 4289 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp121_ = xmax;
 #line 4289 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp113_ = _tmp121_;
-#line 30898 "Photo.c"
+#line 30899 "Photo.c"
 				}
 #line 4289 "/home/jens/Source/shotwell/src/Photo.vala"
 				xmax = _tmp113_;
-#line 30902 "Photo.c"
+#line 30903 "Photo.c"
 				{
 					gint x_it = 0;
 					gint _tmp122_ = 0;
@@ -30911,14 +30912,14 @@ static GdkPixbuf* photo_do_redeye (Photo* self, GdkPixbuf* pixbuf, EditingToolsR
 					_tmp122_ = xmin;
 #line 4291 "/home/jens/Source/shotwell/src/Photo.vala"
 					x_it = _tmp122_;
-#line 30910 "Photo.c"
+#line 30911 "Photo.c"
 					{
 						gboolean _tmp123_ = FALSE;
 #line 4291 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp123_ = TRUE;
 #line 4291 "/home/jens/Source/shotwell/src/Photo.vala"
 						while (TRUE) {
-#line 30917 "Photo.c"
+#line 30918 "Photo.c"
 							gint _tmp125_ = 0;
 							gint _tmp126_ = 0;
 							GdkPixbuf* _tmp127_ = NULL;
@@ -30928,13 +30929,13 @@ static GdkPixbuf* photo_do_redeye (Photo* self, GdkPixbuf* pixbuf, EditingToolsR
 							GdkPixbuf* _tmp131_ = NULL;
 #line 4291 "/home/jens/Source/shotwell/src/Photo.vala"
 							if (!_tmp123_) {
-#line 30927 "Photo.c"
+#line 30928 "Photo.c"
 								gint _tmp124_ = 0;
 #line 4291 "/home/jens/Source/shotwell/src/Photo.vala"
 								_tmp124_ = x_it;
 #line 4291 "/home/jens/Source/shotwell/src/Photo.vala"
 								x_it = _tmp124_ + 1;
-#line 30933 "Photo.c"
+#line 30934 "Photo.c"
 							}
 #line 4291 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp123_ = FALSE;
@@ -30946,7 +30947,7 @@ static GdkPixbuf* photo_do_redeye (Photo* self, GdkPixbuf* pixbuf, EditingToolsR
 							if (!(_tmp125_ <= _tmp126_)) {
 #line 4291 "/home/jens/Source/shotwell/src/Photo.vala"
 								break;
-#line 30945 "Photo.c"
+#line 30946 "Photo.c"
 							}
 #line 4292 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp127_ = pixbuf;
@@ -30960,7 +30961,7 @@ static GdkPixbuf* photo_do_redeye (Photo* self, GdkPixbuf* pixbuf, EditingToolsR
 							_tmp131_ = _tmp130_;
 #line 4292 "/home/jens/Source/shotwell/src/Photo.vala"
 							_g_object_unref0 (_tmp131_);
-#line 30959 "Photo.c"
+#line 30960 "Photo.c"
 						}
 					}
 				}
@@ -30968,7 +30969,7 @@ static GdkPixbuf* photo_do_redeye (Photo* self, GdkPixbuf* pixbuf, EditingToolsR
 				_tmp132_ = inset_index;
 #line 4294 "/home/jens/Source/shotwell/src/Photo.vala"
 				inset_index = _tmp132_ - 1;
-#line 30967 "Photo.c"
+#line 30968 "Photo.c"
 			}
 		}
 	}
@@ -30982,7 +30983,7 @@ static GdkPixbuf* photo_do_redeye (Photo* self, GdkPixbuf* pixbuf, EditingToolsR
 	x_insets_first_quadrant = (g_free (x_insets_first_quadrant), NULL);
 #line 4297 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 30981 "Photo.c"
+#line 30982 "Photo.c"
 }
 
 
@@ -31023,21 +31024,21 @@ static GdkPixbuf* photo_red_reduce_pixel (Photo* self, GdkPixbuf* pixbuf, gint x
 	_tmp9_ = x;
 #line 4308 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp9_ >= 0) {
-#line 31022 "Photo.c"
+#line 31023 "Photo.c"
 		gint _tmp10_ = 0;
 #line 4308 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp10_ = y;
 #line 4308 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp8_ = _tmp10_ >= 0;
-#line 31028 "Photo.c"
+#line 31029 "Photo.c"
 	} else {
 #line 4308 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp8_ = FALSE;
-#line 31032 "Photo.c"
+#line 31033 "Photo.c"
 	}
 #line 4308 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp8_) {
-#line 31036 "Photo.c"
+#line 31037 "Photo.c"
 		gint _tmp11_ = 0;
 		GdkPixbuf* _tmp12_ = NULL;
 		gint _tmp13_ = 0;
@@ -31052,15 +31053,15 @@ static GdkPixbuf* photo_red_reduce_pixel (Photo* self, GdkPixbuf* pixbuf, gint x
 		_tmp14_ = _tmp13_;
 #line 4308 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp7_ = _tmp11_ < _tmp14_;
-#line 31051 "Photo.c"
+#line 31052 "Photo.c"
 	} else {
 #line 4308 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp7_ = FALSE;
-#line 31055 "Photo.c"
+#line 31056 "Photo.c"
 	}
 #line 4308 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp7_) {
-#line 31059 "Photo.c"
+#line 31060 "Photo.c"
 		gint _tmp15_ = 0;
 		GdkPixbuf* _tmp16_ = NULL;
 		gint _tmp17_ = 0;
@@ -31075,15 +31076,15 @@ static GdkPixbuf* photo_red_reduce_pixel (Photo* self, GdkPixbuf* pixbuf, gint x
 		_tmp18_ = _tmp17_;
 #line 4308 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp6_ = _tmp15_ < _tmp18_;
-#line 31074 "Photo.c"
+#line 31075 "Photo.c"
 	} else {
 #line 4308 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp6_ = FALSE;
-#line 31078 "Photo.c"
+#line 31079 "Photo.c"
 	}
 #line 4308 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp6_) {
-#line 31082 "Photo.c"
+#line 31083 "Photo.c"
 		guchar* pixel_data = NULL;
 		GdkPixbuf* _tmp19_ = NULL;
 		guint8* _tmp20_ = NULL;
@@ -31155,7 +31156,7 @@ static GdkPixbuf* photo_red_reduce_pixel (Photo* self, GdkPixbuf* pixbuf, gint x
 		_tmp29_[_tmp30_] = _tmp31_;
 #line 4324 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp32_ = _tmp29_[_tmp30_];
-#line 31154 "Photo.c"
+#line 31155 "Photo.c"
 	}
 #line 4327 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp33_ = pixbuf;
@@ -31165,7 +31166,7 @@ static GdkPixbuf* photo_red_reduce_pixel (Photo* self, GdkPixbuf* pixbuf, gint x
 	result = _tmp34_;
 #line 4327 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 31164 "Photo.c"
+#line 31165 "Photo.c"
 }
 
 
@@ -31216,7 +31217,7 @@ void photo_unscaled_to_raw_point (Photo* self, GdkPoint* unscaled_point, GdkPoin
 	crop_box = _tmp4_;
 #line 4340 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp5_) {
-#line 31215 "Photo.c"
+#line 31216 "Photo.c"
 		Box _tmp6_ = {0};
 		gint _tmp7_ = 0;
 		Box _tmp8_ = {0};
@@ -31233,7 +31234,7 @@ void photo_unscaled_to_raw_point (Photo* self, GdkPoint* unscaled_point, GdkPoin
 		_tmp9_ = _tmp8_.top;
 #line 4342 "/home/jens/Source/shotwell/src/Photo.vala"
 		unscaled_y_offset_raw = _tmp9_;
-#line 31232 "Photo.c"
+#line 31233 "Photo.c"
 	}
 #line 4345 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp10_ = unscaled_orientation;
@@ -31261,7 +31262,7 @@ void photo_unscaled_to_raw_point (Photo* self, GdkPoint* unscaled_point, GdkPoin
 	*result = derotated_point;
 #line 4352 "/home/jens/Source/shotwell/src/Photo.vala"
 	return;
-#line 31260 "Photo.c"
+#line 31261 "Photo.c"
 }
 
 
@@ -31373,7 +31374,7 @@ void photo_unscaled_to_raw_rect (Photo* self, GdkRectangle* unscaled_rect, GdkRe
 	_tmp21_ = _tmp20_.x;
 #line 4366 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp19_ > _tmp21_) {
-#line 31372 "Photo.c"
+#line 31373 "Photo.c"
 		gint temp = 0;
 		GdkPoint _tmp22_ = {0};
 		gint _tmp23_ = 0;
@@ -31396,7 +31397,7 @@ void photo_unscaled_to_raw_rect (Photo* self, GdkRectangle* unscaled_rect, GdkRe
 		_tmp26_ = temp;
 #line 4369 "/home/jens/Source/shotwell/src/Photo.vala"
 		lower_right.x = _tmp26_;
-#line 31395 "Photo.c"
+#line 31396 "Photo.c"
 	}
 #line 4371 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp27_ = upper_left;
@@ -31408,7 +31409,7 @@ void photo_unscaled_to_raw_rect (Photo* self, GdkRectangle* unscaled_rect, GdkRe
 	_tmp30_ = _tmp29_.y;
 #line 4371 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp28_ > _tmp30_) {
-#line 31407 "Photo.c"
+#line 31408 "Photo.c"
 		gint temp = 0;
 		GdkPoint _tmp31_ = {0};
 		gint _tmp32_ = 0;
@@ -31431,7 +31432,7 @@ void photo_unscaled_to_raw_rect (Photo* self, GdkRectangle* unscaled_rect, GdkRe
 		_tmp35_ = temp;
 #line 4374 "/home/jens/Source/shotwell/src/Photo.vala"
 		lower_right.y = _tmp35_;
-#line 31430 "Photo.c"
+#line 31431 "Photo.c"
 	}
 #line 4377 "/home/jens/Source/shotwell/src/Photo.vala"
 	memset (&raw_rect, 0, sizeof (GdkRectangle));
@@ -31471,7 +31472,7 @@ void photo_unscaled_to_raw_rect (Photo* self, GdkRectangle* unscaled_rect, GdkRe
 	*result = raw_rect;
 #line 4383 "/home/jens/Source/shotwell/src/Photo.vala"
 	return;
-#line 31470 "Photo.c"
+#line 31471 "Photo.c"
 }
 
 
@@ -31486,7 +31487,7 @@ PixelTransformationBundle* photo_get_enhance_transformations (Photo* self) {
 	g_return_val_if_fail (IS_PHOTO (self), NULL);
 #line 4387 "/home/jens/Source/shotwell/src/Photo.vala"
 	pixbuf = NULL;
-#line 31485 "Photo.c"
+#line 31486 "Photo.c"
 	{
 		GdkPixbuf* _tmp0_ = NULL;
 		Scaling _tmp1_ = {0};
@@ -31500,8 +31501,8 @@ PixelTransformationBundle* photo_get_enhance_transformations (Photo* self) {
 		_tmp0_ = _tmp2_;
 #line 4394 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 31499 "Photo.c"
-			goto __catch391_g_error;
+#line 31500 "Photo.c"
+			goto __catch404_g_error;
 		}
 #line 4394 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp3_ = _tmp0_;
@@ -31513,10 +31514,10 @@ PixelTransformationBundle* photo_get_enhance_transformations (Photo* self) {
 		pixbuf = _tmp3_;
 #line 4393 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_tmp0_);
-#line 31512 "Photo.c"
+#line 31513 "Photo.c"
 	}
-	goto __finally391;
-	__catch391_g_error:
+	goto __finally404;
+	__catch404_g_error:
 	{
 		GError* e = NULL;
 #line 4393 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -31533,9 +31534,9 @@ PixelTransformationBundle* photo_get_enhance_transformations (Photo* self) {
 		_g_object_unref0 (pixbuf);
 #line 4403 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 31532 "Photo.c"
+#line 31533 "Photo.c"
 	}
-	__finally391:
+	__finally404:
 #line 4393 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 4393 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -31546,7 +31547,7 @@ PixelTransformationBundle* photo_get_enhance_transformations (Photo* self) {
 		g_clear_error (&_inner_error_);
 #line 4393 "/home/jens/Source/shotwell/src/Photo.vala"
 		return NULL;
-#line 31545 "Photo.c"
+#line 31546 "Photo.c"
 	}
 #line 4410 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = pixbuf;
@@ -31560,7 +31561,7 @@ PixelTransformationBundle* photo_get_enhance_transformations (Photo* self) {
 	_g_object_unref0 (pixbuf);
 #line 4418 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 31559 "Photo.c"
+#line 31560 "Photo.c"
 }
 
 
@@ -31586,7 +31587,7 @@ gboolean photo_enhance (Photo* self) {
 		_pixel_transformation_bundle_unref0 (transformations);
 #line 4425 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 31585 "Photo.c"
+#line 31586 "Photo.c"
 	}
 	{
 		PhotoRow* _tmp2_ = NULL;
@@ -31594,23 +31595,23 @@ gboolean photo_enhance (Photo* self) {
 		_tmp2_ = self->row;
 #line 4430 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 31593 "Photo.c"
+#line 31594 "Photo.c"
 		{
 			PixelTransformationBundle* _tmp3_ = NULL;
 #line 4431 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp3_ = transformations;
 #line 4431 "/home/jens/Source/shotwell/src/Photo.vala"
 			photo_set_color_adjustments (self, _tmp3_);
-#line 31600 "Photo.c"
+#line 31601 "Photo.c"
 		}
-		__finally392:
+		__finally405:
 		{
 			PhotoRow* _tmp4_ = NULL;
 #line 4430 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp4_ = self->row;
 #line 4430 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 31609 "Photo.c"
+#line 31610 "Photo.c"
 		}
 #line 4430 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -31622,7 +31623,7 @@ gboolean photo_enhance (Photo* self) {
 			g_clear_error (&_inner_error_);
 #line 4430 "/home/jens/Source/shotwell/src/Photo.vala"
 			return FALSE;
-#line 31621 "Photo.c"
+#line 31622 "Photo.c"
 		}
 	}
 #line 4438 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -31631,7 +31632,7 @@ gboolean photo_enhance (Photo* self) {
 	_pixel_transformation_bundle_unref0 (transformations);
 #line 4438 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 31630 "Photo.c"
+#line 31631 "Photo.c"
 }
 
 
@@ -31644,7 +31645,7 @@ gboolean photo_get_develop_raw_photos_to_files (void) {
 	result = _tmp0_;
 #line 349 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 31643 "Photo.c"
+#line 31644 "Photo.c"
 }
 
 
@@ -31654,7 +31655,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 31653 "Photo.c"
+#line 31654 "Photo.c"
 }
 
 
@@ -31663,7 +31664,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 31662 "Photo.c"
+#line 31663 "Photo.c"
 }
 
 
@@ -31682,19 +31683,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 31681 "Photo.c"
+#line 31682 "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 31687 "Photo.c"
+#line 31688 "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 31693 "Photo.c"
+#line 31694 "Photo.c"
 }
 
 
@@ -31709,7 +31710,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 31708 "Photo.c"
+#line 31709 "Photo.c"
 }
 
 
@@ -31728,47 +31729,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 31727 "Photo.c"
+#line 31728 "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 31733 "Photo.c"
+#line 31734 "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 31739 "Photo.c"
+#line 31740 "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 31746 "Photo.c"
+#line 31747 "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 31753 "Photo.c"
+#line 31754 "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 31760 "Photo.c"
+#line 31761 "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 31767 "Photo.c"
+#line 31768 "Photo.c"
 }
 
 
@@ -31836,14 +31837,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 31835 "Photo.c"
+#line 31836 "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 31842 "Photo.c"
+#line 31843 "Photo.c"
 }
 
 
@@ -31858,7 +31859,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 31857 "Photo.c"
+#line 31858 "Photo.c"
 }
 
 
@@ -31876,7 +31877,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 31875 "Photo.c"
+#line 31876 "Photo.c"
 }
 
 
@@ -31890,7 +31891,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 31889 "Photo.c"
+#line 31890 "Photo.c"
 		PixelTransformer* _tmp2_ = NULL;
 		PixelTransformer* _tmp3_ = NULL;
 #line 269 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -31901,19 +31902,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 31900 "Photo.c"
+#line 31901 "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 31906 "Photo.c"
+#line 31907 "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 31912 "Photo.c"
+#line 31913 "Photo.c"
 }
 
 
@@ -31927,7 +31928,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 31926 "Photo.c"
+#line 31927 "Photo.c"
 		PixelTransformationBundle* _tmp2_ = NULL;
 		PixelTransformationBundle* _tmp3_ = NULL;
 #line 273 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -31938,19 +31939,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 31937 "Photo.c"
+#line 31938 "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 31943 "Photo.c"
+#line 31944 "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 31949 "Photo.c"
+#line 31950 "Photo.c"
 }
 
 
@@ -31969,13 +31970,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 31968 "Photo.c"
+#line 31969 "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 31974 "Photo.c"
+#line 31975 "Photo.c"
 	{
 		GeeIterator* _object_it = NULL;
 		GeeHashMap* _tmp2_ = NULL;
@@ -32002,7 +32003,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 32001 "Photo.c"
+#line 32002 "Photo.c"
 			GeeIterator* _tmp8_ = NULL;
 			gboolean _tmp9_ = FALSE;
 			gchar* object = NULL;
@@ -32024,7 +32025,7 @@ static GeeHashMap* photo_photo_transformation_state_impl_copy_transformations (G
 			if (!_tmp9_) {
 #line 282 "/home/jens/Source/shotwell/src/Photo.vala"
 				break;
-#line 32023 "Photo.c"
+#line 32024 "Photo.c"
 			}
 #line 282 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp10_ = _object_it;
@@ -32056,17 +32057,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 32055 "Photo.c"
+#line 32056 "Photo.c"
 		}
 #line 282 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_object_it);
-#line 32059 "Photo.c"
+#line 32060 "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 32065 "Photo.c"
+#line 32066 "Photo.c"
 }
 
 
@@ -32080,7 +32081,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 32079 "Photo.c"
+#line 32080 "Photo.c"
 	}
 }
 
@@ -32092,14 +32093,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 32091 "Photo.c"
+#line 32092 "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 32098 "Photo.c"
+#line 32099 "Photo.c"
 }
 
 
@@ -32125,7 +32126,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 32124 "Photo.c"
+#line 32125 "Photo.c"
 }
 
 
@@ -32147,21 +32148,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 32146 "Photo.c"
+#line 32147 "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 32153 "Photo.c"
+#line 32154 "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 32160 "Photo.c"
+#line 32161 "Photo.c"
 }
 
 
@@ -32170,7 +32171,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 32169 "Photo.c"
+#line 32170 "Photo.c"
 	}
 }
 
@@ -32180,11 +32181,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 32179 "Photo.c"
+#line 32180 "Photo.c"
 	} else {
 #line 294 "/home/jens/Source/shotwell/src/Photo.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 32183 "Photo.c"
+#line 32184 "Photo.c"
 	}
 }
 
@@ -32192,37 +32193,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 32191 "Photo.c"
+#line 32192 "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 32198 "Photo.c"
+#line 32199 "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 32205 "Photo.c"
+#line 32206 "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 32209 "Photo.c"
+#line 32210 "Photo.c"
 		}
 #line 294 "/home/jens/Source/shotwell/src/Photo.vala"
 		value->data[0].v_pointer = photo_backing_readers_ref (object);
-#line 32213 "Photo.c"
+#line 32214 "Photo.c"
 	} else {
 #line 294 "/home/jens/Source/shotwell/src/Photo.vala"
 		value->data[0].v_pointer = NULL;
-#line 32217 "Photo.c"
+#line 32218 "Photo.c"
 	}
 #line 294 "/home/jens/Source/shotwell/src/Photo.vala"
 	return NULL;
-#line 32221 "Photo.c"
+#line 32222 "Photo.c"
 }
 
 
@@ -32233,25 +32234,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 32232 "Photo.c"
+#line 32233 "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 32238 "Photo.c"
+#line 32239 "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 32242 "Photo.c"
+#line 32243 "Photo.c"
 	} else {
 #line 294 "/home/jens/Source/shotwell/src/Photo.vala"
 		*object_p = photo_backing_readers_ref (value->data[0].v_pointer);
-#line 32246 "Photo.c"
+#line 32247 "Photo.c"
 	}
 #line 294 "/home/jens/Source/shotwell/src/Photo.vala"
 	return NULL;
-#line 32250 "Photo.c"
+#line 32251 "Photo.c"
 }
 
 
@@ -32265,7 +32266,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 32264 "Photo.c"
+#line 32265 "Photo.c"
 }
 
 
@@ -32274,7 +32275,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 32273 "Photo.c"
+#line 32274 "Photo.c"
 }
 
 
@@ -32294,17 +32295,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 32293 "Photo.c"
+#line 32294 "Photo.c"
 	} else {
 #line 294 "/home/jens/Source/shotwell/src/Photo.vala"
 		value->data[0].v_pointer = NULL;
-#line 32297 "Photo.c"
+#line 32298 "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 32303 "Photo.c"
+#line 32304 "Photo.c"
 	}
 }
 
@@ -32323,17 +32324,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 32322 "Photo.c"
+#line 32323 "Photo.c"
 	} else {
 #line 294 "/home/jens/Source/shotwell/src/Photo.vala"
 		value->data[0].v_pointer = NULL;
-#line 32326 "Photo.c"
+#line 32327 "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 32332 "Photo.c"
+#line 32333 "Photo.c"
 	}
 }
 
@@ -32343,14 +32344,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 32342 "Photo.c"
+#line 32343 "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 32349 "Photo.c"
+#line 32350 "Photo.c"
 }
 
 
@@ -32366,7 +32367,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 32365 "Photo.c"
+#line 32366 "Photo.c"
 }
 
 
@@ -32391,7 +32392,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 32390 "Photo.c"
+#line 32391 "Photo.c"
 }
 
 
@@ -32404,7 +32405,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 32403 "Photo.c"
+#line 32404 "Photo.c"
 	}
 }
 
@@ -32439,21 +32440,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 32438 "Photo.c"
+#line 32439 "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 32445 "Photo.c"
+#line 32446 "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 32452 "Photo.c"
+#line 32453 "Photo.c"
 }
 
 
@@ -32462,7 +32463,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 32461 "Photo.c"
+#line 32462 "Photo.c"
 	}
 }
 
@@ -32472,11 +32473,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 32471 "Photo.c"
+#line 32472 "Photo.c"
 	} else {
 #line 300 "/home/jens/Source/shotwell/src/Photo.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 32475 "Photo.c"
+#line 32476 "Photo.c"
 	}
 }
 
@@ -32484,37 +32485,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 32483 "Photo.c"
+#line 32484 "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 32490 "Photo.c"
+#line 32491 "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 32497 "Photo.c"
+#line 32498 "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 32501 "Photo.c"
+#line 32502 "Photo.c"
 		}
 #line 300 "/home/jens/Source/shotwell/src/Photo.vala"
 		value->data[0].v_pointer = photo_cached_pixbuf_ref (object);
-#line 32505 "Photo.c"
+#line 32506 "Photo.c"
 	} else {
 #line 300 "/home/jens/Source/shotwell/src/Photo.vala"
 		value->data[0].v_pointer = NULL;
-#line 32509 "Photo.c"
+#line 32510 "Photo.c"
 	}
 #line 300 "/home/jens/Source/shotwell/src/Photo.vala"
 	return NULL;
-#line 32513 "Photo.c"
+#line 32514 "Photo.c"
 }
 
 
@@ -32525,25 +32526,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 32524 "Photo.c"
+#line 32525 "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 32530 "Photo.c"
+#line 32531 "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 32534 "Photo.c"
+#line 32535 "Photo.c"
 	} else {
 #line 300 "/home/jens/Source/shotwell/src/Photo.vala"
 		*object_p = photo_cached_pixbuf_ref (value->data[0].v_pointer);
-#line 32538 "Photo.c"
+#line 32539 "Photo.c"
 	}
 #line 300 "/home/jens/Source/shotwell/src/Photo.vala"
 	return NULL;
-#line 32542 "Photo.c"
+#line 32543 "Photo.c"
 }
 
 
@@ -32557,7 +32558,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 32556 "Photo.c"
+#line 32557 "Photo.c"
 }
 
 
@@ -32566,7 +32567,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 32565 "Photo.c"
+#line 32566 "Photo.c"
 }
 
 
@@ -32586,17 +32587,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 32585 "Photo.c"
+#line 32586 "Photo.c"
 	} else {
 #line 300 "/home/jens/Source/shotwell/src/Photo.vala"
 		value->data[0].v_pointer = NULL;
-#line 32589 "Photo.c"
+#line 32590 "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 32595 "Photo.c"
+#line 32596 "Photo.c"
 	}
 }
 
@@ -32615,17 +32616,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 32614 "Photo.c"
+#line 32615 "Photo.c"
 	} else {
 #line 300 "/home/jens/Source/shotwell/src/Photo.vala"
 		value->data[0].v_pointer = NULL;
-#line 32618 "Photo.c"
+#line 32619 "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 32624 "Photo.c"
+#line 32625 "Photo.c"
 	}
 }
 
@@ -32635,7 +32636,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 32634 "Photo.c"
+#line 32635 "Photo.c"
 }
 
 
@@ -32647,7 +32648,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 32646 "Photo.c"
+#line 32647 "Photo.c"
 }
 
 
@@ -32663,7 +32664,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 32662 "Photo.c"
+#line 32663 "Photo.c"
 }
 
 
@@ -32688,7 +32689,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 32687 "Photo.c"
+#line 32688 "Photo.c"
 }
 
 
@@ -32701,7 +32702,7 @@ static void photo_cached_pixbuf_unref (gpointer instance) {
 		PHOTO_CACHED_PIXBUF_GET_CLASS (self)->finalize (self);
 #line 300 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 32700 "Photo.c"
+#line 32701 "Photo.c"
 	}
 }
 
@@ -32712,14 +32713,14 @@ PhotoReimportMasterState* photo_reimport_master_state_construct (GType object_ty
 	self = (PhotoReimportMasterState*) g_type_create_instance (object_type);
 #line 1348 "/home/jens/Source/shotwell/src/Photo.vala"
 	return self;
-#line 32711 "Photo.c"
+#line 32712 "Photo.c"
 }
 
 
 static void photo_value_reimport_master_state_init (GValue* value) {
 #line 1348 "/home/jens/Source/shotwell/src/Photo.vala"
 	value->data[0].v_pointer = NULL;
-#line 32718 "Photo.c"
+#line 32719 "Photo.c"
 }
 
 
@@ -32728,7 +32729,7 @@ static void photo_value_reimport_master_state_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 1348 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_reimport_master_state_unref (value->data[0].v_pointer);
-#line 32727 "Photo.c"
+#line 32728 "Photo.c"
 	}
 }
 
@@ -32738,11 +32739,11 @@ static void photo_value_reimport_master_state_copy_value (const GValue* src_valu
 	if (src_value->data[0].v_pointer) {
 #line 1348 "/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 32737 "Photo.c"
+#line 32738 "Photo.c"
 	} else {
 #line 1348 "/home/jens/Source/shotwell/src/Photo.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 32741 "Photo.c"
+#line 32742 "Photo.c"
 	}
 }
 
@@ -32750,37 +32751,37 @@ static void photo_value_reimport_master_state_copy_value (const GValue* src_valu
 static gpointer photo_value_reimport_master_state_peek_pointer (const GValue* value) {
 #line 1348 "/home/jens/Source/shotwell/src/Photo.vala"
 	return value->data[0].v_pointer;
-#line 32749 "Photo.c"
+#line 32750 "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"
 	if (collect_values[0].v_pointer) {
-#line 32756 "Photo.c"
+#line 32757 "Photo.c"
 		PhotoReimportMasterState* object;
 		object = collect_values[0].v_pointer;
 #line 1348 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 1348 "/home/jens/Source/shotwell/src/Photo.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 32763 "Photo.c"
+#line 32764 "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"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 32767 "Photo.c"
+#line 32768 "Photo.c"
 		}
 #line 1348 "/home/jens/Source/shotwell/src/Photo.vala"
 		value->data[0].v_pointer = photo_reimport_master_state_ref (object);
-#line 32771 "Photo.c"
+#line 32772 "Photo.c"
 	} else {
 #line 1348 "/home/jens/Source/shotwell/src/Photo.vala"
 		value->data[0].v_pointer = NULL;
-#line 32775 "Photo.c"
+#line 32776 "Photo.c"
 	}
 #line 1348 "/home/jens/Source/shotwell/src/Photo.vala"
 	return NULL;
-#line 32779 "Photo.c"
+#line 32780 "Photo.c"
 }
 
 
@@ -32791,25 +32792,25 @@ static gchar* photo_value_reimport_master_state_lcopy_value (const GValue* value
 	if (!object_p) {
 #line 1348 "/home/jens/Source/shotwell/src/Photo.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 32790 "Photo.c"
+#line 32791 "Photo.c"
 	}
 #line 1348 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (!value->data[0].v_pointer) {
 #line 1348 "/home/jens/Source/shotwell/src/Photo.vala"
 		*object_p = NULL;
-#line 32796 "Photo.c"
+#line 32797 "Photo.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 1348 "/home/jens/Source/shotwell/src/Photo.vala"
 		*object_p = value->data[0].v_pointer;
-#line 32800 "Photo.c"
+#line 32801 "Photo.c"
 	} else {
 #line 1348 "/home/jens/Source/shotwell/src/Photo.vala"
 		*object_p = photo_reimport_master_state_ref (value->data[0].v_pointer);
-#line 32804 "Photo.c"
+#line 32805 "Photo.c"
 	}
 #line 1348 "/home/jens/Source/shotwell/src/Photo.vala"
 	return NULL;
-#line 32808 "Photo.c"
+#line 32809 "Photo.c"
 }
 
 
@@ -32823,7 +32824,7 @@ GParamSpec* photo_param_spec_reimport_master_state (const gchar* name, const gch
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 1348 "/home/jens/Source/shotwell/src/Photo.vala"
 	return G_PARAM_SPEC (spec);
-#line 32822 "Photo.c"
+#line 32823 "Photo.c"
 }
 
 
@@ -32832,7 +32833,7 @@ gpointer photo_value_get_reimport_master_state (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PHOTO_TYPE_REIMPORT_MASTER_STATE), NULL);
 #line 1348 "/home/jens/Source/shotwell/src/Photo.vala"
 	return value->data[0].v_pointer;
-#line 32831 "Photo.c"
+#line 32832 "Photo.c"
 }
 
 
@@ -32852,17 +32853,17 @@ void photo_value_set_reimport_master_state (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 1348 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_reimport_master_state_ref (value->data[0].v_pointer);
-#line 32851 "Photo.c"
+#line 32852 "Photo.c"
 	} else {
 #line 1348 "/home/jens/Source/shotwell/src/Photo.vala"
 		value->data[0].v_pointer = NULL;
-#line 32855 "Photo.c"
+#line 32856 "Photo.c"
 	}
 #line 1348 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (old) {
 #line 1348 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_reimport_master_state_unref (old);
-#line 32861 "Photo.c"
+#line 32862 "Photo.c"
 	}
 }
 
@@ -32881,17 +32882,17 @@ void photo_value_take_reimport_master_state (GValue* value, gpointer v_object) {
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 1348 "/home/jens/Source/shotwell/src/Photo.vala"
 		value->data[0].v_pointer = v_object;
-#line 32880 "Photo.c"
+#line 32881 "Photo.c"
 	} else {
 #line 1348 "/home/jens/Source/shotwell/src/Photo.vala"
 		value->data[0].v_pointer = NULL;
-#line 32884 "Photo.c"
+#line 32885 "Photo.c"
 	}
 #line 1348 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (old) {
 #line 1348 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_reimport_master_state_unref (old);
-#line 32890 "Photo.c"
+#line 32891 "Photo.c"
 	}
 }
 
@@ -32901,14 +32902,14 @@ static void photo_reimport_master_state_class_init (PhotoReimportMasterStateClas
 	photo_reimport_master_state_parent_class = g_type_class_peek_parent (klass);
 #line 1348 "/home/jens/Source/shotwell/src/Photo.vala"
 	((PhotoReimportMasterStateClass *) klass)->finalize = photo_reimport_master_state_finalize;
-#line 32900 "Photo.c"
+#line 32901 "Photo.c"
 }
 
 
 static void photo_reimport_master_state_instance_init (PhotoReimportMasterState * self) {
 #line 1348 "/home/jens/Source/shotwell/src/Photo.vala"
 	self->ref_count = 1;
-#line 32907 "Photo.c"
+#line 32908 "Photo.c"
 }
 
 
@@ -32918,7 +32919,7 @@ static void photo_reimport_master_state_finalize (PhotoReimportMasterState* obj)
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PHOTO_TYPE_REIMPORT_MASTER_STATE, PhotoReimportMasterState);
 #line 1348 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_signal_handlers_destroy (self);
-#line 32917 "Photo.c"
+#line 32918 "Photo.c"
 }
 
 
@@ -32943,7 +32944,7 @@ gpointer photo_reimport_master_state_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 1348 "/home/jens/Source/shotwell/src/Photo.vala"
 	return instance;
-#line 32942 "Photo.c"
+#line 32943 "Photo.c"
 }
 
 
@@ -32956,7 +32957,7 @@ void photo_reimport_master_state_unref (gpointer instance) {
 		PHOTO_REIMPORT_MASTER_STATE_GET_CLASS (self)->finalize (self);
 #line 1348 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 32955 "Photo.c"
+#line 32956 "Photo.c"
 	}
 }
 
@@ -32968,17 +32969,17 @@ static gchar** _vala_array_dup29 (gchar** self, int length) {
 	result = g_new0 (gchar*, length + 1);
 #line 1360 "/home/jens/Source/shotwell/src/Photo.vala"
 	for (i = 0; i < length; i++) {
-#line 32967 "Photo.c"
+#line 32968 "Photo.c"
 		gchar* _tmp0_ = NULL;
 #line 1360 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = g_strdup (self[i]);
 #line 1360 "/home/jens/Source/shotwell/src/Photo.vala"
 		result[i] = _tmp0_;
-#line 32973 "Photo.c"
+#line 32974 "Photo.c"
 	}
 #line 1360 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 32977 "Photo.c"
+#line 32978 "Photo.c"
 }
 
 
@@ -33032,14 +33033,14 @@ static PhotoReimportMasterStateImpl* photo_reimport_master_state_impl_construct
 	self->_alterations_size_ = self->alterations_length1;
 #line 1357 "/home/jens/Source/shotwell/src/Photo.vala"
 	return self;
-#line 33031 "Photo.c"
+#line 33032 "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"
 	return photo_reimport_master_state_impl_construct (PHOTO_TYPE_REIMPORT_MASTER_STATE_IMPL, row, metadata, alterations, alterations_length1);
-#line 33038 "Photo.c"
+#line 33039 "Photo.c"
 }
 
 
@@ -33048,7 +33049,7 @@ static void photo_reimport_master_state_impl_class_init (PhotoReimportMasterStat
 	photo_reimport_master_state_impl_parent_class = g_type_class_peek_parent (klass);
 #line 1351 "/home/jens/Source/shotwell/src/Photo.vala"
 	((PhotoReimportMasterStateClass *) klass)->finalize = photo_reimport_master_state_impl_finalize;
-#line 33047 "Photo.c"
+#line 33048 "Photo.c"
 }
 
 
@@ -33060,7 +33061,7 @@ static void photo_reimport_master_state_impl_instance_init (PhotoReimportMasterS
 	self->row = _tmp0_;
 #line 1355 "/home/jens/Source/shotwell/src/Photo.vala"
 	self->metadata_only = FALSE;
-#line 33059 "Photo.c"
+#line 33060 "Photo.c"
 }
 
 
@@ -33076,7 +33077,7 @@ static void photo_reimport_master_state_impl_finalize (PhotoReimportMasterState*
 	self->alterations = (_vala_array_free (self->alterations, self->alterations_length1, (GDestroyNotify) g_free), NULL);
 #line 1351 "/home/jens/Source/shotwell/src/Photo.vala"
 	PHOTO_REIMPORT_MASTER_STATE_CLASS (photo_reimport_master_state_impl_parent_class)->finalize (obj);
-#line 33075 "Photo.c"
+#line 33076 "Photo.c"
 }
 
 
@@ -33098,14 +33099,14 @@ PhotoReimportEditableState* photo_reimport_editable_state_construct (GType objec
 	self = (PhotoReimportEditableState*) g_type_create_instance (object_type);
 #line 1364 "/home/jens/Source/shotwell/src/Photo.vala"
 	return self;
-#line 33097 "Photo.c"
+#line 33098 "Photo.c"
 }
 
 
 static void photo_value_reimport_editable_state_init (GValue* value) {
 #line 1364 "/home/jens/Source/shotwell/src/Photo.vala"
 	value->data[0].v_pointer = NULL;
-#line 33104 "Photo.c"
+#line 33105 "Photo.c"
 }
 
 
@@ -33114,7 +33115,7 @@ static void photo_value_reimport_editable_state_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 1364 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_reimport_editable_state_unref (value->data[0].v_pointer);
-#line 33113 "Photo.c"
+#line 33114 "Photo.c"
 	}
 }
 
@@ -33124,11 +33125,11 @@ static void photo_value_reimport_editable_state_copy_value (const GValue* src_va
 	if (src_value->data[0].v_pointer) {
 #line 1364 "/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 33123 "Photo.c"
+#line 33124 "Photo.c"
 	} else {
 #line 1364 "/home/jens/Source/shotwell/src/Photo.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 33127 "Photo.c"
+#line 33128 "Photo.c"
 	}
 }
 
@@ -33136,37 +33137,37 @@ static void photo_value_reimport_editable_state_copy_value (const GValue* src_va
 static gpointer photo_value_reimport_editable_state_peek_pointer (const GValue* value) {
 #line 1364 "/home/jens/Source/shotwell/src/Photo.vala"
 	return value->data[0].v_pointer;
-#line 33135 "Photo.c"
+#line 33136 "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"
 	if (collect_values[0].v_pointer) {
-#line 33142 "Photo.c"
+#line 33143 "Photo.c"
 		PhotoReimportEditableState* object;
 		object = collect_values[0].v_pointer;
 #line 1364 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 1364 "/home/jens/Source/shotwell/src/Photo.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 33149 "Photo.c"
+#line 33150 "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"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 33153 "Photo.c"
+#line 33154 "Photo.c"
 		}
 #line 1364 "/home/jens/Source/shotwell/src/Photo.vala"
 		value->data[0].v_pointer = photo_reimport_editable_state_ref (object);
-#line 33157 "Photo.c"
+#line 33158 "Photo.c"
 	} else {
 #line 1364 "/home/jens/Source/shotwell/src/Photo.vala"
 		value->data[0].v_pointer = NULL;
-#line 33161 "Photo.c"
+#line 33162 "Photo.c"
 	}
 #line 1364 "/home/jens/Source/shotwell/src/Photo.vala"
 	return NULL;
-#line 33165 "Photo.c"
+#line 33166 "Photo.c"
 }
 
 
@@ -33177,25 +33178,25 @@ static gchar* photo_value_reimport_editable_state_lcopy_value (const GValue* val
 	if (!object_p) {
 #line 1364 "/home/jens/Source/shotwell/src/Photo.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 33176 "Photo.c"
+#line 33177 "Photo.c"
 	}
 #line 1364 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (!value->data[0].v_pointer) {
 #line 1364 "/home/jens/Source/shotwell/src/Photo.vala"
 		*object_p = NULL;
-#line 33182 "Photo.c"
+#line 33183 "Photo.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 1364 "/home/jens/Source/shotwell/src/Photo.vala"
 		*object_p = value->data[0].v_pointer;
-#line 33186 "Photo.c"
+#line 33187 "Photo.c"
 	} else {
 #line 1364 "/home/jens/Source/shotwell/src/Photo.vala"
 		*object_p = photo_reimport_editable_state_ref (value->data[0].v_pointer);
-#line 33190 "Photo.c"
+#line 33191 "Photo.c"
 	}
 #line 1364 "/home/jens/Source/shotwell/src/Photo.vala"
 	return NULL;
-#line 33194 "Photo.c"
+#line 33195 "Photo.c"
 }
 
 
@@ -33209,7 +33210,7 @@ GParamSpec* photo_param_spec_reimport_editable_state (const gchar* name, const g
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 1364 "/home/jens/Source/shotwell/src/Photo.vala"
 	return G_PARAM_SPEC (spec);
-#line 33208 "Photo.c"
+#line 33209 "Photo.c"
 }
 
 
@@ -33218,7 +33219,7 @@ gpointer photo_value_get_reimport_editable_state (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PHOTO_TYPE_REIMPORT_EDITABLE_STATE), NULL);
 #line 1364 "/home/jens/Source/shotwell/src/Photo.vala"
 	return value->data[0].v_pointer;
-#line 33217 "Photo.c"
+#line 33218 "Photo.c"
 }
 
 
@@ -33238,17 +33239,17 @@ void photo_value_set_reimport_editable_state (GValue* value, gpointer v_object)
 		value->data[0].v_pointer = v_object;
 #line 1364 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_reimport_editable_state_ref (value->data[0].v_pointer);
-#line 33237 "Photo.c"
+#line 33238 "Photo.c"
 	} else {
 #line 1364 "/home/jens/Source/shotwell/src/Photo.vala"
 		value->data[0].v_pointer = NULL;
-#line 33241 "Photo.c"
+#line 33242 "Photo.c"
 	}
 #line 1364 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (old) {
 #line 1364 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_reimport_editable_state_unref (old);
-#line 33247 "Photo.c"
+#line 33248 "Photo.c"
 	}
 }
 
@@ -33267,17 +33268,17 @@ void photo_value_take_reimport_editable_state (GValue* value, gpointer v_object)
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 1364 "/home/jens/Source/shotwell/src/Photo.vala"
 		value->data[0].v_pointer = v_object;
-#line 33266 "Photo.c"
+#line 33267 "Photo.c"
 	} else {
 #line 1364 "/home/jens/Source/shotwell/src/Photo.vala"
 		value->data[0].v_pointer = NULL;
-#line 33270 "Photo.c"
+#line 33271 "Photo.c"
 	}
 #line 1364 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (old) {
 #line 1364 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_reimport_editable_state_unref (old);
-#line 33276 "Photo.c"
+#line 33277 "Photo.c"
 	}
 }
 
@@ -33287,14 +33288,14 @@ static void photo_reimport_editable_state_class_init (PhotoReimportEditableState
 	photo_reimport_editable_state_parent_class = g_type_class_peek_parent (klass);
 #line 1364 "/home/jens/Source/shotwell/src/Photo.vala"
 	((PhotoReimportEditableStateClass *) klass)->finalize = photo_reimport_editable_state_finalize;
-#line 33286 "Photo.c"
+#line 33287 "Photo.c"
 }
 
 
 static void photo_reimport_editable_state_instance_init (PhotoReimportEditableState * self) {
 #line 1364 "/home/jens/Source/shotwell/src/Photo.vala"
 	self->ref_count = 1;
-#line 33293 "Photo.c"
+#line 33294 "Photo.c"
 }
 
 
@@ -33304,7 +33305,7 @@ static void photo_reimport_editable_state_finalize (PhotoReimportEditableState*
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PHOTO_TYPE_REIMPORT_EDITABLE_STATE, PhotoReimportEditableState);
 #line 1364 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_signal_handlers_destroy (self);
-#line 33303 "Photo.c"
+#line 33304 "Photo.c"
 }
 
 
@@ -33329,7 +33330,7 @@ gpointer photo_reimport_editable_state_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 1364 "/home/jens/Source/shotwell/src/Photo.vala"
 	return instance;
-#line 33328 "Photo.c"
+#line 33329 "Photo.c"
 }
 
 
@@ -33342,7 +33343,7 @@ void photo_reimport_editable_state_unref (gpointer instance) {
 		PHOTO_REIMPORT_EDITABLE_STATE_GET_CLASS (self)->finalize (self);
 #line 1364 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 33341 "Photo.c"
+#line 33342 "Photo.c"
 	}
 }
 
@@ -33377,14 +33378,14 @@ static PhotoReimportEditableStateImpl* photo_reimport_editable_state_impl_constr
 	self->metadata = _tmp3_;
 #line 1372 "/home/jens/Source/shotwell/src/Photo.vala"
 	return self;
-#line 33376 "Photo.c"
+#line 33377 "Photo.c"
 }
 
 
 static PhotoReimportEditableStateImpl* photo_reimport_editable_state_impl_new (BackingPhotoRow* backing_state, PhotoMetadata* metadata) {
 #line 1372 "/home/jens/Source/shotwell/src/Photo.vala"
 	return photo_reimport_editable_state_impl_construct (PHOTO_TYPE_REIMPORT_EDITABLE_STATE_IMPL, backing_state, metadata);
-#line 33383 "Photo.c"
+#line 33384 "Photo.c"
 }
 
 
@@ -33393,7 +33394,7 @@ static void photo_reimport_editable_state_impl_class_init (PhotoReimportEditable
 	photo_reimport_editable_state_impl_parent_class = g_type_class_peek_parent (klass);
 #line 1367 "/home/jens/Source/shotwell/src/Photo.vala"
 	((PhotoReimportEditableStateClass *) klass)->finalize = photo_reimport_editable_state_impl_finalize;
-#line 33392 "Photo.c"
+#line 33393 "Photo.c"
 }
 
 
@@ -33405,7 +33406,7 @@ static void photo_reimport_editable_state_impl_instance_init (PhotoReimportEdita
 	self->backing_state = _tmp0_;
 #line 1370 "/home/jens/Source/shotwell/src/Photo.vala"
 	self->metadata_only = FALSE;
-#line 33404 "Photo.c"
+#line 33405 "Photo.c"
 }
 
 
@@ -33419,7 +33420,7 @@ static void photo_reimport_editable_state_impl_finalize (PhotoReimportEditableSt
 	_media_metadata_unref0 (self->metadata);
 #line 1367 "/home/jens/Source/shotwell/src/Photo.vala"
 	PHOTO_REIMPORT_EDITABLE_STATE_CLASS (photo_reimport_editable_state_impl_parent_class)->finalize (obj);
-#line 33418 "Photo.c"
+#line 33419 "Photo.c"
 }
 
 
@@ -33441,14 +33442,14 @@ PhotoReimportRawDevelopmentState* photo_reimport_raw_development_state_construct
 	self = (PhotoReimportRawDevelopmentState*) g_type_create_instance (object_type);
 #line 1378 "/home/jens/Source/shotwell/src/Photo.vala"
 	return self;
-#line 33440 "Photo.c"
+#line 33441 "Photo.c"
 }
 
 
 static void photo_value_reimport_raw_development_state_init (GValue* value) {
 #line 1378 "/home/jens/Source/shotwell/src/Photo.vala"
 	value->data[0].v_pointer = NULL;
-#line 33447 "Photo.c"
+#line 33448 "Photo.c"
 }
 
 
@@ -33457,7 +33458,7 @@ static void photo_value_reimport_raw_development_state_free_value (GValue* value
 	if (value->data[0].v_pointer) {
 #line 1378 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_reimport_raw_development_state_unref (value->data[0].v_pointer);
-#line 33456 "Photo.c"
+#line 33457 "Photo.c"
 	}
 }
 
@@ -33467,11 +33468,11 @@ static void photo_value_reimport_raw_development_state_copy_value (const GValue*
 	if (src_value->data[0].v_pointer) {
 #line 1378 "/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 33466 "Photo.c"
+#line 33467 "Photo.c"
 	} else {
 #line 1378 "/home/jens/Source/shotwell/src/Photo.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 33470 "Photo.c"
+#line 33471 "Photo.c"
 	}
 }
 
@@ -33479,37 +33480,37 @@ static void photo_value_reimport_raw_development_state_copy_value (const GValue*
 static gpointer photo_value_reimport_raw_development_state_peek_pointer (const GValue* value) {
 #line 1378 "/home/jens/Source/shotwell/src/Photo.vala"
 	return value->data[0].v_pointer;
-#line 33478 "Photo.c"
+#line 33479 "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"
 	if (collect_values[0].v_pointer) {
-#line 33485 "Photo.c"
+#line 33486 "Photo.c"
 		PhotoReimportRawDevelopmentState* object;
 		object = collect_values[0].v_pointer;
 #line 1378 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 1378 "/home/jens/Source/shotwell/src/Photo.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 33492 "Photo.c"
+#line 33493 "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"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 33496 "Photo.c"
+#line 33497 "Photo.c"
 		}
 #line 1378 "/home/jens/Source/shotwell/src/Photo.vala"
 		value->data[0].v_pointer = photo_reimport_raw_development_state_ref (object);
-#line 33500 "Photo.c"
+#line 33501 "Photo.c"
 	} else {
 #line 1378 "/home/jens/Source/shotwell/src/Photo.vala"
 		value->data[0].v_pointer = NULL;
-#line 33504 "Photo.c"
+#line 33505 "Photo.c"
 	}
 #line 1378 "/home/jens/Source/shotwell/src/Photo.vala"
 	return NULL;
-#line 33508 "Photo.c"
+#line 33509 "Photo.c"
 }
 
 
@@ -33520,25 +33521,25 @@ static gchar* photo_value_reimport_raw_development_state_lcopy_value (const GVal
 	if (!object_p) {
 #line 1378 "/home/jens/Source/shotwell/src/Photo.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 33519 "Photo.c"
+#line 33520 "Photo.c"
 	}
 #line 1378 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (!value->data[0].v_pointer) {
 #line 1378 "/home/jens/Source/shotwell/src/Photo.vala"
 		*object_p = NULL;
-#line 33525 "Photo.c"
+#line 33526 "Photo.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 1378 "/home/jens/Source/shotwell/src/Photo.vala"
 		*object_p = value->data[0].v_pointer;
-#line 33529 "Photo.c"
+#line 33530 "Photo.c"
 	} else {
 #line 1378 "/home/jens/Source/shotwell/src/Photo.vala"
 		*object_p = photo_reimport_raw_development_state_ref (value->data[0].v_pointer);
-#line 33533 "Photo.c"
+#line 33534 "Photo.c"
 	}
 #line 1378 "/home/jens/Source/shotwell/src/Photo.vala"
 	return NULL;
-#line 33537 "Photo.c"
+#line 33538 "Photo.c"
 }
 
 
@@ -33552,7 +33553,7 @@ GParamSpec* photo_param_spec_reimport_raw_development_state (const gchar* name,
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 1378 "/home/jens/Source/shotwell/src/Photo.vala"
 	return G_PARAM_SPEC (spec);
-#line 33551 "Photo.c"
+#line 33552 "Photo.c"
 }
 
 
@@ -33561,7 +33562,7 @@ gpointer photo_value_get_reimport_raw_development_state (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PHOTO_TYPE_REIMPORT_RAW_DEVELOPMENT_STATE), NULL);
 #line 1378 "/home/jens/Source/shotwell/src/Photo.vala"
 	return value->data[0].v_pointer;
-#line 33560 "Photo.c"
+#line 33561 "Photo.c"
 }
 
 
@@ -33581,17 +33582,17 @@ void photo_value_set_reimport_raw_development_state (GValue* value, gpointer v_o
 		value->data[0].v_pointer = v_object;
 #line 1378 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_reimport_raw_development_state_ref (value->data[0].v_pointer);
-#line 33580 "Photo.c"
+#line 33581 "Photo.c"
 	} else {
 #line 1378 "/home/jens/Source/shotwell/src/Photo.vala"
 		value->data[0].v_pointer = NULL;
-#line 33584 "Photo.c"
+#line 33585 "Photo.c"
 	}
 #line 1378 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (old) {
 #line 1378 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_reimport_raw_development_state_unref (old);
-#line 33590 "Photo.c"
+#line 33591 "Photo.c"
 	}
 }
 
@@ -33610,17 +33611,17 @@ void photo_value_take_reimport_raw_development_state (GValue* value, gpointer v_
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 1378 "/home/jens/Source/shotwell/src/Photo.vala"
 		value->data[0].v_pointer = v_object;
-#line 33609 "Photo.c"
+#line 33610 "Photo.c"
 	} else {
 #line 1378 "/home/jens/Source/shotwell/src/Photo.vala"
 		value->data[0].v_pointer = NULL;
-#line 33613 "Photo.c"
+#line 33614 "Photo.c"
 	}
 #line 1378 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (old) {
 #line 1378 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_reimport_raw_development_state_unref (old);
-#line 33619 "Photo.c"
+#line 33620 "Photo.c"
 	}
 }
 
@@ -33630,14 +33631,14 @@ static void photo_reimport_raw_development_state_class_init (PhotoReimportRawDev
 	photo_reimport_raw_development_state_parent_class = g_type_class_peek_parent (klass);
 #line 1378 "/home/jens/Source/shotwell/src/Photo.vala"
 	((PhotoReimportRawDevelopmentStateClass *) klass)->finalize = photo_reimport_raw_development_state_finalize;
-#line 33629 "Photo.c"
+#line 33630 "Photo.c"
 }
 
 
 static void photo_reimport_raw_development_state_instance_init (PhotoReimportRawDevelopmentState * self) {
 #line 1378 "/home/jens/Source/shotwell/src/Photo.vala"
 	self->ref_count = 1;
-#line 33636 "Photo.c"
+#line 33637 "Photo.c"
 }
 
 
@@ -33647,7 +33648,7 @@ static void photo_reimport_raw_development_state_finalize (PhotoReimportRawDevel
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PHOTO_TYPE_REIMPORT_RAW_DEVELOPMENT_STATE, PhotoReimportRawDevelopmentState);
 #line 1378 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_signal_handlers_destroy (self);
-#line 33646 "Photo.c"
+#line 33647 "Photo.c"
 }
 
 
@@ -33672,7 +33673,7 @@ gpointer photo_reimport_raw_development_state_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 1378 "/home/jens/Source/shotwell/src/Photo.vala"
 	return instance;
-#line 33671 "Photo.c"
+#line 33672 "Photo.c"
 }
 
 
@@ -33685,7 +33686,7 @@ void photo_reimport_raw_development_state_unref (gpointer instance) {
 		PHOTO_REIMPORT_RAW_DEVELOPMENT_STATE_GET_CLASS (self)->finalize (self);
 #line 1378 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 33684 "Photo.c"
+#line 33685 "Photo.c"
 	}
 }
 
@@ -33696,14 +33697,14 @@ static PhotoReimportRawDevelopmentStateImpl* photo_reimport_raw_development_stat
 	self = (PhotoReimportRawDevelopmentStateImpl*) photo_reimport_raw_development_state_construct (object_type);
 #line 1395 "/home/jens/Source/shotwell/src/Photo.vala"
 	return self;
-#line 33695 "Photo.c"
+#line 33696 "Photo.c"
 }
 
 
 static PhotoReimportRawDevelopmentStateImpl* photo_reimport_raw_development_state_impl_new (void) {
 #line 1395 "/home/jens/Source/shotwell/src/Photo.vala"
 	return photo_reimport_raw_development_state_impl_construct (PHOTO_TYPE_REIMPORT_RAW_DEVELOPMENT_STATE_IMPL);
-#line 33702 "Photo.c"
+#line 33703 "Photo.c"
 }
 
 
@@ -33733,7 +33734,7 @@ static void photo_reimport_raw_development_state_impl_add (PhotoReimportRawDevel
 	gee_collection_add (_tmp0_, _tmp4_);
 #line 1399 "/home/jens/Source/shotwell/src/Photo.vala"
 	_photo_reimport_raw_development_state_impl_dev_to_reimport_unref0 (_tmp4_);
-#line 33732 "Photo.c"
+#line 33733 "Photo.c"
 }
 
 
@@ -33754,7 +33755,7 @@ static gint photo_reimport_raw_development_state_impl_get_size (PhotoReimportRaw
 	result = _tmp2_;
 #line 1403 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 33753 "Photo.c"
+#line 33754 "Photo.c"
 }
 
 
@@ -33788,21 +33789,21 @@ static PhotoReimportRawDevelopmentStateImplDevToReimport* photo_reimport_raw_dev
 	self->metadata = _tmp3_;
 #line 1386 "/home/jens/Source/shotwell/src/Photo.vala"
 	return self;
-#line 33787 "Photo.c"
+#line 33788 "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"
 	return photo_reimport_raw_development_state_impl_dev_to_reimport_construct (PHOTO_REIMPORT_RAW_DEVELOPMENT_STATE_IMPL_TYPE_DEV_TO_REIMPORT, backing, metadata);
-#line 33794 "Photo.c"
+#line 33795 "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"
 	value->data[0].v_pointer = NULL;
-#line 33801 "Photo.c"
+#line 33802 "Photo.c"
 }
 
 
@@ -33811,7 +33812,7 @@ static void photo_reimport_raw_development_state_impl_value_dev_to_reimport_free
 	if (value->data[0].v_pointer) {
 #line 1382 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_reimport_raw_development_state_impl_dev_to_reimport_unref (value->data[0].v_pointer);
-#line 33810 "Photo.c"
+#line 33811 "Photo.c"
 	}
 }
 
@@ -33821,11 +33822,11 @@ static void photo_reimport_raw_development_state_impl_value_dev_to_reimport_copy
 	if (src_value->data[0].v_pointer) {
 #line 1382 "/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 33820 "Photo.c"
+#line 33821 "Photo.c"
 	} else {
 #line 1382 "/home/jens/Source/shotwell/src/Photo.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 33824 "Photo.c"
+#line 33825 "Photo.c"
 	}
 }
 
@@ -33833,37 +33834,37 @@ static void photo_reimport_raw_development_state_impl_value_dev_to_reimport_copy
 static gpointer photo_reimport_raw_development_state_impl_value_dev_to_reimport_peek_pointer (const GValue* value) {
 #line 1382 "/home/jens/Source/shotwell/src/Photo.vala"
 	return value->data[0].v_pointer;
-#line 33832 "Photo.c"
+#line 33833 "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"
 	if (collect_values[0].v_pointer) {
-#line 33839 "Photo.c"
+#line 33840 "Photo.c"
 		PhotoReimportRawDevelopmentStateImplDevToReimport* object;
 		object = collect_values[0].v_pointer;
 #line 1382 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 1382 "/home/jens/Source/shotwell/src/Photo.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 33846 "Photo.c"
+#line 33847 "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"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 33850 "Photo.c"
+#line 33851 "Photo.c"
 		}
 #line 1382 "/home/jens/Source/shotwell/src/Photo.vala"
 		value->data[0].v_pointer = photo_reimport_raw_development_state_impl_dev_to_reimport_ref (object);
-#line 33854 "Photo.c"
+#line 33855 "Photo.c"
 	} else {
 #line 1382 "/home/jens/Source/shotwell/src/Photo.vala"
 		value->data[0].v_pointer = NULL;
-#line 33858 "Photo.c"
+#line 33859 "Photo.c"
 	}
 #line 1382 "/home/jens/Source/shotwell/src/Photo.vala"
 	return NULL;
-#line 33862 "Photo.c"
+#line 33863 "Photo.c"
 }
 
 
@@ -33874,25 +33875,25 @@ static gchar* photo_reimport_raw_development_state_impl_value_dev_to_reimport_lc
 	if (!object_p) {
 #line 1382 "/home/jens/Source/shotwell/src/Photo.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 33873 "Photo.c"
+#line 33874 "Photo.c"
 	}
 #line 1382 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (!value->data[0].v_pointer) {
 #line 1382 "/home/jens/Source/shotwell/src/Photo.vala"
 		*object_p = NULL;
-#line 33879 "Photo.c"
+#line 33880 "Photo.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 1382 "/home/jens/Source/shotwell/src/Photo.vala"
 		*object_p = value->data[0].v_pointer;
-#line 33883 "Photo.c"
+#line 33884 "Photo.c"
 	} else {
 #line 1382 "/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 33887 "Photo.c"
+#line 33888 "Photo.c"
 	}
 #line 1382 "/home/jens/Source/shotwell/src/Photo.vala"
 	return NULL;
-#line 33891 "Photo.c"
+#line 33892 "Photo.c"
 }
 
 
@@ -33906,7 +33907,7 @@ static GParamSpec* photo_reimport_raw_development_state_impl_param_spec_dev_to_r
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 1382 "/home/jens/Source/shotwell/src/Photo.vala"
 	return G_PARAM_SPEC (spec);
-#line 33905 "Photo.c"
+#line 33906 "Photo.c"
 }
 
 
@@ -33915,7 +33916,7 @@ static gpointer photo_reimport_raw_development_state_impl_value_get_dev_to_reimp
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PHOTO_REIMPORT_RAW_DEVELOPMENT_STATE_IMPL_TYPE_DEV_TO_REIMPORT), NULL);
 #line 1382 "/home/jens/Source/shotwell/src/Photo.vala"
 	return value->data[0].v_pointer;
-#line 33914 "Photo.c"
+#line 33915 "Photo.c"
 }
 
 
@@ -33935,17 +33936,17 @@ static void photo_reimport_raw_development_state_impl_value_set_dev_to_reimport
 		value->data[0].v_pointer = v_object;
 #line 1382 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_reimport_raw_development_state_impl_dev_to_reimport_ref (value->data[0].v_pointer);
-#line 33934 "Photo.c"
+#line 33935 "Photo.c"
 	} else {
 #line 1382 "/home/jens/Source/shotwell/src/Photo.vala"
 		value->data[0].v_pointer = NULL;
-#line 33938 "Photo.c"
+#line 33939 "Photo.c"
 	}
 #line 1382 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (old) {
 #line 1382 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_reimport_raw_development_state_impl_dev_to_reimport_unref (old);
-#line 33944 "Photo.c"
+#line 33945 "Photo.c"
 	}
 }
 
@@ -33964,17 +33965,17 @@ static void photo_reimport_raw_development_state_impl_value_take_dev_to_reimport
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 1382 "/home/jens/Source/shotwell/src/Photo.vala"
 		value->data[0].v_pointer = v_object;
-#line 33963 "Photo.c"
+#line 33964 "Photo.c"
 	} else {
 #line 1382 "/home/jens/Source/shotwell/src/Photo.vala"
 		value->data[0].v_pointer = NULL;
-#line 33967 "Photo.c"
+#line 33968 "Photo.c"
 	}
 #line 1382 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (old) {
 #line 1382 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_reimport_raw_development_state_impl_dev_to_reimport_unref (old);
-#line 33973 "Photo.c"
+#line 33974 "Photo.c"
 	}
 }
 
@@ -33984,7 +33985,7 @@ static void photo_reimport_raw_development_state_impl_dev_to_reimport_class_init
 	photo_reimport_raw_development_state_impl_dev_to_reimport_parent_class = g_type_class_peek_parent (klass);
 #line 1382 "/home/jens/Source/shotwell/src/Photo.vala"
 	((PhotoReimportRawDevelopmentStateImplDevToReimportClass *) klass)->finalize = photo_reimport_raw_development_state_impl_dev_to_reimport_finalize;
-#line 33983 "Photo.c"
+#line 33984 "Photo.c"
 }
 
 
@@ -33996,7 +33997,7 @@ static void photo_reimport_raw_development_state_impl_dev_to_reimport_instance_i
 	self->backing = _tmp0_;
 #line 1382 "/home/jens/Source/shotwell/src/Photo.vala"
 	self->ref_count = 1;
-#line 33995 "Photo.c"
+#line 33996 "Photo.c"
 }
 
 
@@ -34010,7 +34011,7 @@ static void photo_reimport_raw_development_state_impl_dev_to_reimport_finalize (
 	_backing_photo_row_unref0 (self->backing);
 #line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
 	_media_metadata_unref0 (self->metadata);
-#line 34009 "Photo.c"
+#line 34010 "Photo.c"
 }
 
 
@@ -34035,7 +34036,7 @@ static gpointer photo_reimport_raw_development_state_impl_dev_to_reimport_ref (g
 	g_atomic_int_inc (&self->ref_count);
 #line 1382 "/home/jens/Source/shotwell/src/Photo.vala"
 	return instance;
-#line 34034 "Photo.c"
+#line 34035 "Photo.c"
 }
 
 
@@ -34048,7 +34049,7 @@ static void photo_reimport_raw_development_state_impl_dev_to_reimport_unref (gpo
 		PHOTO_REIMPORT_RAW_DEVELOPMENT_STATE_IMPL_DEV_TO_REIMPORT_GET_CLASS (self)->finalize (self);
 #line 1382 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 34047 "Photo.c"
+#line 34048 "Photo.c"
 	}
 }
 
@@ -34058,7 +34059,7 @@ static void photo_reimport_raw_development_state_impl_class_init (PhotoReimportR
 	photo_reimport_raw_development_state_impl_parent_class = g_type_class_peek_parent (klass);
 #line 1381 "/home/jens/Source/shotwell/src/Photo.vala"
 	((PhotoReimportRawDevelopmentStateClass *) klass)->finalize = photo_reimport_raw_development_state_impl_finalize;
-#line 34057 "Photo.c"
+#line 34058 "Photo.c"
 }
 
 
@@ -34070,7 +34071,7 @@ static void photo_reimport_raw_development_state_impl_instance_init (PhotoReimpo
 	self->list = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection);
 #line 1393 "/home/jens/Source/shotwell/src/Photo.vala"
 	self->metadata_only = FALSE;
-#line 34069 "Photo.c"
+#line 34070 "Photo.c"
 }
 
 
@@ -34082,7 +34083,7 @@ static void photo_reimport_raw_development_state_impl_finalize (PhotoReimportRaw
 	_g_object_unref0 (self->list);
 #line 1381 "/home/jens/Source/shotwell/src/Photo.vala"
 	PHOTO_REIMPORT_RAW_DEVELOPMENT_STATE_CLASS (photo_reimport_raw_development_state_impl_parent_class)->finalize (obj);
-#line 34081 "Photo.c"
+#line 34082 "Photo.c"
 }
 
 
@@ -34225,7 +34226,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 34224 "Photo.c"
+#line 34225 "Photo.c"
 }
 
 
@@ -34236,7 +34237,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 34235 "Photo.c"
+#line 34236 "Photo.c"
 }
 
 
@@ -34279,7 +34280,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 34278 "Photo.c"
+#line 34279 "Photo.c"
 }
 
 
@@ -34319,7 +34320,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 34318 "Photo.c"
+#line 34319 "Photo.c"
 }
 
 
@@ -34342,13 +34343,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 34341 "Photo.c"
+#line 34342 "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 34347 "Photo.c"
+#line 34348 "Photo.c"
 	}
 }
 
@@ -34358,13 +34359,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 34357 "Photo.c"
+#line 34358 "Photo.c"
 		default:
 #line 161 "/home/jens/Source/shotwell/src/Photo.vala"
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
 #line 161 "/home/jens/Source/shotwell/src/Photo.vala"
 		break;
-#line 34363 "Photo.c"
+#line 34364 "Photo.c"
 	}
 }
 
@@ -34386,7 +34387,7 @@ static guint _file_hash_gee_hash_data_func (gconstpointer v, gpointer self) {
 	result = file_hash ((GFile*) v);
 #line 4462 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 34385 "Photo.c"
+#line 34386 "Photo.c"
 }
 
 
@@ -34395,7 +34396,7 @@ static gboolean _file_equal_gee_equal_data_func (gconstpointer a, gconstpointer
 	result = file_equal ((GFile*) a, (GFile*) b);
 #line 4462 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 34394 "Photo.c"
+#line 34395 "Photo.c"
 }
 
 
@@ -34404,7 +34405,7 @@ static gint _int64_compare_gcompare_data_func (gconstpointer a, gconstpointer b,
 	result = int64_compare ((gint64*) a, (gint64*) b);
 #line 4466 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 34403 "Photo.c"
+#line 34404 "Photo.c"
 }
 
 
@@ -34416,7 +34417,7 @@ static gint64* _int64_dup (gint64* self) {
 	memcpy (dup, self, sizeof (gint64));
 #line 4466 "/home/jens/Source/shotwell/src/Photo.vala"
 	return dup;
-#line 34415 "Photo.c"
+#line 34416 "Photo.c"
 }
 
 
@@ -34425,7 +34426,7 @@ static gboolean _int64_equal_gee_equal_data_func (gconstpointer a, gconstpointer
 	result = int64_equal ((gint64*) a, (gint64*) b);
 #line 4468 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 34424 "Photo.c"
+#line 34425 "Photo.c"
 }
 
 
@@ -34434,21 +34435,21 @@ static gint64 _photo_get_photo_key_get_source_database_key (DataSource* source,
 	result = photo_get_photo_key (source);
 #line 4488 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 34433 "Photo.c"
+#line 34434 "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"
 	library_photo_source_collection_on_trashcan_contents_altered ((LibraryPhotoSourceCollection*) self, added, removed);
-#line 34440 "Photo.c"
+#line 34441 "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"
 	library_photo_source_collection_on_offline_contents_altered ((LibraryPhotoSourceCollection*) self, added, removed);
-#line 34447 "Photo.c"
+#line 34448 "Photo.c"
 }
 
 
@@ -34478,14 +34479,14 @@ LibraryPhotoSourceCollection* library_photo_source_collection_construct (GType o
 	_source_holding_tank_unref0 (_tmp3_);
 #line 4487 "/home/jens/Source/shotwell/src/Photo.vala"
 	return self;
-#line 34477 "Photo.c"
+#line 34478 "Photo.c"
 }
 
 
 LibraryPhotoSourceCollection* library_photo_source_collection_new (void) {
 #line 4487 "/home/jens/Source/shotwell/src/Photo.vala"
 	return library_photo_source_collection_construct (TYPE_LIBRARY_PHOTO_SOURCE_COLLECTION);
-#line 34484 "Photo.c"
+#line 34485 "Photo.c"
 }
 
 
@@ -34494,7 +34495,7 @@ static gboolean _library_photo_source_collection_check_if_trashed_photo_source_h
 	result = library_photo_source_collection_check_if_trashed_photo ((LibraryPhotoSourceCollection*) self, source, alteration);
 #line 4495 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 34493 "Photo.c"
+#line 34494 "Photo.c"
 }
 
 
@@ -34510,7 +34511,7 @@ static MediaSourceHoldingTank* library_photo_source_collection_real_create_trash
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_MEDIA_SOURCE_HOLDING_TANK, MediaSourceHoldingTank);
 #line 4495 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 34509 "Photo.c"
+#line 34510 "Photo.c"
 }
 
 
@@ -34519,7 +34520,7 @@ static gboolean _library_photo_source_collection_check_if_offline_photo_source_h
 	result = library_photo_source_collection_check_if_offline_photo ((LibraryPhotoSourceCollection*) self, source, alteration);
 #line 4499 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 34518 "Photo.c"
+#line 34519 "Photo.c"
 }
 
 
@@ -34535,7 +34536,7 @@ static MediaSourceHoldingTank* library_photo_source_collection_real_create_offli
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_MEDIA_SOURCE_HOLDING_TANK, MediaSourceHoldingTank);
 #line 4499 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 34534 "Photo.c"
+#line 34535 "Photo.c"
 }
 
 
@@ -34561,7 +34562,7 @@ static MediaMonitor* library_photo_source_collection_real_create_media_monitor (
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_MEDIA_MONITOR, MediaMonitor);
 #line 4503 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 34560 "Photo.c"
+#line 34561 "Photo.c"
 }
 
 
@@ -34579,7 +34580,7 @@ static gboolean library_photo_source_collection_real_holds_type_of_source (Sourc
 	result = G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_LIBRARY_PHOTO);
 #line 4507 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 34578 "Photo.c"
+#line 34579 "Photo.c"
 }
 
 
@@ -34595,7 +34596,7 @@ static gchar* library_photo_source_collection_real_get_typename (MediaSourceColl
 	result = _tmp0_;
 #line 4511 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 34594 "Photo.c"
+#line 34595 "Photo.c"
 }
 
 
@@ -34616,21 +34617,21 @@ static gboolean library_photo_source_collection_real_is_file_recognized (MediaSo
 	result = _tmp1_;
 #line 4515 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 34615 "Photo.c"
+#line 34616 "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"
 	library_photo_source_collection_on_editable_replaced ((LibraryPhotoSourceCollection*) self, _sender, old_file, new_file);
-#line 34622 "Photo.c"
+#line 34623 "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"
 	library_photo_source_collection_on_raw_development_modified ((LibraryPhotoSourceCollection*) self, _sender);
-#line 34629 "Photo.c"
+#line 34630 "Photo.c"
 }
 
 
@@ -34650,7 +34651,7 @@ static void library_photo_source_collection_real_notify_contents_altered (DataCo
 	_tmp0_ = added;
 #line 4520 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp0_ != NULL) {
-#line 34649 "Photo.c"
+#line 34650 "Photo.c"
 		{
 			GeeIterator* _object_it = NULL;
 			GeeIterable* _tmp1_ = NULL;
@@ -34663,7 +34664,7 @@ static void library_photo_source_collection_real_notify_contents_altered (DataCo
 			_object_it = _tmp2_;
 #line 4521 "/home/jens/Source/shotwell/src/Photo.vala"
 			while (TRUE) {
-#line 34662 "Photo.c"
+#line 34663 "Photo.c"
 				GeeIterator* _tmp3_ = NULL;
 				gboolean _tmp4_ = FALSE;
 				DataObject* object = NULL;
@@ -34713,7 +34714,7 @@ static void library_photo_source_collection_real_notify_contents_altered (DataCo
 				if (!_tmp4_) {
 #line 4521 "/home/jens/Source/shotwell/src/Photo.vala"
 					break;
-#line 34712 "Photo.c"
+#line 34713 "Photo.c"
 				}
 #line 4521 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp5_ = _object_it;
@@ -34737,7 +34738,7 @@ static void library_photo_source_collection_real_notify_contents_altered (DataCo
 				_tmp11_ = editable;
 #line 4525 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp11_ != NULL) {
-#line 34736 "Photo.c"
+#line 34737 "Photo.c"
 					GeeHashMap* _tmp12_ = NULL;
 					GFile* _tmp13_ = NULL;
 					LibraryPhoto* _tmp14_ = NULL;
@@ -34749,7 +34750,7 @@ static void library_photo_source_collection_real_notify_contents_altered (DataCo
 					_tmp14_ = photo;
 #line 4526 "/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 34748 "Photo.c"
+#line 34749 "Photo.c"
 				}
 #line 4527 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp15_ = photo;
@@ -34765,7 +34766,7 @@ static void library_photo_source_collection_real_notify_contents_altered (DataCo
 				_tmp18_ = raw_list;
 #line 4530 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp18_ != NULL) {
-#line 34764 "Photo.c"
+#line 34765 "Photo.c"
 					{
 						GeeIterator* _f_it = NULL;
 						GeeCollection* _tmp19_ = NULL;
@@ -34778,7 +34779,7 @@ static void library_photo_source_collection_real_notify_contents_altered (DataCo
 						_f_it = _tmp20_;
 #line 4531 "/home/jens/Source/shotwell/src/Photo.vala"
 						while (TRUE) {
-#line 34777 "Photo.c"
+#line 34778 "Photo.c"
 							GeeIterator* _tmp21_ = NULL;
 							gboolean _tmp22_ = FALSE;
 							GFile* f = NULL;
@@ -34795,7 +34796,7 @@ static void library_photo_source_collection_real_notify_contents_altered (DataCo
 							if (!_tmp22_) {
 #line 4531 "/home/jens/Source/shotwell/src/Photo.vala"
 								break;
-#line 34794 "Photo.c"
+#line 34795 "Photo.c"
 							}
 #line 4531 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp23_ = _f_it;
@@ -34813,11 +34814,11 @@ static void library_photo_source_collection_real_notify_contents_altered (DataCo
 							gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp26_, _tmp27_);
 #line 4531 "/home/jens/Source/shotwell/src/Photo.vala"
 							_g_object_unref0 (f);
-#line 34812 "Photo.c"
+#line 34813 "Photo.c"
 						}
 #line 4531 "/home/jens/Source/shotwell/src/Photo.vala"
 						_g_object_unref0 (_f_it);
-#line 34816 "Photo.c"
+#line 34817 "Photo.c"
 					}
 				}
 #line 4533 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -34850,7 +34851,7 @@ static void library_photo_source_collection_real_notify_contents_altered (DataCo
 				_backing_photo_row_unref0 (_tmp37_);
 #line 4536 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp38_) {
-#line 34849 "Photo.c"
+#line 34850 "Photo.c"
 					LibraryPhoto* _tmp39_ = NULL;
 					BackingPhotoRow* _tmp40_ = NULL;
 					BackingPhotoRow* _tmp41_ = NULL;
@@ -34867,11 +34868,11 @@ static void library_photo_source_collection_real_notify_contents_altered (DataCo
 					_tmp34_ = _tmp42_;
 #line 4537 "/home/jens/Source/shotwell/src/Photo.vala"
 					_backing_photo_row_unref0 (_tmp41_);
-#line 34866 "Photo.c"
+#line 34867 "Photo.c"
 				} else {
 #line 4538 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp34_ = (gint64) -1;
-#line 34870 "Photo.c"
+#line 34871 "Photo.c"
 				}
 #line 4536 "/home/jens/Source/shotwell/src/Photo.vala"
 				editable_filesize = _tmp34_;
@@ -34895,7 +34896,7 @@ static void library_photo_source_collection_real_notify_contents_altered (DataCo
 				_tmp49_ = editable_filesize;
 #line 4541 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp49_ >= ((gint64) 0)) {
-#line 34894 "Photo.c"
+#line 34895 "Photo.c"
 					GeeMultiMap* _tmp50_ = NULL;
 					gint64 _tmp51_ = 0LL;
 					LibraryPhoto* _tmp52_ = NULL;
@@ -34918,7 +34919,7 @@ static void library_photo_source_collection_real_notify_contents_altered (DataCo
 					_tmp55_ = editable_filesize;
 #line 4543 "/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 34917 "Photo.c"
+#line 34918 "Photo.c"
 				}
 #line 4546 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp56_ = photo;
@@ -34930,7 +34931,7 @@ static void library_photo_source_collection_real_notify_contents_altered (DataCo
 				_tmp58_ = raw_rows;
 #line 4547 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp58_ != NULL) {
-#line 34929 "Photo.c"
+#line 34930 "Photo.c"
 					{
 						GeeIterator* _row_it = NULL;
 						GeeCollection* _tmp59_ = NULL;
@@ -34943,7 +34944,7 @@ static void library_photo_source_collection_real_notify_contents_altered (DataCo
 						_row_it = _tmp60_;
 #line 4548 "/home/jens/Source/shotwell/src/Photo.vala"
 						while (TRUE) {
-#line 34942 "Photo.c"
+#line 34943 "Photo.c"
 							GeeIterator* _tmp61_ = NULL;
 							gboolean _tmp62_ = FALSE;
 							BackingPhotoRow* row = NULL;
@@ -34959,7 +34960,7 @@ static void library_photo_source_collection_real_notify_contents_altered (DataCo
 							if (!_tmp62_) {
 #line 4548 "/home/jens/Source/shotwell/src/Photo.vala"
 								break;
-#line 34958 "Photo.c"
+#line 34959 "Photo.c"
 							}
 #line 4548 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp63_ = _row_it;
@@ -34973,7 +34974,7 @@ static void library_photo_source_collection_real_notify_contents_altered (DataCo
 							_tmp66_ = _tmp65_->filesize;
 #line 4549 "/home/jens/Source/shotwell/src/Photo.vala"
 							if (_tmp66_ >= ((gint64) 0)) {
-#line 34972 "Photo.c"
+#line 34973 "Photo.c"
 								GeeMultiMap* _tmp67_ = NULL;
 								BackingPhotoRow* _tmp68_ = NULL;
 								gint64 _tmp69_ = 0LL;
@@ -35002,15 +35003,15 @@ static void library_photo_source_collection_real_notify_contents_altered (DataCo
 								_tmp74_ = _tmp73_->filesize;
 #line 4551 "/home/jens/Source/shotwell/src/Photo.vala"
 								gee_multi_map_set (_tmp71_, _tmp72_, &_tmp74_);
-#line 35001 "Photo.c"
+#line 35002 "Photo.c"
 							}
 #line 4548 "/home/jens/Source/shotwell/src/Photo.vala"
 							_backing_photo_row_unref0 (row);
-#line 35005 "Photo.c"
+#line 35006 "Photo.c"
 						}
 #line 4548 "/home/jens/Source/shotwell/src/Photo.vala"
 						_g_object_unref0 (_row_it);
-#line 35009 "Photo.c"
+#line 35010 "Photo.c"
 					}
 				}
 #line 4521 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -35023,18 +35024,18 @@ static void library_photo_source_collection_real_notify_contents_altered (DataCo
 				_g_object_unref0 (photo);
 #line 4521 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (object);
-#line 35022 "Photo.c"
+#line 35023 "Photo.c"
 			}
 #line 4521 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (_object_it);
-#line 35026 "Photo.c"
+#line 35027 "Photo.c"
 		}
 	}
 #line 4558 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp75_ = removed;
 #line 4558 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp75_ != NULL) {
-#line 35033 "Photo.c"
+#line 35034 "Photo.c"
 		{
 			GeeIterator* _object_it = NULL;
 			GeeIterable* _tmp76_ = NULL;
@@ -35047,7 +35048,7 @@ static void library_photo_source_collection_real_notify_contents_altered (DataCo
 			_object_it = _tmp77_;
 #line 4559 "/home/jens/Source/shotwell/src/Photo.vala"
 			while (TRUE) {
-#line 35046 "Photo.c"
+#line 35047 "Photo.c"
 				GeeIterator* _tmp78_ = NULL;
 				gboolean _tmp79_ = FALSE;
 				DataObject* object = NULL;
@@ -35098,7 +35099,7 @@ static void library_photo_source_collection_real_notify_contents_altered (DataCo
 				if (!_tmp79_) {
 #line 4559 "/home/jens/Source/shotwell/src/Photo.vala"
 					break;
-#line 35097 "Photo.c"
+#line 35098 "Photo.c"
 				}
 #line 4559 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp80_ = _object_it;
@@ -35122,7 +35123,7 @@ static void library_photo_source_collection_real_notify_contents_altered (DataCo
 				_tmp86_ = editable;
 #line 4563 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp86_ != NULL) {
-#line 35121 "Photo.c"
+#line 35122 "Photo.c"
 					gboolean is_removed = FALSE;
 					GeeHashMap* _tmp87_ = NULL;
 					LibraryPhoto* _tmp88_ = NULL;
@@ -35151,7 +35152,7 @@ static void library_photo_source_collection_real_notify_contents_altered (DataCo
 					_tmp93_ = is_removed;
 #line 4565 "/home/jens/Source/shotwell/src/Photo.vala"
 					_vala_assert (_tmp93_, "is_removed");
-#line 35150 "Photo.c"
+#line 35151 "Photo.c"
 				}
 #line 4567 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp94_ = photo;
@@ -35169,7 +35170,7 @@ static void library_photo_source_collection_real_notify_contents_altered (DataCo
 				_tmp98_ = raw_list;
 #line 4570 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp98_ != NULL) {
-#line 35168 "Photo.c"
+#line 35169 "Photo.c"
 					{
 						GeeIterator* _f_it = NULL;
 						GeeCollection* _tmp99_ = NULL;
@@ -35182,7 +35183,7 @@ static void library_photo_source_collection_real_notify_contents_altered (DataCo
 						_f_it = _tmp100_;
 #line 4571 "/home/jens/Source/shotwell/src/Photo.vala"
 						while (TRUE) {
-#line 35181 "Photo.c"
+#line 35182 "Photo.c"
 							GeeIterator* _tmp101_ = NULL;
 							gboolean _tmp102_ = FALSE;
 							GFile* f = NULL;
@@ -35198,7 +35199,7 @@ static void library_photo_source_collection_real_notify_contents_altered (DataCo
 							if (!_tmp102_) {
 #line 4571 "/home/jens/Source/shotwell/src/Photo.vala"
 								break;
-#line 35197 "Photo.c"
+#line 35198 "Photo.c"
 							}
 #line 4571 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp103_ = _f_it;
@@ -35214,11 +35215,11 @@ static void library_photo_source_collection_real_notify_contents_altered (DataCo
 							gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp105_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp106_, NULL);
 #line 4571 "/home/jens/Source/shotwell/src/Photo.vala"
 							_g_object_unref0 (f);
-#line 35213 "Photo.c"
+#line 35214 "Photo.c"
 						}
 #line 4571 "/home/jens/Source/shotwell/src/Photo.vala"
 						_g_object_unref0 (_f_it);
-#line 35217 "Photo.c"
+#line 35218 "Photo.c"
 					}
 				}
 #line 4573 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -35253,7 +35254,7 @@ static void library_photo_source_collection_real_notify_contents_altered (DataCo
 				_backing_photo_row_unref0 (_tmp117_);
 #line 4576 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp118_) {
-#line 35252 "Photo.c"
+#line 35253 "Photo.c"
 					LibraryPhoto* _tmp119_ = NULL;
 					BackingPhotoRow* _tmp120_ = NULL;
 					BackingPhotoRow* _tmp121_ = NULL;
@@ -35270,11 +35271,11 @@ static void library_photo_source_collection_real_notify_contents_altered (DataCo
 					_tmp114_ = _tmp122_;
 #line 4577 "/home/jens/Source/shotwell/src/Photo.vala"
 					_backing_photo_row_unref0 (_tmp121_);
-#line 35269 "Photo.c"
+#line 35270 "Photo.c"
 				} else {
 #line 4578 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp114_ = (gint64) -1;
-#line 35273 "Photo.c"
+#line 35274 "Photo.c"
 				}
 #line 4576 "/home/jens/Source/shotwell/src/Photo.vala"
 				editable_filesize = _tmp114_;
@@ -35296,7 +35297,7 @@ static void library_photo_source_collection_real_notify_contents_altered (DataCo
 				_tmp128_ = editable_filesize;
 #line 4581 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp128_ >= ((gint64) 0)) {
-#line 35295 "Photo.c"
+#line 35296 "Photo.c"
 					GeeMultiMap* _tmp129_ = NULL;
 					gint64 _tmp130_ = 0LL;
 					LibraryPhoto* _tmp131_ = NULL;
@@ -35316,7 +35317,7 @@ static void library_photo_source_collection_real_notify_contents_altered (DataCo
 					_tmp133_ = photo;
 #line 4583 "/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 35315 "Photo.c"
+#line 35316 "Photo.c"
 				}
 #line 4586 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp134_ = photo;
@@ -35328,7 +35329,7 @@ static void library_photo_source_collection_real_notify_contents_altered (DataCo
 				_tmp136_ = raw_rows;
 #line 4587 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp136_ != NULL) {
-#line 35327 "Photo.c"
+#line 35328 "Photo.c"
 					{
 						GeeIterator* _row_it = NULL;
 						GeeCollection* _tmp137_ = NULL;
@@ -35341,7 +35342,7 @@ static void library_photo_source_collection_real_notify_contents_altered (DataCo
 						_row_it = _tmp138_;
 #line 4588 "/home/jens/Source/shotwell/src/Photo.vala"
 						while (TRUE) {
-#line 35340 "Photo.c"
+#line 35341 "Photo.c"
 							GeeIterator* _tmp139_ = NULL;
 							gboolean _tmp140_ = FALSE;
 							BackingPhotoRow* row = NULL;
@@ -35357,7 +35358,7 @@ static void library_photo_source_collection_real_notify_contents_altered (DataCo
 							if (!_tmp140_) {
 #line 4588 "/home/jens/Source/shotwell/src/Photo.vala"
 								break;
-#line 35356 "Photo.c"
+#line 35357 "Photo.c"
 							}
 #line 4588 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp141_ = _row_it;
@@ -35371,7 +35372,7 @@ static void library_photo_source_collection_real_notify_contents_altered (DataCo
 							_tmp144_ = _tmp143_->filesize;
 #line 4589 "/home/jens/Source/shotwell/src/Photo.vala"
 							if (_tmp144_ >= ((gint64) 0)) {
-#line 35370 "Photo.c"
+#line 35371 "Photo.c"
 								GeeMultiMap* _tmp145_ = NULL;
 								BackingPhotoRow* _tmp146_ = NULL;
 								gint64 _tmp147_ = 0LL;
@@ -35400,15 +35401,15 @@ static void library_photo_source_collection_real_notify_contents_altered (DataCo
 								_tmp152_ = _tmp151_->filesize;
 #line 4591 "/home/jens/Source/shotwell/src/Photo.vala"
 								gee_multi_map_remove (_tmp149_, _tmp150_, &_tmp152_);
-#line 35399 "Photo.c"
+#line 35400 "Photo.c"
 							}
 #line 4588 "/home/jens/Source/shotwell/src/Photo.vala"
 							_backing_photo_row_unref0 (row);
-#line 35403 "Photo.c"
+#line 35404 "Photo.c"
 						}
 #line 4588 "/home/jens/Source/shotwell/src/Photo.vala"
 						_g_object_unref0 (_row_it);
-#line 35407 "Photo.c"
+#line 35408 "Photo.c"
 					}
 				}
 #line 4559 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -35421,11 +35422,11 @@ static void library_photo_source_collection_real_notify_contents_altered (DataCo
 				_g_object_unref0 (photo);
 #line 4559 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (object);
-#line 35420 "Photo.c"
+#line 35421 "Photo.c"
 			}
 #line 4559 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (_object_it);
-#line 35424 "Photo.c"
+#line 35425 "Photo.c"
 		}
 	}
 #line 4598 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -35434,7 +35435,7 @@ static void library_photo_source_collection_real_notify_contents_altered (DataCo
 	_tmp154_ = removed;
 #line 4598 "/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 35433 "Photo.c"
+#line 35434 "Photo.c"
 }
 
 
@@ -35453,7 +35454,7 @@ static void library_photo_source_collection_on_editable_replaced (LibraryPhotoSo
 	_tmp0_ = old_file;
 #line 4602 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp0_ != NULL) {
-#line 35452 "Photo.c"
+#line 35453 "Photo.c"
 		gboolean is_removed = FALSE;
 		GeeHashMap* _tmp1_ = NULL;
 		GFile* _tmp2_ = NULL;
@@ -35471,13 +35472,13 @@ static void library_photo_source_collection_on_editable_replaced (LibraryPhotoSo
 		_tmp4_ = is_removed;
 #line 4604 "/home/jens/Source/shotwell/src/Photo.vala"
 		_vala_assert (_tmp4_, "is_removed");
-#line 35470 "Photo.c"
+#line 35471 "Photo.c"
 	}
 #line 4607 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp5_ = new_file;
 #line 4607 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp5_ != NULL) {
-#line 35476 "Photo.c"
+#line 35477 "Photo.c"
 		GeeHashMap* _tmp6_ = NULL;
 		GFile* _tmp7_ = NULL;
 		Photo* _tmp8_ = NULL;
@@ -35489,7 +35490,7 @@ static void library_photo_source_collection_on_editable_replaced (LibraryPhotoSo
 		_tmp8_ = photo;
 #line 4608 "/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 35488 "Photo.c"
+#line 35489 "Photo.c"
 	}
 }
 
@@ -35528,7 +35529,7 @@ static void library_photo_source_collection_on_raw_development_modified (Library
 		_g_object_unref0 (photo);
 #line 4614 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 35527 "Photo.c"
+#line 35528 "Photo.c"
 	}
 #line 4617 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = self->priv->photo_to_raw_development_filesize;
@@ -35538,7 +35539,7 @@ static void library_photo_source_collection_on_raw_development_modified (Library
 	_tmp5_ = gee_multi_map_contains (_tmp3_, _tmp4_);
 #line 4617 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp5_) {
-#line 35537 "Photo.c"
+#line 35538 "Photo.c"
 		GeeMultiMap* _tmp21_ = NULL;
 		LibraryPhoto* _tmp22_ = NULL;
 		{
@@ -35567,7 +35568,7 @@ static void library_photo_source_collection_on_raw_development_modified (Library
 			_s_it = _tmp11_;
 #line 4618 "/home/jens/Source/shotwell/src/Photo.vala"
 			while (TRUE) {
-#line 35566 "Photo.c"
+#line 35567 "Photo.c"
 				GeeIterator* _tmp12_ = NULL;
 				gboolean _tmp13_ = FALSE;
 				gint64 s = 0LL;
@@ -35586,7 +35587,7 @@ static void library_photo_source_collection_on_raw_development_modified (Library
 				if (!_tmp13_) {
 #line 4618 "/home/jens/Source/shotwell/src/Photo.vala"
 					break;
-#line 35585 "Photo.c"
+#line 35586 "Photo.c"
 				}
 #line 4618 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp14_ = _s_it;
@@ -35608,11 +35609,11 @@ static void library_photo_source_collection_on_raw_development_modified (Library
 				_tmp20_ = photo;
 #line 4619 "/home/jens/Source/shotwell/src/Photo.vala"
 				gee_multi_map_remove (_tmp18_, &_tmp19_, _tmp20_);
-#line 35607 "Photo.c"
+#line 35608 "Photo.c"
 			}
 #line 4618 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (_s_it);
-#line 35611 "Photo.c"
+#line 35612 "Photo.c"
 		}
 #line 4620 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp21_ = self->priv->photo_to_raw_development_filesize;
@@ -35620,7 +35621,7 @@ static void library_photo_source_collection_on_raw_development_modified (Library
 		_tmp22_ = photo;
 #line 4620 "/home/jens/Source/shotwell/src/Photo.vala"
 		gee_multi_map_remove_all (_tmp21_, _tmp22_);
-#line 35619 "Photo.c"
+#line 35620 "Photo.c"
 	}
 #line 4624 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp23_ = photo;
@@ -35632,7 +35633,7 @@ static void library_photo_source_collection_on_raw_development_modified (Library
 	_tmp25_ = raw_list;
 #line 4625 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp25_ != NULL) {
-#line 35631 "Photo.c"
+#line 35632 "Photo.c"
 		{
 			GeeIterator* _f_it = NULL;
 			GeeCollection* _tmp26_ = NULL;
@@ -35645,7 +35646,7 @@ static void library_photo_source_collection_on_raw_development_modified (Library
 			_f_it = _tmp27_;
 #line 4626 "/home/jens/Source/shotwell/src/Photo.vala"
 			while (TRUE) {
-#line 35644 "Photo.c"
+#line 35645 "Photo.c"
 				GeeIterator* _tmp28_ = NULL;
 				gboolean _tmp29_ = FALSE;
 				GFile* f = NULL;
@@ -35662,7 +35663,7 @@ static void library_photo_source_collection_on_raw_development_modified (Library
 				if (!_tmp29_) {
 #line 4626 "/home/jens/Source/shotwell/src/Photo.vala"
 					break;
-#line 35661 "Photo.c"
+#line 35662 "Photo.c"
 				}
 #line 4626 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp30_ = _f_it;
@@ -35680,11 +35681,11 @@ static void library_photo_source_collection_on_raw_development_modified (Library
 				gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp33_, _tmp34_);
 #line 4626 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (f);
-#line 35679 "Photo.c"
+#line 35680 "Photo.c"
 			}
 #line 4626 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (_f_it);
-#line 35683 "Photo.c"
+#line 35684 "Photo.c"
 		}
 	}
 #line 4629 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -35697,7 +35698,7 @@ static void library_photo_source_collection_on_raw_development_modified (Library
 	_tmp37_ = raw_rows;
 #line 4630 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp37_ != NULL) {
-#line 35696 "Photo.c"
+#line 35697 "Photo.c"
 		{
 			GeeIterator* _row_it = NULL;
 			GeeCollection* _tmp38_ = NULL;
@@ -35710,7 +35711,7 @@ static void library_photo_source_collection_on_raw_development_modified (Library
 			_row_it = _tmp39_;
 #line 4631 "/home/jens/Source/shotwell/src/Photo.vala"
 			while (TRUE) {
-#line 35709 "Photo.c"
+#line 35710 "Photo.c"
 				GeeIterator* _tmp40_ = NULL;
 				gboolean _tmp41_ = FALSE;
 				BackingPhotoRow* row = NULL;
@@ -35726,7 +35727,7 @@ static void library_photo_source_collection_on_raw_development_modified (Library
 				if (!_tmp41_) {
 #line 4631 "/home/jens/Source/shotwell/src/Photo.vala"
 					break;
-#line 35725 "Photo.c"
+#line 35726 "Photo.c"
 				}
 #line 4631 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp42_ = _row_it;
@@ -35740,7 +35741,7 @@ static void library_photo_source_collection_on_raw_development_modified (Library
 				_tmp45_ = _tmp44_->filesize;
 #line 4632 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp45_ > ((gint64) 0)) {
-#line 35739 "Photo.c"
+#line 35740 "Photo.c"
 					GeeMultiMap* _tmp46_ = NULL;
 					BackingPhotoRow* _tmp47_ = NULL;
 					gint64 _tmp48_ = 0LL;
@@ -35769,15 +35770,15 @@ static void library_photo_source_collection_on_raw_development_modified (Library
 					_tmp53_ = _tmp52_->filesize;
 #line 4634 "/home/jens/Source/shotwell/src/Photo.vala"
 					gee_multi_map_set (_tmp50_, _tmp51_, &_tmp53_);
-#line 35768 "Photo.c"
+#line 35769 "Photo.c"
 				}
 #line 4631 "/home/jens/Source/shotwell/src/Photo.vala"
 				_backing_photo_row_unref0 (row);
-#line 35772 "Photo.c"
+#line 35773 "Photo.c"
 			}
 #line 4631 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (_row_it);
-#line 35776 "Photo.c"
+#line 35777 "Photo.c"
 		}
 	}
 #line 4611 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -35786,14 +35787,14 @@ static void library_photo_source_collection_on_raw_development_modified (Library
 	_g_object_unref0 (raw_list);
 #line 4611 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (photo);
-#line 35785 "Photo.c"
+#line 35786 "Photo.c"
 }
 
 
 static gpointer __int64_dup0 (gpointer self) {
 #line 4650 "/home/jens/Source/shotwell/src/Photo.vala"
 	return self ? _int64_dup (self) : NULL;
-#line 35792 "Photo.c"
+#line 35793 "Photo.c"
 }
 
 
@@ -35804,7 +35805,7 @@ static void library_photo_source_collection_real_items_altered (DataCollection*
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_SOURCE_COLLECTION, LibraryPhotoSourceCollection);
 #line 4640 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (GEE_IS_MAP (items));
-#line 35803 "Photo.c"
+#line 35804 "Photo.c"
 	{
 		GeeIterator* _object_it = NULL;
 		GeeMap* _tmp0_ = NULL;
@@ -35831,7 +35832,7 @@ static void library_photo_source_collection_real_items_altered (DataCollection*
 		_object_it = _tmp5_;
 #line 4641 "/home/jens/Source/shotwell/src/Photo.vala"
 		while (TRUE) {
-#line 35830 "Photo.c"
+#line 35831 "Photo.c"
 			GeeIterator* _tmp6_ = NULL;
 			gboolean _tmp7_ = FALSE;
 			DataObject* object = NULL;
@@ -35855,7 +35856,7 @@ static void library_photo_source_collection_real_items_altered (DataCollection*
 			if (!_tmp7_) {
 #line 4641 "/home/jens/Source/shotwell/src/Photo.vala"
 				break;
-#line 35854 "Photo.c"
+#line 35855 "Photo.c"
 			}
 #line 4641 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp8_ = _object_it;
@@ -35885,7 +35886,7 @@ static void library_photo_source_collection_real_items_altered (DataCollection*
 			if (_tmp17_) {
 #line 4646 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp15_ = TRUE;
-#line 35884 "Photo.c"
+#line 35885 "Photo.c"
 			} else {
 				Alteration* _tmp18_ = NULL;
 				gboolean _tmp19_ = FALSE;
@@ -35895,11 +35896,11 @@ static void library_photo_source_collection_real_items_altered (DataCollection*
 				_tmp19_ = alteration_has_detail (_tmp18_, "image", "editable");
 #line 4646 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp15_ = _tmp19_;
-#line 35894 "Photo.c"
+#line 35895 "Photo.c"
 			}
 #line 4646 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp15_) {
-#line 35898 "Photo.c"
+#line 35899 "Photo.c"
 				gint64 old_master_filesize = 0LL;
 				GeeHashMap* _tmp20_ = NULL;
 				LibraryPhoto* _tmp21_ = NULL;
@@ -35958,7 +35959,7 @@ static void library_photo_source_collection_real_items_altered (DataCollection*
 				_tmp28_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp27_);
 #line 4648 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp28_) {
-#line 35957 "Photo.c"
+#line 35958 "Photo.c"
 					GeeHashMap* _tmp29_ = NULL;
 					LibraryPhoto* _tmp30_ = NULL;
 					gpointer _tmp31_ = NULL;
@@ -35972,7 +35973,7 @@ static void library_photo_source_collection_real_items_altered (DataCollection*
 					_g_free0 (_tmp25_);
 #line 4649 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp25_ = (gint64*) _tmp31_;
-#line 35971 "Photo.c"
+#line 35972 "Photo.c"
 				} else {
 					gint64 _tmp32_ = 0LL;
 					gint64* _tmp33_ = NULL;
@@ -35984,7 +35985,7 @@ static void library_photo_source_collection_real_items_altered (DataCollection*
 					_g_free0 (_tmp25_);
 #line 4650 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp25_ = _tmp33_;
-#line 35983 "Photo.c"
+#line 35984 "Photo.c"
 				}
 #line 4648 "/home/jens/Source/shotwell/src/Photo.vala"
 				old_editable_filesize = *_tmp25_;
@@ -36006,7 +36007,7 @@ static void library_photo_source_collection_real_items_altered (DataCollection*
 				_tmp39_ = old_editable_filesize;
 #line 4654 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp39_ >= ((gint64) 0)) {
-#line 36005 "Photo.c"
+#line 36006 "Photo.c"
 					GeeHashMap* _tmp40_ = NULL;
 					LibraryPhoto* _tmp41_ = NULL;
 					GeeMultiMap* _tmp42_ = NULL;
@@ -36026,7 +36027,7 @@ static void library_photo_source_collection_real_items_altered (DataCollection*
 					_tmp44_ = photo;
 #line 4656 "/home/jens/Source/shotwell/src/Photo.vala"
 					gee_multi_map_remove (_tmp42_, &_tmp43_, _tmp44_);
-#line 36025 "Photo.c"
+#line 36026 "Photo.c"
 				}
 #line 4659 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp45_ = photo;
@@ -36054,7 +36055,7 @@ static void library_photo_source_collection_real_items_altered (DataCollection*
 				_backing_photo_row_unref0 (_tmp53_);
 #line 4660 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp54_) {
-#line 36053 "Photo.c"
+#line 36054 "Photo.c"
 					LibraryPhoto* _tmp55_ = NULL;
 					BackingPhotoRow* _tmp56_ = NULL;
 					BackingPhotoRow* _tmp57_ = NULL;
@@ -36071,11 +36072,11 @@ static void library_photo_source_collection_real_items_altered (DataCollection*
 					_tmp50_ = _tmp58_;
 #line 4661 "/home/jens/Source/shotwell/src/Photo.vala"
 					_backing_photo_row_unref0 (_tmp57_);
-#line 36070 "Photo.c"
+#line 36071 "Photo.c"
 				} else {
 #line 4662 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp50_ = (gint64) -1;
-#line 36074 "Photo.c"
+#line 36075 "Photo.c"
 				}
 #line 4660 "/home/jens/Source/shotwell/src/Photo.vala"
 				editable_filesize = _tmp50_;
@@ -36099,7 +36100,7 @@ static void library_photo_source_collection_real_items_altered (DataCollection*
 				_tmp65_ = editable_filesize;
 #line 4665 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp65_ >= ((gint64) 0)) {
-#line 36098 "Photo.c"
+#line 36099 "Photo.c"
 					GeeHashMap* _tmp66_ = NULL;
 					LibraryPhoto* _tmp67_ = NULL;
 					gint64 _tmp68_ = 0LL;
@@ -36122,11 +36123,11 @@ static void library_photo_source_collection_real_items_altered (DataCollection*
 					_tmp71_ = photo;
 #line 4667 "/home/jens/Source/shotwell/src/Photo.vala"
 					gee_multi_map_set (_tmp69_, &_tmp70_, _tmp71_);
-#line 36121 "Photo.c"
+#line 36122 "Photo.c"
 				}
 #line 4646 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_free0 (_tmp25_);
-#line 36125 "Photo.c"
+#line 36126 "Photo.c"
 			}
 #line 4641 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (photo);
@@ -36134,17 +36135,17 @@ static void library_photo_source_collection_real_items_altered (DataCollection*
 			_alteration_unref0 (alteration);
 #line 4641 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (object);
-#line 36133 "Photo.c"
+#line 36134 "Photo.c"
 		}
 #line 4641 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_object_it);
-#line 36137 "Photo.c"
+#line 36138 "Photo.c"
 	}
 #line 4672 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp72_ = items;
 #line 4672 "/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 36143 "Photo.c"
+#line 36144 "Photo.c"
 }
 
 
@@ -36161,7 +36162,7 @@ static void library_photo_source_collection_real_postprocess_imported_media (Med
 	_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"
 	map = _tmp0_;
-#line 36160 "Photo.c"
+#line 36161 "Photo.c"
 	{
 		GeeIterator* _media_it = NULL;
 		GeeCollection* _tmp1_ = NULL;
@@ -36174,7 +36175,7 @@ static void library_photo_source_collection_real_postprocess_imported_media (Med
 		_media_it = _tmp2_;
 #line 4678 "/home/jens/Source/shotwell/src/Photo.vala"
 		while (TRUE) {
-#line 36173 "Photo.c"
+#line 36174 "Photo.c"
 			GeeIterator* _tmp3_ = NULL;
 			gboolean _tmp4_ = FALSE;
 			MediaSource* media = NULL;
@@ -36205,7 +36206,7 @@ static void library_photo_source_collection_real_postprocess_imported_media (Med
 			if (!_tmp4_) {
 #line 4678 "/home/jens/Source/shotwell/src/Photo.vala"
 				break;
-#line 36204 "Photo.c"
+#line 36205 "Photo.c"
 			}
 #line 4678 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp5_ = _media_it;
@@ -36237,7 +36238,7 @@ static void library_photo_source_collection_real_postprocess_imported_media (Med
 			_tmp13_ = photo_metadata_has_hierarchical_keywords (_tmp12_);
 #line 4691 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp13_) {
-#line 36236 "Photo.c"
+#line 36237 "Photo.c"
 				PhotoMetadata* _tmp14_ = NULL;
 				GeeSet* _tmp15_ = NULL;
 				GeeSet* _tmp16_ = NULL;
@@ -36256,7 +36257,7 @@ static void library_photo_source_collection_real_postprocess_imported_media (Med
 				htag_index = _tmp17_;
 #line 4692 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (_tmp16_);
-#line 36255 "Photo.c"
+#line 36256 "Photo.c"
 			}
 #line 4696 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp18_ = photo;
@@ -36270,7 +36271,7 @@ static void library_photo_source_collection_real_postprocess_imported_media (Med
 			_g_object_unref0 (_tmp20_);
 #line 4696 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp21_) {
-#line 36269 "Photo.c"
+#line 36270 "Photo.c"
 				{
 					GeeIterator* _keyword_it = NULL;
 					LibraryPhoto* _tmp22_ = NULL;
@@ -36294,7 +36295,7 @@ static void library_photo_source_collection_real_postprocess_imported_media (Med
 					_keyword_it = _tmp26_;
 #line 4697 "/home/jens/Source/shotwell/src/Photo.vala"
 					while (TRUE) {
-#line 36293 "Photo.c"
+#line 36294 "Photo.c"
 						GeeIterator* _tmp27_ = NULL;
 						gboolean _tmp28_ = FALSE;
 						gchar* keyword = NULL;
@@ -36317,7 +36318,7 @@ static void library_photo_source_collection_real_postprocess_imported_media (Med
 						if (!_tmp28_) {
 #line 4697 "/home/jens/Source/shotwell/src/Photo.vala"
 							break;
-#line 36316 "Photo.c"
+#line 36317 "Photo.c"
 						}
 #line 4697 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp29_ = _keyword_it;
@@ -36329,7 +36330,7 @@ static void library_photo_source_collection_real_postprocess_imported_media (Med
 						_tmp32_ = htag_index;
 #line 4698 "/home/jens/Source/shotwell/src/Photo.vala"
 						if (_tmp32_ != NULL) {
-#line 36328 "Photo.c"
+#line 36329 "Photo.c"
 							HierarchicalTagIndex* _tmp33_ = NULL;
 							const gchar* _tmp34_ = NULL;
 							gboolean _tmp35_ = FALSE;
@@ -36341,11 +36342,11 @@ static void library_photo_source_collection_real_postprocess_imported_media (Med
 							_tmp35_ = hierarchical_tag_index_is_tag_in_index (_tmp33_, _tmp34_);
 #line 4698 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp31_ = _tmp35_;
-#line 36340 "Photo.c"
+#line 36341 "Photo.c"
 						} else {
 #line 4698 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp31_ = FALSE;
-#line 36344 "Photo.c"
+#line 36345 "Photo.c"
 						}
 #line 4698 "/home/jens/Source/shotwell/src/Photo.vala"
 						if (_tmp31_) {
@@ -36353,7 +36354,7 @@ static void library_photo_source_collection_real_postprocess_imported_media (Med
 							_g_free0 (keyword);
 #line 4699 "/home/jens/Source/shotwell/src/Photo.vala"
 							continue;
-#line 36352 "Photo.c"
+#line 36353 "Photo.c"
 						}
 #line 4701 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp36_ = keyword;
@@ -36369,7 +36370,7 @@ static void library_photo_source_collection_real_postprocess_imported_media (Med
 						_tmp40_ = hierarchical_tag_index_is_tag_in_index (_tmp38_, _tmp39_);
 #line 4703 "/home/jens/Source/shotwell/src/Photo.vala"
 						if (_tmp40_) {
-#line 36368 "Photo.c"
+#line 36369 "Photo.c"
 							gchar* most_derived_path = NULL;
 							HierarchicalTagIndex* _tmp41_ = NULL;
 							const gchar* _tmp42_ = NULL;
@@ -36409,13 +36410,13 @@ static void library_photo_source_collection_real_postprocess_imported_media (Med
 							_g_free0 (keyword);
 #line 4706 "/home/jens/Source/shotwell/src/Photo.vala"
 							continue;
-#line 36408 "Photo.c"
+#line 36409 "Photo.c"
 						}
 #line 4709 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp49_ = name;
 #line 4709 "/home/jens/Source/shotwell/src/Photo.vala"
 						if (_tmp49_ != NULL) {
-#line 36414 "Photo.c"
+#line 36415 "Photo.c"
 							GeeHashMultiMap* _tmp50_ = NULL;
 							const gchar* _tmp51_ = NULL;
 							Tag* _tmp52_ = NULL;
@@ -36435,17 +36436,17 @@ static void library_photo_source_collection_real_postprocess_imported_media (Med
 							gee_multi_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, GEE_TYPE_MULTI_MAP, GeeMultiMap), _tmp53_, _tmp54_);
 #line 4710 "/home/jens/Source/shotwell/src/Photo.vala"
 							_g_object_unref0 (_tmp53_);
-#line 36434 "Photo.c"
+#line 36435 "Photo.c"
 						}
 #line 4697 "/home/jens/Source/shotwell/src/Photo.vala"
 						_g_free0 (name);
 #line 4697 "/home/jens/Source/shotwell/src/Photo.vala"
 						_g_free0 (keyword);
-#line 36440 "Photo.c"
+#line 36441 "Photo.c"
 					}
 #line 4697 "/home/jens/Source/shotwell/src/Photo.vala"
 					_g_object_unref0 (_keyword_it);
-#line 36444 "Photo.c"
+#line 36445 "Photo.c"
 				}
 			}
 #line 4714 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -36454,7 +36455,7 @@ static void library_photo_source_collection_real_postprocess_imported_media (Med
 			_tmp56_ = photo_metadata_has_hierarchical_keywords (_tmp55_);
 #line 4714 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp56_) {
-#line 36453 "Photo.c"
+#line 36454 "Photo.c"
 				{
 					GeeIterator* _path_it = NULL;
 					HierarchicalTagIndex* _tmp57_ = NULL;
@@ -36478,7 +36479,7 @@ static void library_photo_source_collection_real_postprocess_imported_media (Med
 					_path_it = _tmp61_;
 #line 4715 "/home/jens/Source/shotwell/src/Photo.vala"
 					while (TRUE) {
-#line 36477 "Photo.c"
+#line 36478 "Photo.c"
 						GeeIterator* _tmp62_ = NULL;
 						gboolean _tmp63_ = FALSE;
 						gchar* path = NULL;
@@ -36496,7 +36497,7 @@ static void library_photo_source_collection_real_postprocess_imported_media (Med
 						if (!_tmp63_) {
 #line 4715 "/home/jens/Source/shotwell/src/Photo.vala"
 							break;
-#line 36495 "Photo.c"
+#line 36496 "Photo.c"
 						}
 #line 4715 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp64_ = _path_it;
@@ -36514,7 +36515,7 @@ static void library_photo_source_collection_real_postprocess_imported_media (Med
 						_tmp68_ = name;
 #line 4717 "/home/jens/Source/shotwell/src/Photo.vala"
 						if (_tmp68_ != NULL) {
-#line 36513 "Photo.c"
+#line 36514 "Photo.c"
 							GeeHashMultiMap* _tmp69_ = NULL;
 							const gchar* _tmp70_ = NULL;
 							Tag* _tmp71_ = NULL;
@@ -36534,17 +36535,17 @@ static void library_photo_source_collection_real_postprocess_imported_media (Med
 							gee_multi_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp69_, GEE_TYPE_MULTI_MAP, GeeMultiMap), _tmp72_, _tmp73_);
 #line 4718 "/home/jens/Source/shotwell/src/Photo.vala"
 							_g_object_unref0 (_tmp72_);
-#line 36533 "Photo.c"
+#line 36534 "Photo.c"
 						}
 #line 4715 "/home/jens/Source/shotwell/src/Photo.vala"
 						_g_free0 (name);
 #line 4715 "/home/jens/Source/shotwell/src/Photo.vala"
 						_g_free0 (path);
-#line 36539 "Photo.c"
+#line 36540 "Photo.c"
 					}
 #line 4715 "/home/jens/Source/shotwell/src/Photo.vala"
 					_g_object_unref0 (_path_it);
-#line 36543 "Photo.c"
+#line 36544 "Photo.c"
 				}
 			}
 #line 4678 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -36557,11 +36558,11 @@ static void library_photo_source_collection_real_postprocess_imported_media (Med
 			_g_object_unref0 (photo);
 #line 4678 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (media);
-#line 36556 "Photo.c"
+#line 36557 "Photo.c"
 		}
 #line 4678 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_media_it);
-#line 36560 "Photo.c"
+#line 36561 "Photo.c"
 	}
 	{
 		GeeIterator* _media_it = NULL;
@@ -36575,7 +36576,7 @@ static void library_photo_source_collection_real_postprocess_imported_media (Med
 		_media_it = _tmp75_;
 #line 4723 "/home/jens/Source/shotwell/src/Photo.vala"
 		while (TRUE) {
-#line 36574 "Photo.c"
+#line 36575 "Photo.c"
 			GeeIterator* _tmp76_ = NULL;
 			gboolean _tmp77_ = FALSE;
 			MediaSource* media = NULL;
@@ -36593,7 +36594,7 @@ static void library_photo_source_collection_real_postprocess_imported_media (Med
 			if (!_tmp77_) {
 #line 4723 "/home/jens/Source/shotwell/src/Photo.vala"
 				break;
-#line 36592 "Photo.c"
+#line 36593 "Photo.c"
 			}
 #line 4723 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp78_ = _media_it;
@@ -36615,11 +36616,11 @@ static void library_photo_source_collection_real_postprocess_imported_media (Med
 			_g_object_unref0 (photo);
 #line 4723 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (media);
-#line 36614 "Photo.c"
+#line 36615 "Photo.c"
 		}
 #line 4723 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_media_it);
-#line 36618 "Photo.c"
+#line 36619 "Photo.c"
 	}
 	{
 		GeeIterator* _tag_it = NULL;
@@ -36644,7 +36645,7 @@ static void library_photo_source_collection_real_postprocess_imported_media (Med
 		_tag_it = _tmp87_;
 #line 4728 "/home/jens/Source/shotwell/src/Photo.vala"
 		while (TRUE) {
-#line 36643 "Photo.c"
+#line 36644 "Photo.c"
 			GeeIterator* _tmp88_ = NULL;
 			gboolean _tmp89_ = FALSE;
 			Tag* tag = NULL;
@@ -36663,7 +36664,7 @@ static void library_photo_source_collection_real_postprocess_imported_media (Med
 			if (!_tmp89_) {
 #line 4728 "/home/jens/Source/shotwell/src/Photo.vala"
 				break;
-#line 36662 "Photo.c"
+#line 36663 "Photo.c"
 			}
 #line 4728 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp90_ = _tag_it;
@@ -36687,11 +36688,11 @@ static void library_photo_source_collection_real_postprocess_imported_media (Med
 			_g_object_unref0 (_tmp96_);
 #line 4728 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (tag);
-#line 36686 "Photo.c"
+#line 36687 "Photo.c"
 		}
 #line 4728 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_tag_it);
-#line 36690 "Photo.c"
+#line 36691 "Photo.c"
 	}
 #line 4731 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp97_ = media_sources;
@@ -36699,7 +36700,7 @@ static void library_photo_source_collection_real_postprocess_imported_media (Med
 	MEDIA_SOURCE_COLLECTION_CLASS (library_photo_source_collection_parent_class)->postprocess_imported_media (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), _tmp97_);
 #line 4676 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (map);
-#line 36698 "Photo.c"
+#line 36699 "Photo.c"
 }
 
 
@@ -36716,7 +36717,7 @@ static void library_photo_source_collection_real_notify_master_reimported (Libra
 	_tmp1_ = metadata;
 #line 4736 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_signal_emit_by_name (self, "master-reimported", _tmp0_, _tmp1_);
-#line 36715 "Photo.c"
+#line 36716 "Photo.c"
 }
 
 
@@ -36725,7 +36726,7 @@ void library_photo_source_collection_notify_master_reimported (LibraryPhotoSourc
 	g_return_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self));
 #line 4735 "/home/jens/Source/shotwell/src/Photo.vala"
 	LIBRARY_PHOTO_SOURCE_COLLECTION_GET_CLASS (self)->notify_master_reimported (self, photo, metadata);
-#line 36724 "Photo.c"
+#line 36725 "Photo.c"
 }
 
 
@@ -36742,7 +36743,7 @@ static void library_photo_source_collection_real_notify_editable_reimported (Lib
 	_tmp1_ = metadata;
 #line 4741 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_signal_emit_by_name (self, "editable-reimported", _tmp0_, _tmp1_);
-#line 36741 "Photo.c"
+#line 36742 "Photo.c"
 }
 
 
@@ -36751,7 +36752,7 @@ void library_photo_source_collection_notify_editable_reimported (LibraryPhotoSou
 	g_return_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self));
 #line 4740 "/home/jens/Source/shotwell/src/Photo.vala"
 	LIBRARY_PHOTO_SOURCE_COLLECTION_GET_CLASS (self)->notify_editable_reimported (self, photo, metadata);
-#line 36750 "Photo.c"
+#line 36751 "Photo.c"
 }
 
 
@@ -36768,7 +36769,7 @@ static void library_photo_source_collection_real_notify_source_reimported (Libra
 	_tmp1_ = metadata;
 #line 4746 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_signal_emit_by_name (self, "source-reimported", _tmp0_, _tmp1_);
-#line 36767 "Photo.c"
+#line 36768 "Photo.c"
 }
 
 
@@ -36777,7 +36778,7 @@ void library_photo_source_collection_notify_source_reimported (LibraryPhotoSourc
 	g_return_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self));
 #line 4745 "/home/jens/Source/shotwell/src/Photo.vala"
 	LIBRARY_PHOTO_SOURCE_COLLECTION_GET_CLASS (self)->notify_source_reimported (self, photo, metadata);
-#line 36776 "Photo.c"
+#line 36777 "Photo.c"
 }
 
 
@@ -36794,7 +36795,7 @@ static void library_photo_source_collection_real_notify_baseline_reimported (Lib
 	_tmp1_ = metadata;
 #line 4751 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_signal_emit_by_name (self, "baseline-reimported", _tmp0_, _tmp1_);
-#line 36793 "Photo.c"
+#line 36794 "Photo.c"
 }
 
 
@@ -36803,7 +36804,7 @@ void library_photo_source_collection_notify_baseline_reimported (LibraryPhotoSou
 	g_return_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self));
 #line 4750 "/home/jens/Source/shotwell/src/Photo.vala"
 	LIBRARY_PHOTO_SOURCE_COLLECTION_GET_CLASS (self)->notify_baseline_reimported (self, photo, metadata);
-#line 36802 "Photo.c"
+#line 36803 "Photo.c"
 }
 
 
@@ -36825,7 +36826,7 @@ static MediaSource* library_photo_source_collection_real_fetch_by_numeric_id (Me
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_MEDIA_SOURCE, MediaSource);
 #line 4755 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 36824 "Photo.c"
+#line 36825 "Photo.c"
 }
 
 
@@ -36844,7 +36845,7 @@ static void library_photo_source_collection_on_trashcan_contents_altered (Librar
 	_tmp1_ = removed;
 #line 4760 "/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 36843 "Photo.c"
+#line 36844 "Photo.c"
 }
 
 
@@ -36866,7 +36867,7 @@ static gboolean library_photo_source_collection_check_if_trashed_photo (LibraryP
 	result = _tmp1_;
 #line 4765 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 36865 "Photo.c"
+#line 36866 "Photo.c"
 }
 
 
@@ -36885,7 +36886,7 @@ static void library_photo_source_collection_on_offline_contents_altered (Library
 	_tmp1_ = removed;
 #line 4770 "/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 36884 "Photo.c"
+#line 36885 "Photo.c"
 }
 
 
@@ -36907,7 +36908,7 @@ static gboolean library_photo_source_collection_check_if_offline_photo (LibraryP
 	result = _tmp1_;
 #line 4775 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 36906 "Photo.c"
+#line 36907 "Photo.c"
 }
 
 
@@ -36930,7 +36931,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 36929 "Photo.c"
+#line 36930 "Photo.c"
 		glong _tmp4_ = 0L;
 #line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp4_ = maxlen;
@@ -36938,7 +36939,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 36937 "Photo.c"
+#line 36938 "Photo.c"
 	} else {
 		gchar* _tmp5_ = NULL;
 		gchar* _tmp6_ = NULL;
@@ -36950,7 +36951,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 36949 "Photo.c"
+#line 36950 "Photo.c"
 	}
 }
 
@@ -36974,21 +36975,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 36973 "Photo.c"
+#line 36974 "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 36979 "Photo.c"
+#line 36980 "Photo.c"
 	} else {
 #line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp0_ = FALSE;
-#line 36983 "Photo.c"
+#line 36984 "Photo.c"
 	}
 #line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp0_) {
-#line 36987 "Photo.c"
+#line 36988 "Photo.c"
 		glong _tmp3_ = 0L;
 		glong _tmp4_ = 0L;
 		glong _tmp5_ = 0L;
@@ -37000,7 +37001,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 36999 "Photo.c"
+#line 37000 "Photo.c"
 	} else {
 		gint _tmp6_ = 0;
 		gint _tmp7_ = 0;
@@ -37010,13 +37011,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 37009 "Photo.c"
+#line 37010 "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 37015 "Photo.c"
+#line 37016 "Photo.c"
 		glong _tmp9_ = 0L;
 		glong _tmp10_ = 0L;
 		glong _tmp11_ = 0L;
@@ -37030,7 +37031,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 37029 "Photo.c"
+#line 37030 "Photo.c"
 	} else {
 		glong _tmp12_ = 0L;
 		glong _tmp13_ = 0L;
@@ -37040,13 +37041,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 37039 "Photo.c"
+#line 37040 "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 37045 "Photo.c"
+#line 37046 "Photo.c"
 		glong _tmp15_ = 0L;
 		glong _tmp16_ = 0L;
 #line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -37055,7 +37056,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 37054 "Photo.c"
+#line 37055 "Photo.c"
 	}
 #line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp17_ = offset;
@@ -37075,7 +37076,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 37074 "Photo.c"
+#line 37075 "Photo.c"
 }
 
 
@@ -37121,7 +37122,7 @@ static MediaSource* library_photo_source_collection_real_fetch_by_source_id (Med
 	_g_free0 (numeric_only);
 #line 4782 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 37120 "Photo.c"
+#line 37121 "Photo.c"
 }
 
 
@@ -37153,7 +37154,7 @@ static GeeCollection* library_photo_source_collection_real_get_event_source_ids
 	result = _tmp4_;
 #line 4786 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 37152 "Photo.c"
+#line 37153 "Photo.c"
 }
 
 
@@ -37176,7 +37177,7 @@ LibraryPhoto* library_photo_source_collection_fetch (LibraryPhotoSourceCollectio
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_LIBRARY_PHOTO, LibraryPhoto);
 #line 4790 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 37175 "Photo.c"
+#line 37176 "Photo.c"
 }
 
 
@@ -37199,7 +37200,7 @@ LibraryPhoto* library_photo_source_collection_fetch_by_editable_file (LibraryPho
 	result = (LibraryPhoto*) _tmp2_;
 #line 4794 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 37198 "Photo.c"
+#line 37199 "Photo.c"
 }
 
 
@@ -37222,7 +37223,7 @@ LibraryPhoto* library_photo_source_collection_fetch_by_raw_development_file (Lib
 	result = (LibraryPhoto*) _tmp2_;
 #line 4798 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 37221 "Photo.c"
+#line 37222 "Photo.c"
 }
 
 
@@ -37270,7 +37271,7 @@ static void library_photo_source_collection_compare_backing (LibraryPhotoSourceC
 	_backing_photo_row_unref0 (_tmp2_);
 #line 4804 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp5_) {
-#line 37269 "Photo.c"
+#line 37270 "Photo.c"
 		GeeCollection* _tmp6_ = NULL;
 		LibraryPhoto* _tmp7_ = NULL;
 #line 4805 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -37279,7 +37280,7 @@ static void library_photo_source_collection_compare_backing (LibraryPhotoSourceC
 		_tmp7_ = photo;
 #line 4805 "/home/jens/Source/shotwell/src/Photo.vala"
 		gee_collection_add (_tmp6_, _tmp7_);
-#line 37278 "Photo.c"
+#line 37279 "Photo.c"
 	}
 #line 4807 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp8_ = photo;
@@ -37291,7 +37292,7 @@ static void library_photo_source_collection_compare_backing (LibraryPhotoSourceC
 	_tmp11_ = editable;
 #line 4808 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp11_ != NULL) {
-#line 37290 "Photo.c"
+#line 37291 "Photo.c"
 		BackingPhotoRow* _tmp12_ = NULL;
 		GFileInfo* _tmp13_ = NULL;
 		gboolean _tmp14_ = FALSE;
@@ -37303,15 +37304,15 @@ static void library_photo_source_collection_compare_backing (LibraryPhotoSourceC
 		_tmp14_ = backing_photo_row_matches_file_info (_tmp12_, _tmp13_);
 #line 4808 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp10_ = _tmp14_;
-#line 37302 "Photo.c"
+#line 37303 "Photo.c"
 	} else {
 #line 4808 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp10_ = FALSE;
-#line 37306 "Photo.c"
+#line 37307 "Photo.c"
 	}
 #line 4808 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp10_) {
-#line 37310 "Photo.c"
+#line 37311 "Photo.c"
 		GeeCollection* _tmp15_ = NULL;
 		LibraryPhoto* _tmp16_ = NULL;
 #line 4809 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -37320,7 +37321,7 @@ static void library_photo_source_collection_compare_backing (LibraryPhotoSourceC
 		_tmp16_ = photo;
 #line 4809 "/home/jens/Source/shotwell/src/Photo.vala"
 		gee_collection_add (_tmp15_, _tmp16_);
-#line 37319 "Photo.c"
+#line 37320 "Photo.c"
 	}
 #line 4811 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp17_ = photo;
@@ -37332,7 +37333,7 @@ static void library_photo_source_collection_compare_backing (LibraryPhotoSourceC
 	_tmp19_ = development;
 #line 4812 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp19_ != NULL) {
-#line 37331 "Photo.c"
+#line 37332 "Photo.c"
 		{
 			GeeIterator* _row_it = NULL;
 			GeeCollection* _tmp20_ = NULL;
@@ -37345,7 +37346,7 @@ static void library_photo_source_collection_compare_backing (LibraryPhotoSourceC
 			_row_it = _tmp21_;
 #line 4813 "/home/jens/Source/shotwell/src/Photo.vala"
 			while (TRUE) {
-#line 37344 "Photo.c"
+#line 37345 "Photo.c"
 				GeeIterator* _tmp22_ = NULL;
 				gboolean _tmp23_ = FALSE;
 				BackingPhotoRow* row = NULL;
@@ -37362,7 +37363,7 @@ static void library_photo_source_collection_compare_backing (LibraryPhotoSourceC
 				if (!_tmp23_) {
 #line 4813 "/home/jens/Source/shotwell/src/Photo.vala"
 					break;
-#line 37361 "Photo.c"
+#line 37362 "Photo.c"
 				}
 #line 4813 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp24_ = _row_it;
@@ -37378,7 +37379,7 @@ static void library_photo_source_collection_compare_backing (LibraryPhotoSourceC
 				_tmp28_ = backing_photo_row_matches_file_info (_tmp26_, _tmp27_);
 #line 4814 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp28_) {
-#line 37377 "Photo.c"
+#line 37378 "Photo.c"
 					GeeCollection* _tmp29_ = NULL;
 					LibraryPhoto* _tmp30_ = NULL;
 #line 4815 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -37391,22 +37392,22 @@ static void library_photo_source_collection_compare_backing (LibraryPhotoSourceC
 					_backing_photo_row_unref0 (row);
 #line 4817 "/home/jens/Source/shotwell/src/Photo.vala"
 					break;
-#line 37390 "Photo.c"
+#line 37391 "Photo.c"
 				}
 #line 4813 "/home/jens/Source/shotwell/src/Photo.vala"
 				_backing_photo_row_unref0 (row);
-#line 37394 "Photo.c"
+#line 37395 "Photo.c"
 			}
 #line 4813 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (_row_it);
-#line 37398 "Photo.c"
+#line 37399 "Photo.c"
 		}
 	}
 #line 4801 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (development);
 #line 4801 "/home/jens/Source/shotwell/src/Photo.vala"
 	_backing_photo_row_unref0 (editable);
-#line 37405 "Photo.c"
+#line 37406 "Photo.c"
 }
 
 
@@ -37421,7 +37422,7 @@ void library_photo_source_collection_fetch_by_matching_backing (LibraryPhotoSour
 	g_return_if_fail (GEE_IS_COLLECTION (matches_editable));
 #line 4825 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (GEE_IS_COLLECTION (matched_development));
-#line 37420 "Photo.c"
+#line 37421 "Photo.c"
 	{
 		GeeIterator* _photo_it = NULL;
 		GeeMultiMap* _tmp0_ = NULL;
@@ -37451,7 +37452,7 @@ void library_photo_source_collection_fetch_by_matching_backing (LibraryPhotoSour
 		_photo_it = _tmp6_;
 #line 4827 "/home/jens/Source/shotwell/src/Photo.vala"
 		while (TRUE) {
-#line 37450 "Photo.c"
+#line 37451 "Photo.c"
 			GeeIterator* _tmp7_ = NULL;
 			gboolean _tmp8_ = FALSE;
 			LibraryPhoto* photo = NULL;
@@ -37470,7 +37471,7 @@ void library_photo_source_collection_fetch_by_matching_backing (LibraryPhotoSour
 			if (!_tmp8_) {
 #line 4827 "/home/jens/Source/shotwell/src/Photo.vala"
 				break;
-#line 37469 "Photo.c"
+#line 37470 "Photo.c"
 			}
 #line 4827 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp9_ = _photo_it;
@@ -37492,11 +37493,11 @@ void library_photo_source_collection_fetch_by_matching_backing (LibraryPhotoSour
 			library_photo_source_collection_compare_backing (self, _tmp11_, _tmp12_, _tmp13_, _tmp14_, _tmp15_);
 #line 4827 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (photo);
-#line 37491 "Photo.c"
+#line 37492 "Photo.c"
 		}
 #line 4827 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_photo_it);
-#line 37495 "Photo.c"
+#line 37496 "Photo.c"
 	}
 	{
 		GeeIterator* _media_it = NULL;
@@ -37518,7 +37519,7 @@ void library_photo_source_collection_fetch_by_matching_backing (LibraryPhotoSour
 		_media_it = _tmp19_;
 #line 4830 "/home/jens/Source/shotwell/src/Photo.vala"
 		while (TRUE) {
-#line 37517 "Photo.c"
+#line 37518 "Photo.c"
 			GeeIterator* _tmp20_ = NULL;
 			gboolean _tmp21_ = FALSE;
 			MediaSource* media = NULL;
@@ -37537,7 +37538,7 @@ void library_photo_source_collection_fetch_by_matching_backing (LibraryPhotoSour
 			if (!_tmp21_) {
 #line 4830 "/home/jens/Source/shotwell/src/Photo.vala"
 				break;
-#line 37536 "Photo.c"
+#line 37537 "Photo.c"
 			}
 #line 4830 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp22_ = _media_it;
@@ -37559,11 +37560,11 @@ void library_photo_source_collection_fetch_by_matching_backing (LibraryPhotoSour
 			library_photo_source_collection_compare_backing (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, TYPE_LIBRARY_PHOTO, LibraryPhoto), _tmp25_, _tmp26_, _tmp27_, _tmp28_);
 #line 4830 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (media);
-#line 37558 "Photo.c"
+#line 37559 "Photo.c"
 		}
 #line 4830 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_media_it);
-#line 37562 "Photo.c"
+#line 37563 "Photo.c"
 	}
 }
 
@@ -37574,7 +37575,7 @@ void library_photo_source_collection_get_basename_filesize_duplicate (LibraryPho
 	g_return_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self));
 #line 4834 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (basename != NULL);
-#line 37573 "Photo.c"
+#line 37574 "Photo.c"
 	{
 		GeeIterator* _photo_it = NULL;
 		GeeMultiMap* _tmp0_ = NULL;
@@ -37601,7 +37602,7 @@ void library_photo_source_collection_get_basename_filesize_duplicate (LibraryPho
 		_photo_it = _tmp5_;
 #line 4835 "/home/jens/Source/shotwell/src/Photo.vala"
 		while (TRUE) {
-#line 37600 "Photo.c"
+#line 37601 "Photo.c"
 			GeeIterator* _tmp6_ = NULL;
 			gboolean _tmp7_ = FALSE;
 			LibraryPhoto* photo = NULL;
@@ -37622,7 +37623,7 @@ void library_photo_source_collection_get_basename_filesize_duplicate (LibraryPho
 			if (!_tmp7_) {
 #line 4835 "/home/jens/Source/shotwell/src/Photo.vala"
 				break;
-#line 37621 "Photo.c"
+#line 37622 "Photo.c"
 			}
 #line 4835 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp8_ = _photo_it;
@@ -37648,7 +37649,7 @@ void library_photo_source_collection_get_basename_filesize_duplicate (LibraryPho
 			_g_object_unref0 (_tmp12_);
 #line 4836 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp16_) {
-#line 37647 "Photo.c"
+#line 37648 "Photo.c"
 				LibraryPhoto* _tmp17_ = NULL;
 				PhotoID _tmp18_ = {0};
 #line 4837 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -37663,15 +37664,15 @@ void library_photo_source_collection_get_basename_filesize_duplicate (LibraryPho
 				_g_object_unref0 (_photo_it);
 #line 4837 "/home/jens/Source/shotwell/src/Photo.vala"
 				return;
-#line 37662 "Photo.c"
+#line 37663 "Photo.c"
 			}
 #line 4835 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (photo);
-#line 37666 "Photo.c"
+#line 37667 "Photo.c"
 		}
 #line 4835 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_photo_it);
-#line 37670 "Photo.c"
+#line 37671 "Photo.c"
 	}
 #line 4840 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_id_init (&_tmp19_, PHOTO_ID_INVALID);
@@ -37679,7 +37680,7 @@ void library_photo_source_collection_get_basename_filesize_duplicate (LibraryPho
 	*result = _tmp19_;
 #line 4840 "/home/jens/Source/shotwell/src/Photo.vala"
 	return;
-#line 37678 "Photo.c"
+#line 37679 "Photo.c"
 }
 
 
@@ -37705,7 +37706,7 @@ gboolean library_photo_source_collection_has_basename_filesize_duplicate (Librar
 	result = _tmp3_;
 #line 4845 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 37704 "Photo.c"
+#line 37705 "Photo.c"
 }
 
 
@@ -37740,7 +37741,7 @@ LibraryPhoto* library_photo_source_collection_get_trashed_by_file (LibraryPhotoS
 	_tmp5_ = photo;
 #line 4850 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp5_ == NULL) {
-#line 37739 "Photo.c"
+#line 37740 "Photo.c"
 		MediaSourceHoldingTank* _tmp6_ = NULL;
 		LibraryPhotoSourceHoldingTank* _tmp7_ = NULL;
 		GFile* _tmp8_ = NULL;
@@ -37759,13 +37760,13 @@ LibraryPhoto* library_photo_source_collection_get_trashed_by_file (LibraryPhotoS
 		photo = G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_LIBRARY_PHOTO, LibraryPhoto);
 #line 4851 "/home/jens/Source/shotwell/src/Photo.vala"
 		_source_holding_tank_unref0 (_tmp7_);
-#line 37758 "Photo.c"
+#line 37759 "Photo.c"
 	}
 #line 4854 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = photo;
 #line 4854 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 37764 "Photo.c"
+#line 37765 "Photo.c"
 }
 
 
@@ -37796,7 +37797,7 @@ LibraryPhoto* library_photo_source_collection_get_trashed_by_md5 (LibraryPhotoSo
 	result = _tmp4_;
 #line 4858 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 37795 "Photo.c"
+#line 37796 "Photo.c"
 }
 
 
@@ -37831,7 +37832,7 @@ LibraryPhoto* library_photo_source_collection_get_offline_by_file (LibraryPhotoS
 	_tmp5_ = photo;
 #line 4863 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp5_ == NULL) {
-#line 37830 "Photo.c"
+#line 37831 "Photo.c"
 		MediaSourceHoldingTank* _tmp6_ = NULL;
 		LibraryPhotoSourceHoldingTank* _tmp7_ = NULL;
 		GFile* _tmp8_ = NULL;
@@ -37850,13 +37851,13 @@ LibraryPhoto* library_photo_source_collection_get_offline_by_file (LibraryPhotoS
 		photo = G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_LIBRARY_PHOTO, LibraryPhoto);
 #line 4864 "/home/jens/Source/shotwell/src/Photo.vala"
 		_source_holding_tank_unref0 (_tmp7_);
-#line 37849 "Photo.c"
+#line 37850 "Photo.c"
 	}
 #line 4867 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = photo;
 #line 4867 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 37855 "Photo.c"
+#line 37856 "Photo.c"
 }
 
 
@@ -37887,7 +37888,7 @@ LibraryPhoto* library_photo_source_collection_get_offline_by_md5 (LibraryPhotoSo
 	result = _tmp4_;
 #line 4871 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 37886 "Photo.c"
+#line 37887 "Photo.c"
 }
 
 
@@ -37913,7 +37914,7 @@ gint library_photo_source_collection_get_offline_count (LibraryPhotoSourceCollec
 	result = _tmp3_;
 #line 4875 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 37912 "Photo.c"
+#line 37913 "Photo.c"
 }
 
 
@@ -37960,11 +37961,11 @@ LibraryPhoto* library_photo_source_collection_get_state_by_file (LibraryPhotoSou
 		if (state) {
 #line 4883 "/home/jens/Source/shotwell/src/Photo.vala"
 			*state = _vala_state;
-#line 37959 "Photo.c"
+#line 37960 "Photo.c"
 		}
 #line 4883 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 37963 "Photo.c"
+#line 37964 "Photo.c"
 	}
 #line 4886 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = file;
@@ -37986,11 +37987,11 @@ LibraryPhoto* library_photo_source_collection_get_state_by_file (LibraryPhotoSou
 		if (state) {
 #line 4890 "/home/jens/Source/shotwell/src/Photo.vala"
 			*state = _vala_state;
-#line 37985 "Photo.c"
+#line 37986 "Photo.c"
 		}
 #line 4890 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 37989 "Photo.c"
+#line 37990 "Photo.c"
 	}
 #line 4893 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp6_ = file;
@@ -38012,11 +38013,11 @@ LibraryPhoto* library_photo_source_collection_get_state_by_file (LibraryPhotoSou
 		if (state) {
 #line 4897 "/home/jens/Source/shotwell/src/Photo.vala"
 			*state = _vala_state;
-#line 38011 "Photo.c"
+#line 38012 "Photo.c"
 		}
 #line 4897 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 38015 "Photo.c"
+#line 38016 "Photo.c"
 	}
 #line 4900 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp9_ = file;
@@ -38028,7 +38029,7 @@ LibraryPhoto* library_photo_source_collection_get_state_by_file (LibraryPhotoSou
 	if (_tmp11_ == NULL) {
 #line 4900 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_tmp10_);
-#line 38027 "Photo.c"
+#line 38028 "Photo.c"
 	}
 #line 4900 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (photo);
@@ -38046,11 +38047,11 @@ LibraryPhoto* library_photo_source_collection_get_state_by_file (LibraryPhotoSou
 		if (state) {
 #line 4904 "/home/jens/Source/shotwell/src/Photo.vala"
 			*state = _vala_state;
-#line 38045 "Photo.c"
+#line 38046 "Photo.c"
 		}
 #line 4904 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 38049 "Photo.c"
+#line 38050 "Photo.c"
 	}
 #line 4907 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp13_ = file;
@@ -38062,7 +38063,7 @@ LibraryPhoto* library_photo_source_collection_get_state_by_file (LibraryPhotoSou
 	if (_tmp15_ == NULL) {
 #line 4907 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_tmp14_);
-#line 38061 "Photo.c"
+#line 38062 "Photo.c"
 	}
 #line 4907 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (photo);
@@ -38080,11 +38081,11 @@ LibraryPhoto* library_photo_source_collection_get_state_by_file (LibraryPhotoSou
 		if (state) {
 #line 4911 "/home/jens/Source/shotwell/src/Photo.vala"
 			*state = _vala_state;
-#line 38079 "Photo.c"
+#line 38080 "Photo.c"
 		}
 #line 4911 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 38083 "Photo.c"
+#line 38084 "Photo.c"
 	}
 #line 4914 "/home/jens/Source/shotwell/src/Photo.vala"
 	_vala_state = LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_UNKNOWN;
@@ -38096,11 +38097,11 @@ LibraryPhoto* library_photo_source_collection_get_state_by_file (LibraryPhotoSou
 	if (state) {
 #line 4916 "/home/jens/Source/shotwell/src/Photo.vala"
 		*state = _vala_state;
-#line 38095 "Photo.c"
+#line 38096 "Photo.c"
 	}
 #line 4916 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 38099 "Photo.c"
+#line 38100 "Photo.c"
 }
 
 
@@ -38133,7 +38134,7 @@ static gboolean library_photo_source_collection_real_has_backlink (SourceCollect
 		result = TRUE;
 #line 4921 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 38132 "Photo.c"
+#line 38133 "Photo.c"
 	}
 #line 4923 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = media_source_collection_get_trashcan (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection));
@@ -38153,7 +38154,7 @@ static gboolean library_photo_source_collection_real_has_backlink (SourceCollect
 		result = TRUE;
 #line 4924 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 38152 "Photo.c"
+#line 38153 "Photo.c"
 	}
 #line 4926 "/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));
@@ -38173,13 +38174,13 @@ static gboolean library_photo_source_collection_real_has_backlink (SourceCollect
 		result = TRUE;
 #line 4927 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 38172 "Photo.c"
+#line 38173 "Photo.c"
 	}
 #line 4929 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = FALSE;
 #line 4929 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 38178 "Photo.c"
+#line 38179 "Photo.c"
 }
 
 
@@ -38220,7 +38221,7 @@ static void library_photo_source_collection_real_remove_backlink (SourceCollecti
 	_tmp6_ = backlink;
 #line 4936 "/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 38219 "Photo.c"
+#line 38220 "Photo.c"
 }
 
 
@@ -38235,7 +38236,7 @@ static TransactionController* library_photo_source_collection_real_get_transacti
 	_tmp0_ = self->priv->_transaction_controller;
 #line 4454 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp0_ == NULL) {
-#line 38234 "Photo.c"
+#line 38235 "Photo.c"
 		MediaSourceTransactionController* _tmp1_ = NULL;
 #line 4455 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp1_ = media_source_transaction_controller_new (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection));
@@ -38243,7 +38244,7 @@ static TransactionController* library_photo_source_collection_real_get_transacti
 		_transaction_controller_unref0 (self->priv->_transaction_controller);
 #line 4455 "/home/jens/Source/shotwell/src/Photo.vala"
 		self->priv->_transaction_controller = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_TRANSACTION_CONTROLLER, TransactionController);
-#line 38242 "Photo.c"
+#line 38243 "Photo.c"
 	}
 #line 4457 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = self->priv->_transaction_controller;
@@ -38251,7 +38252,7 @@ static TransactionController* library_photo_source_collection_real_get_transacti
 	result = _tmp2_;
 #line 4457 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 38250 "Photo.c"
+#line 38251 "Photo.c"
 }
 
 
@@ -38260,7 +38261,7 @@ static void library_photo_source_collection_real_master_reimported (LibraryPhoto
 	g_return_if_fail (IS_LIBRARY_PHOTO (photo));
 #line 4475 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail ((metadata == NULL) || IS_PHOTO_METADATA (metadata));
-#line 38259 "Photo.c"
+#line 38260 "Photo.c"
 }
 
 
@@ -38279,19 +38280,19 @@ static void g_cclosure_user_marshal_VOID__OBJECT_MEDIA_METADATA (GClosure * clos
 		data1 = closure->data;
 #line 4442 "/home/jens/Source/shotwell/src/Photo.vala"
 		data2 = param_values->data[0].v_pointer;
-#line 38278 "Photo.c"
+#line 38279 "Photo.c"
 	} else {
 #line 4442 "/home/jens/Source/shotwell/src/Photo.vala"
 		data1 = param_values->data[0].v_pointer;
 #line 4442 "/home/jens/Source/shotwell/src/Photo.vala"
 		data2 = closure->data;
-#line 38284 "Photo.c"
+#line 38285 "Photo.c"
 	}
 #line 4442 "/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"
 	callback (data1, g_value_get_object (param_values + 1), value_get_media_metadata (param_values + 2), data2);
-#line 38290 "Photo.c"
+#line 38291 "Photo.c"
 }
 
 
@@ -38300,7 +38301,7 @@ static void library_photo_source_collection_real_editable_reimported (LibraryPho
 	g_return_if_fail (IS_LIBRARY_PHOTO (photo));
 #line 4478 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail ((metadata == NULL) || IS_PHOTO_METADATA (metadata));
-#line 38299 "Photo.c"
+#line 38300 "Photo.c"
 }
 
 
@@ -38309,7 +38310,7 @@ static void library_photo_source_collection_real_baseline_reimported (LibraryPho
 	g_return_if_fail (IS_LIBRARY_PHOTO (photo));
 #line 4481 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail ((metadata == NULL) || IS_PHOTO_METADATA (metadata));
-#line 38308 "Photo.c"
+#line 38309 "Photo.c"
 }
 
 
@@ -38318,7 +38319,7 @@ static void library_photo_source_collection_real_source_reimported (LibraryPhoto
 	g_return_if_fail (IS_LIBRARY_PHOTO (photo));
 #line 4484 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail ((metadata == NULL) || IS_PHOTO_METADATA (metadata));
-#line 38317 "Photo.c"
+#line 38318 "Photo.c"
 }
 
 
@@ -38383,7 +38384,7 @@ static void library_photo_source_collection_class_init (LibraryPhotoSourceCollec
 	g_signal_new ("baseline_reimported", TYPE_LIBRARY_PHOTO_SOURCE_COLLECTION, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (LibraryPhotoSourceCollectionClass, baseline_reimported), NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_MEDIA_METADATA, G_TYPE_NONE, 2, TYPE_LIBRARY_PHOTO, TYPE_PHOTO_METADATA);
 #line 4442 "/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 38382 "Photo.c"
+#line 38383 "Photo.c"
 }
 
 
@@ -38422,7 +38423,7 @@ static void library_photo_source_collection_instance_init (LibraryPhotoSourceCol
 	_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"
 	self->priv->photo_to_raw_development_filesize = G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_MULTI_MAP, GeeMultiMap);
-#line 38421 "Photo.c"
+#line 38422 "Photo.c"
 }
 
 
@@ -38446,7 +38447,7 @@ static void library_photo_source_collection_finalize (DataCollection* obj) {
 	_g_object_unref0 (self->priv->photo_to_raw_development_filesize);
 #line 4442 "/home/jens/Source/shotwell/src/Photo.vala"
 	DATA_COLLECTION_CLASS (library_photo_source_collection_parent_class)->finalize (obj);
-#line 38445 "Photo.c"
+#line 38446 "Photo.c"
 }
 
 
@@ -38465,7 +38466,7 @@ 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"
 	library_photo_generate_thumbnails ((LibraryPhoto*) self);
-#line 38464 "Photo.c"
+#line 38465 "Photo.c"
 }
 
 
@@ -38499,7 +38500,7 @@ static LibraryPhoto* library_photo_construct (GType object_type, PhotoRow* row)
 	_tmp3_ = _tmp2_->flags;
 #line 4967 "/home/jens/Source/shotwell/src/Photo.vala"
 	if ((_tmp3_ & (LIBRARY_PHOTO_FLAG_TRASH | LIBRARY_PHOTO_FLAG_OFFLINE)) != ((guint64) 0)) {
-#line 38498 "Photo.c"
+#line 38499 "Photo.c"
 		LibraryPhotoSourceCollection* _tmp4_ = NULL;
 		PhotoRow* _tmp5_ = NULL;
 		const gchar* _tmp6_ = NULL;
@@ -38511,7 +38512,7 @@ static LibraryPhoto* library_photo_construct (GType object_type, PhotoRow* row)
 		_tmp6_ = _tmp5_->backlinks;
 #line 4968 "/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 38510 "Photo.c"
+#line 38511 "Photo.c"
 	}
 #line 4970 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp7_ = row;
@@ -38519,7 +38520,7 @@ static LibraryPhoto* library_photo_construct (GType object_type, PhotoRow* row)
 	_tmp8_ = _tmp7_->flags;
 #line 4970 "/home/jens/Source/shotwell/src/Photo.vala"
 	if ((_tmp8_ & (LIBRARY_PHOTO_FLAG_HIDDEN | LIBRARY_PHOTO_FLAG_FAVORITE)) != ((guint64) 0)) {
-#line 38518 "Photo.c"
+#line 38519 "Photo.c"
 		PhotoRow* _tmp9_ = NULL;
 		guint64 _tmp10_ = 0ULL;
 #line 4971 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -38528,18 +38529,18 @@ static LibraryPhoto* library_photo_construct (GType object_type, PhotoRow* row)
 		_tmp10_ = _tmp9_->flags;
 #line 4971 "/home/jens/Source/shotwell/src/Photo.vala"
 		library_photo_upgrade_rating_flags (self, _tmp10_);
-#line 38527 "Photo.c"
+#line 38528 "Photo.c"
 	}
 #line 4959 "/home/jens/Source/shotwell/src/Photo.vala"
 	return self;
-#line 38531 "Photo.c"
+#line 38532 "Photo.c"
 }
 
 
 static LibraryPhoto* library_photo_new (PhotoRow* row) {
 #line 4959 "/home/jens/Source/shotwell/src/Photo.vala"
 	return library_photo_construct (TYPE_LIBRARY_PHOTO, row);
-#line 38538 "Photo.c"
+#line 38539 "Photo.c"
 }
 
 
@@ -38589,7 +38590,7 @@ static LibraryPhoto* library_photo_construct_from_import_params (GType object_ty
 	_tmp8_ = _tmp7_->flags;
 #line 4981 "/home/jens/Source/shotwell/src/Photo.vala"
 	if ((_tmp8_ & (LIBRARY_PHOTO_FLAG_TRASH | LIBRARY_PHOTO_FLAG_OFFLINE)) != ((guint64) 0)) {
-#line 38588 "Photo.c"
+#line 38589 "Photo.c"
 		LibraryPhotoSourceCollection* _tmp9_ = NULL;
 		PhotoImportParams* _tmp10_ = NULL;
 		PhotoRow* _tmp11_ = NULL;
@@ -38604,7 +38605,7 @@ static LibraryPhoto* library_photo_construct_from_import_params (GType object_ty
 		_tmp12_ = _tmp11_->backlinks;
 #line 4982 "/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 38603 "Photo.c"
+#line 38604 "Photo.c"
 	}
 #line 4984 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp13_ = import_params;
@@ -38614,7 +38615,7 @@ static LibraryPhoto* library_photo_construct_from_import_params (GType object_ty
 	_tmp15_ = _tmp14_->flags;
 #line 4984 "/home/jens/Source/shotwell/src/Photo.vala"
 	if ((_tmp15_ & (LIBRARY_PHOTO_FLAG_HIDDEN | LIBRARY_PHOTO_FLAG_FAVORITE)) != ((guint64) 0)) {
-#line 38613 "Photo.c"
+#line 38614 "Photo.c"
 		PhotoImportParams* _tmp16_ = NULL;
 		PhotoRow* _tmp17_ = NULL;
 		guint64 _tmp18_ = 0ULL;
@@ -38626,18 +38627,18 @@ static LibraryPhoto* library_photo_construct_from_import_params (GType object_ty
 		_tmp18_ = _tmp17_->flags;
 #line 4985 "/home/jens/Source/shotwell/src/Photo.vala"
 		library_photo_upgrade_rating_flags (self, _tmp18_);
-#line 38625 "Photo.c"
+#line 38626 "Photo.c"
 	}
 #line 4974 "/home/jens/Source/shotwell/src/Photo.vala"
 	return self;
-#line 38629 "Photo.c"
+#line 38630 "Photo.c"
 }
 
 
 static LibraryPhoto* library_photo_new_from_import_params (PhotoImportParams* import_params) {
 #line 4974 "/home/jens/Source/shotwell/src/Photo.vala"
 	return library_photo_construct_from_import_params (TYPE_LIBRARY_PHOTO, import_params);
-#line 38636 "Photo.c"
+#line 38637 "Photo.c"
 }
 
 
@@ -38706,19 +38707,19 @@ void library_photo_init (ProgressMonitor monitor, void* monitor_target) {
 	_tmp10_ = _tmp9_;
 #line 4999 "/home/jens/Source/shotwell/src/Photo.vala"
 	count = _tmp10_;
-#line 38705 "Photo.c"
+#line 38706 "Photo.c"
 	{
 		gint ctr = 0;
 #line 5000 "/home/jens/Source/shotwell/src/Photo.vala"
 		ctr = 0;
-#line 38710 "Photo.c"
+#line 38711 "Photo.c"
 		{
 			gboolean _tmp11_ = FALSE;
 #line 5000 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp11_ = TRUE;
 #line 5000 "/home/jens/Source/shotwell/src/Photo.vala"
 			while (TRUE) {
-#line 38717 "Photo.c"
+#line 38718 "Photo.c"
 				gint _tmp13_ = 0;
 				gint _tmp14_ = 0;
 				PhotoRow* row = NULL;
@@ -38736,13 +38737,13 @@ void library_photo_init (ProgressMonitor monitor, void* monitor_target) {
 				void* _tmp30__target = NULL;
 #line 5000 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (!_tmp11_) {
-#line 38735 "Photo.c"
+#line 38736 "Photo.c"
 					gint _tmp12_ = 0;
 #line 5000 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp12_ = ctr;
 #line 5000 "/home/jens/Source/shotwell/src/Photo.vala"
 					ctr = _tmp12_ + 1;
-#line 38741 "Photo.c"
+#line 38742 "Photo.c"
 				}
 #line 5000 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp11_ = FALSE;
@@ -38754,7 +38755,7 @@ void library_photo_init (ProgressMonitor monitor, void* monitor_target) {
 				if (!(_tmp13_ < _tmp14_)) {
 #line 5000 "/home/jens/Source/shotwell/src/Photo.vala"
 					break;
-#line 38753 "Photo.c"
+#line 38754 "Photo.c"
 				}
 #line 5001 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp15_ = all;
@@ -38780,7 +38781,7 @@ void library_photo_init (ProgressMonitor monitor, void* monitor_target) {
 				_tmp22_ = flags;
 #line 5005 "/home/jens/Source/shotwell/src/Photo.vala"
 				if ((_tmp22_ & LIBRARY_PHOTO_FLAG_TRASH) != ((guint64) 0)) {
-#line 38779 "Photo.c"
+#line 38780 "Photo.c"
 					GeeArrayList* _tmp23_ = NULL;
 					LibraryPhoto* _tmp24_ = NULL;
 #line 5006 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -38789,14 +38790,14 @@ void library_photo_init (ProgressMonitor monitor, void* monitor_target) {
 					_tmp24_ = photo;
 #line 5006 "/home/jens/Source/shotwell/src/Photo.vala"
 					gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp24_);
-#line 38788 "Photo.c"
+#line 38789 "Photo.c"
 				} else {
 					guint64 _tmp25_ = 0ULL;
 #line 5007 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp25_ = flags;
 #line 5007 "/home/jens/Source/shotwell/src/Photo.vala"
 					if ((_tmp25_ & LIBRARY_PHOTO_FLAG_OFFLINE) != ((guint64) 0)) {
-#line 38795 "Photo.c"
+#line 38796 "Photo.c"
 						GeeArrayList* _tmp26_ = NULL;
 						LibraryPhoto* _tmp27_ = NULL;
 #line 5008 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -38805,7 +38806,7 @@ void library_photo_init (ProgressMonitor monitor, void* monitor_target) {
 						_tmp27_ = photo;
 #line 5008 "/home/jens/Source/shotwell/src/Photo.vala"
 						gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp27_);
-#line 38804 "Photo.c"
+#line 38805 "Photo.c"
 					} else {
 						GeeArrayList* _tmp28_ = NULL;
 						LibraryPhoto* _tmp29_ = NULL;
@@ -38815,7 +38816,7 @@ void library_photo_init (ProgressMonitor monitor, void* monitor_target) {
 						_tmp29_ = photo;
 #line 5010 "/home/jens/Source/shotwell/src/Photo.vala"
 						gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp29_);
-#line 38814 "Photo.c"
+#line 38815 "Photo.c"
 					}
 				}
 #line 5012 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -38824,7 +38825,7 @@ void library_photo_init (ProgressMonitor monitor, void* monitor_target) {
 				_tmp30__target = monitor_target;
 #line 5012 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp30_ != NULL) {
-#line 38823 "Photo.c"
+#line 38824 "Photo.c"
 					ProgressMonitor _tmp31_ = NULL;
 					void* _tmp31__target = NULL;
 					gint _tmp32_ = 0;
@@ -38839,13 +38840,13 @@ void library_photo_init (ProgressMonitor monitor, void* monitor_target) {
 					_tmp33_ = count;
 #line 5013 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp31_ ((guint64) _tmp32_, (guint64) _tmp33_, TRUE, _tmp31__target);
-#line 38838 "Photo.c"
+#line 38839 "Photo.c"
 				}
 #line 5000 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (photo);
 #line 5000 "/home/jens/Source/shotwell/src/Photo.vala"
 				_photo_row_unref0 (row);
-#line 38844 "Photo.c"
+#line 38845 "Photo.c"
 			}
 		}
 	}
@@ -38879,14 +38880,14 @@ void library_photo_init (ProgressMonitor monitor, void* monitor_target) {
 	_g_object_unref0 (all_photos);
 #line 4988 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (all);
-#line 38878 "Photo.c"
+#line 38879 "Photo.c"
 }
 
 
 void library_photo_terminate (void) {
 #line 5022 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_terminate_photo ();
-#line 38885 "Photo.c"
+#line 38886 "Photo.c"
 }
 
 
@@ -38935,15 +38936,15 @@ ImportResult library_photo_import_create (PhotoImportParams* params, LibraryPhot
 		if (photo) {
 #line 5035 "/home/jens/Source/shotwell/src/Photo.vala"
 			*photo = _vala_photo;
-#line 38934 "Photo.c"
+#line 38935 "Photo.c"
 		} else {
 #line 5035 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (_vala_photo);
-#line 38938 "Photo.c"
+#line 38939 "Photo.c"
 		}
 #line 5035 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 38942 "Photo.c"
+#line 38943 "Photo.c"
 	}
 #line 5039 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp7_ = params;
@@ -38959,15 +38960,15 @@ ImportResult library_photo_import_create (PhotoImportParams* params, LibraryPhot
 	if (photo) {
 #line 5041 "/home/jens/Source/shotwell/src/Photo.vala"
 		*photo = _vala_photo;
-#line 38958 "Photo.c"
+#line 38959 "Photo.c"
 	} else {
 #line 5041 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_vala_photo);
-#line 38962 "Photo.c"
+#line 38963 "Photo.c"
 	}
 #line 5041 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 38966 "Photo.c"
+#line 38967 "Photo.c"
 }
 
 
@@ -38975,7 +38976,7 @@ void library_photo_import_failed (LibraryPhoto* photo) {
 	GError * _inner_error_ = NULL;
 #line 5044 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO (photo));
-#line 38974 "Photo.c"
+#line 38975 "Photo.c"
 	{
 		PhotoTable* _tmp0_ = NULL;
 		PhotoTable* _tmp1_ = NULL;
@@ -38997,8 +38998,8 @@ void library_photo_import_failed (LibraryPhoto* photo) {
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 5046 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
-#line 38996 "Photo.c"
-				goto __catch393_database_error;
+#line 38997 "Photo.c"
+				goto __catch406_database_error;
 			}
 #line 5046 "/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);
@@ -39006,11 +39007,11 @@ void library_photo_import_failed (LibraryPhoto* photo) {
 			g_clear_error (&_inner_error_);
 #line 5046 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 39005 "Photo.c"
+#line 39006 "Photo.c"
 		}
 	}
-	goto __finally393;
-	__catch393_database_error:
+	goto __finally406;
+	__catch406_database_error:
 	{
 		GError* err = NULL;
 		GError* _tmp4_ = NULL;
@@ -39024,9 +39025,9 @@ void library_photo_import_failed (LibraryPhoto* photo) {
 		app_window_database_error (_tmp4_);
 #line 5045 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_error_free0 (err);
-#line 39023 "Photo.c"
+#line 39024 "Photo.c"
 	}
-	__finally393:
+	__finally406:
 #line 5045 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 5045 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -39035,7 +39036,7 @@ void library_photo_import_failed (LibraryPhoto* photo) {
 		g_clear_error (&_inner_error_);
 #line 5045 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 39034 "Photo.c"
+#line 39035 "Photo.c"
 	}
 }
 
@@ -39059,7 +39060,7 @@ static void library_photo_real_notify_master_reimported (Photo* base, PhotoMetad
 	_tmp2_ = metadata;
 #line 5055 "/home/jens/Source/shotwell/src/Photo.vala"
 	library_photo_source_collection_notify_master_reimported (_tmp1_, self, _tmp2_);
-#line 39058 "Photo.c"
+#line 39059 "Photo.c"
 }
 
 
@@ -39082,7 +39083,7 @@ static void library_photo_real_notify_editable_reimported (Photo* base, PhotoMet
 	_tmp2_ = metadata;
 #line 5061 "/home/jens/Source/shotwell/src/Photo.vala"
 	library_photo_source_collection_notify_editable_reimported (_tmp1_, self, _tmp2_);
-#line 39081 "Photo.c"
+#line 39082 "Photo.c"
 }
 
 
@@ -39105,7 +39106,7 @@ static void library_photo_real_notify_source_reimported (Photo* base, PhotoMetad
 	_tmp2_ = metadata;
 #line 5067 "/home/jens/Source/shotwell/src/Photo.vala"
 	library_photo_source_collection_notify_source_reimported (_tmp1_, self, _tmp2_);
-#line 39104 "Photo.c"
+#line 39105 "Photo.c"
 }
 
 
@@ -39128,7 +39129,7 @@ static void library_photo_real_notify_baseline_reimported (Photo* base, PhotoMet
 	_tmp2_ = metadata;
 #line 5073 "/home/jens/Source/shotwell/src/Photo.vala"
 	library_photo_source_collection_notify_baseline_reimported (_tmp1_, self, _tmp2_);
-#line 39127 "Photo.c"
+#line 39128 "Photo.c"
 }
 
 
@@ -39136,18 +39137,18 @@ static void library_photo_generate_thumbnails (LibraryPhoto* self) {
 	GError * _inner_error_ = NULL;
 #line 5076 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO (self));
-#line 39135 "Photo.c"
+#line 39136 "Photo.c"
 	{
 #line 5078 "/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"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 39141 "Photo.c"
-			goto __catch394_g_error;
+#line 39142 "Photo.c"
+			goto __catch407_g_error;
 		}
 	}
-	goto __finally394;
-	__catch394_g_error:
+	goto __finally407;
+	__catch407_g_error:
 	{
 		GError* err = NULL;
 		gchar* _tmp0_ = NULL;
@@ -39172,9 +39173,9 @@ static void library_photo_generate_thumbnails (LibraryPhoto* self) {
 		_g_free0 (_tmp1_);
 #line 5077 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_error_free0 (err);
-#line 39171 "Photo.c"
+#line 39172 "Photo.c"
 	}
-	__finally394:
+	__finally407:
 #line 5077 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 5077 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -39183,11 +39184,11 @@ static void library_photo_generate_thumbnails (LibraryPhoto* self) {
 		g_clear_error (&_inner_error_);
 #line 5077 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 39182 "Photo.c"
+#line 39183 "Photo.c"
 	}
 #line 5084 "/home/jens/Source/shotwell/src/Photo.vala"
 	thumbnail_source_notify_thumbnail_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_THUMBNAIL_SOURCE, ThumbnailSource));
-#line 39186 "Photo.c"
+#line 39187 "Photo.c"
 }
 
 
@@ -39205,7 +39206,7 @@ GeeCollection* library_photo_get_import_keywords (LibraryPhoto* self) {
 	result = _tmp1_;
 #line 5089 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 39204 "Photo.c"
+#line 39205 "Photo.c"
 }
 
 
@@ -39216,7 +39217,7 @@ void library_photo_clear_import_keywords (LibraryPhoto* self) {
 	_g_object_unref0 (self->priv->import_keywords);
 #line 5093 "/home/jens/Source/shotwell/src/Photo.vala"
 	self->priv->import_keywords = NULL;
-#line 39215 "Photo.c"
+#line 39216 "Photo.c"
 }
 
 
@@ -39233,7 +39234,7 @@ static void library_photo_real_notify_altered (DataObject* base, Alteration* alt
 	_tmp1_ = self->priv->block_thumbnail_generation;
 #line 5098 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (!_tmp1_) {
-#line 39232 "Photo.c"
+#line 39233 "Photo.c"
 		Alteration* _tmp2_ = NULL;
 		gboolean _tmp3_ = FALSE;
 #line 5098 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -39242,27 +39243,27 @@ static void library_photo_real_notify_altered (DataObject* base, Alteration* alt
 		_tmp3_ = alteration_has_subject (_tmp2_, "image");
 #line 5098 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = _tmp3_;
-#line 39241 "Photo.c"
+#line 39242 "Photo.c"
 	} else {
 #line 5098 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = FALSE;
-#line 39245 "Photo.c"
+#line 39246 "Photo.c"
 	}
 #line 5098 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp0_) {
-#line 39249 "Photo.c"
+#line 39250 "Photo.c"
 		OneShotScheduler* _tmp4_ = NULL;
 #line 5099 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp4_ = self->priv->thumbnail_scheduler;
 #line 5099 "/home/jens/Source/shotwell/src/Photo.vala"
 		one_shot_scheduler_at_priority_idle (_tmp4_, G_PRIORITY_LOW);
-#line 39255 "Photo.c"
+#line 39256 "Photo.c"
 	}
 #line 5101 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp5_ = alteration;
 #line 5101 "/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 39261 "Photo.c"
+#line 39262 "Photo.c"
 }
 
 
@@ -39287,7 +39288,7 @@ static GdkPixbuf* library_photo_real_get_preview_pixbuf (MediaSource* base, Scal
 		g_propagate_error (error, _inner_error_);
 #line 5105 "/home/jens/Source/shotwell/src/Photo.vala"
 		return NULL;
-#line 39286 "Photo.c"
+#line 39287 "Photo.c"
 	}
 #line 5107 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = scaling_perform_on_pixbuf (scaling, pixbuf, GDK_INTERP_BILINEAR, TRUE);
@@ -39297,7 +39298,7 @@ static GdkPixbuf* library_photo_real_get_preview_pixbuf (MediaSource* base, Scal
 	_g_object_unref0 (pixbuf);
 #line 5107 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 39296 "Photo.c"
+#line 39297 "Photo.c"
 }
 
 
@@ -39315,7 +39316,7 @@ static void library_photo_real_rotate (Photo* base, Rotation rotation) {
 	PHOTO_CLASS (library_photo_parent_class)->rotate (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), _tmp0_);
 #line 5114 "/home/jens/Source/shotwell/src/Photo.vala"
 	self->priv->block_thumbnail_generation = FALSE;
-#line 39314 "Photo.c"
+#line 39315 "Photo.c"
 	{
 		Rotation _tmp1_ = 0;
 #line 5122 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -39324,12 +39325,12 @@ static void library_photo_real_rotate (Photo* base, Rotation rotation) {
 		thumbnail_cache_rotate (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_THUMBNAIL_SOURCE, ThumbnailSource), _tmp1_, &_inner_error_);
 #line 5122 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 39323 "Photo.c"
-			goto __catch395_g_error;
+#line 39324 "Photo.c"
+			goto __catch408_g_error;
 		}
 	}
-	goto __finally395;
-	__catch395_g_error:
+	goto __finally408;
+	__catch408_g_error:
 	{
 		GError* err = NULL;
 		gchar* _tmp2_ = NULL;
@@ -39354,9 +39355,9 @@ static void library_photo_real_rotate (Photo* base, Rotation rotation) {
 		_g_free0 (_tmp3_);
 #line 5121 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_error_free0 (err);
-#line 39353 "Photo.c"
+#line 39354 "Photo.c"
 	}
-	__finally395:
+	__finally408:
 #line 5121 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 5121 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -39365,11 +39366,11 @@ static void library_photo_real_rotate (Photo* base, Rotation rotation) {
 		g_clear_error (&_inner_error_);
 #line 5121 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 39364 "Photo.c"
+#line 39365 "Photo.c"
 	}
 #line 5128 "/home/jens/Source/shotwell/src/Photo.vala"
 	thumbnail_source_notify_thumbnail_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_THUMBNAIL_SOURCE, ThumbnailSource));
-#line 39368 "Photo.c"
+#line 39369 "Photo.c"
 }
 
 
@@ -39395,7 +39396,7 @@ static GdkPixbuf* library_photo_real_get_thumbnail (ThumbnailSource* base, gint
 		g_propagate_error (error, _inner_error_);
 #line 5133 "/home/jens/Source/shotwell/src/Photo.vala"
 		return NULL;
-#line 39394 "Photo.c"
+#line 39395 "Photo.c"
 	}
 #line 5133 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = _tmp0_;
@@ -39407,14 +39408,14 @@ static GdkPixbuf* library_photo_real_get_thumbnail (ThumbnailSource* base, gint
 	_g_object_unref0 (_tmp0_);
 #line 5133 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 39406 "Photo.c"
+#line 39407 "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"
 	library_photo_on_duplicate_progress ((LibraryPhoto*) self, current_num_bytes, total_num_bytes);
-#line 39413 "Photo.c"
+#line 39414 "Photo.c"
 }
 
 
@@ -39441,7 +39442,7 @@ static void library_photo_duplicate_backing_photo (LibraryPhoto* self, BackingPh
 	if (_tmp1_ == NULL) {
 #line 5140 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = TRUE;
-#line 39440 "Photo.c"
+#line 39441 "Photo.c"
 	} else {
 		BackingPhotoRow* _tmp2_ = NULL;
 		const gchar* _tmp3_ = NULL;
@@ -39451,7 +39452,7 @@ static void library_photo_duplicate_backing_photo (LibraryPhoto* self, BackingPh
 		_tmp3_ = _tmp2_->filepath;
 #line 5140 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = _tmp3_ == NULL;
-#line 39450 "Photo.c"
+#line 39451 "Photo.c"
 	}
 #line 5140 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp0_) {
@@ -39459,7 +39460,7 @@ static void library_photo_duplicate_backing_photo (LibraryPhoto* self, BackingPh
 		*result = backing_id;
 #line 5141 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 39458 "Photo.c"
+#line 39459 "Photo.c"
 	}
 #line 5143 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = backing;
@@ -39475,7 +39476,7 @@ static void library_photo_duplicate_backing_photo (LibraryPhoto* self, BackingPh
 	_tmp8_ = g_file_query_exists (_tmp7_, NULL);
 #line 5144 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp8_) {
-#line 39474 "Photo.c"
+#line 39475 "Photo.c"
 		GFile* dupe_file = NULL;
 		GFile* _tmp9_ = NULL;
 		GFile* _tmp10_ = NULL;
@@ -39499,7 +39500,7 @@ static void library_photo_duplicate_backing_photo (LibraryPhoto* self, BackingPh
 			_g_object_unref0 (file);
 #line 5145 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 39498 "Photo.c"
+#line 39499 "Photo.c"
 		}
 #line 5148 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp11_ = dupe_file;
@@ -39523,13 +39524,13 @@ static void library_photo_duplicate_backing_photo (LibraryPhoto* self, BackingPh
 			_g_object_unref0 (file);
 #line 5148 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 39522 "Photo.c"
+#line 39523 "Photo.c"
 		}
 #line 5150 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp14_ = state;
 #line 5150 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp14_ != NULL) {
-#line 39528 "Photo.c"
+#line 39529 "Photo.c"
 			BackingPhotoTable* _tmp15_ = NULL;
 			BackingPhotoTable* _tmp16_ = NULL;
 			BackingPhotoRow* _tmp17_ = NULL;
@@ -39559,7 +39560,7 @@ static void library_photo_duplicate_backing_photo (LibraryPhoto* self, BackingPh
 				_g_object_unref0 (file);
 #line 5151 "/home/jens/Source/shotwell/src/Photo.vala"
 				return;
-#line 39558 "Photo.c"
+#line 39559 "Photo.c"
 			}
 #line 5152 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp18_ = state;
@@ -39567,7 +39568,7 @@ static void library_photo_duplicate_backing_photo (LibraryPhoto* self, BackingPh
 			_tmp19_ = _tmp18_->id;
 #line 5152 "/home/jens/Source/shotwell/src/Photo.vala"
 			backing_id = _tmp19_;
-#line 39566 "Photo.c"
+#line 39567 "Photo.c"
 		}
 #line 5144 "/home/jens/Source/shotwell/src/Photo.vala"
 		_backing_photo_row_unref0 (state);
@@ -39575,7 +39576,7 @@ static void library_photo_duplicate_backing_photo (LibraryPhoto* self, BackingPh
 		_detected_photo_information_unref0 (detected);
 #line 5144 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (dupe_file);
-#line 39574 "Photo.c"
+#line 39575 "Photo.c"
 	}
 #line 5156 "/home/jens/Source/shotwell/src/Photo.vala"
 	*result = backing_id;
@@ -39583,7 +39584,7 @@ static void library_photo_duplicate_backing_photo (LibraryPhoto* self, BackingPh
 	_g_object_unref0 (file);
 #line 5156 "/home/jens/Source/shotwell/src/Photo.vala"
 	return;
-#line 39582 "Photo.c"
+#line 39583 "Photo.c"
 }
 
 
@@ -39668,7 +39669,7 @@ LibraryPhoto* library_photo_duplicate (LibraryPhoto* self, GError** error) {
 		g_propagate_error (error, _inner_error_);
 #line 5161 "/home/jens/Source/shotwell/src/Photo.vala"
 		return NULL;
-#line 39667 "Photo.c"
+#line 39668 "Photo.c"
 	}
 #line 5164 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = photo_get_editable_photo_row (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo));
@@ -39690,7 +39691,7 @@ LibraryPhoto* library_photo_duplicate (LibraryPhoto* self, GError** error) {
 		_g_object_unref0 (dupe_file);
 #line 5164 "/home/jens/Source/shotwell/src/Photo.vala"
 		return NULL;
-#line 39689 "Photo.c"
+#line 39690 "Photo.c"
 	}
 #line 5165 "/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);
@@ -39712,7 +39713,7 @@ LibraryPhoto* library_photo_duplicate (LibraryPhoto* self, GError** error) {
 		_g_object_unref0 (dupe_file);
 #line 5165 "/home/jens/Source/shotwell/src/Photo.vala"
 		return NULL;
-#line 39711 "Photo.c"
+#line 39712 "Photo.c"
 	}
 #line 5167 "/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);
@@ -39734,7 +39735,7 @@ LibraryPhoto* library_photo_duplicate (LibraryPhoto* self, GError** error) {
 		_g_object_unref0 (dupe_file);
 #line 5167 "/home/jens/Source/shotwell/src/Photo.vala"
 		return NULL;
-#line 39733 "Photo.c"
+#line 39734 "Photo.c"
 	}
 #line 5169 "/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);
@@ -39756,7 +39757,7 @@ LibraryPhoto* library_photo_duplicate (LibraryPhoto* self, GError** error) {
 		_g_object_unref0 (dupe_file);
 #line 5169 "/home/jens/Source/shotwell/src/Photo.vala"
 		return NULL;
-#line 39755 "Photo.c"
+#line 39756 "Photo.c"
 	}
 #line 5173 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp20_ = photo_table_get_instance ();
@@ -39830,7 +39831,7 @@ LibraryPhoto* library_photo_duplicate (LibraryPhoto* self, GError** error) {
 	_g_object_unref0 (_tmp44_);
 #line 5187 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp45_) {
-#line 39829 "Photo.c"
+#line 39830 "Photo.c"
 		LibraryPhoto* _tmp46_ = NULL;
 		Event* _tmp47_ = NULL;
 		Event* _tmp48_ = NULL;
@@ -39847,7 +39848,7 @@ LibraryPhoto* library_photo_duplicate (LibraryPhoto* self, GError** error) {
 		event_attach (_tmp48_, G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, TYPE_MEDIA_SOURCE, MediaSource));
 #line 5188 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_tmp48_);
-#line 39846 "Photo.c"
+#line 39847 "Photo.c"
 	}
 #line 5191 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp50_ = tag_global;
@@ -39859,7 +39860,7 @@ LibraryPhoto* library_photo_duplicate (LibraryPhoto* self, GError** error) {
 	_tmp52_ = tags;
 #line 5192 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp52_ != NULL) {
-#line 39858 "Photo.c"
+#line 39859 "Photo.c"
 		{
 			GeeIterator* _tag_it = NULL;
 			GeeCollection* _tmp53_ = NULL;
@@ -39872,7 +39873,7 @@ LibraryPhoto* library_photo_duplicate (LibraryPhoto* self, GError** error) {
 			_tag_it = _tmp54_;
 #line 5193 "/home/jens/Source/shotwell/src/Photo.vala"
 			while (TRUE) {
-#line 39871 "Photo.c"
+#line 39872 "Photo.c"
 				GeeIterator* _tmp55_ = NULL;
 				gboolean _tmp56_ = FALSE;
 				Tag* tag = NULL;
@@ -39888,7 +39889,7 @@ LibraryPhoto* library_photo_duplicate (LibraryPhoto* self, GError** error) {
 				if (!_tmp56_) {
 #line 5193 "/home/jens/Source/shotwell/src/Photo.vala"
 					break;
-#line 39887 "Photo.c"
+#line 39888 "Photo.c"
 				}
 #line 5193 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp57_ = _tag_it;
@@ -39904,11 +39905,11 @@ LibraryPhoto* library_photo_duplicate (LibraryPhoto* self, GError** error) {
 				tag_attach (_tmp59_, G_TYPE_CHECK_INSTANCE_CAST (_tmp60_, TYPE_MEDIA_SOURCE, MediaSource));
 #line 5193 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (tag);
-#line 39903 "Photo.c"
+#line 39904 "Photo.c"
 			}
 #line 5193 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (_tag_it);
-#line 39907 "Photo.c"
+#line 39908 "Photo.c"
 		}
 	}
 #line 5198 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -39921,7 +39922,7 @@ LibraryPhoto* library_photo_duplicate (LibraryPhoto* self, GError** error) {
 	_g_object_unref0 (dupe_file);
 #line 5198 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 39920 "Photo.c"
+#line 39921 "Photo.c"
 }
 
 
@@ -39930,7 +39931,7 @@ static void library_photo_on_duplicate_progress (LibraryPhoto* self, gint64 curr
 	g_return_if_fail (IS_LIBRARY_PHOTO (self));
 #line 5202 "/home/jens/Source/shotwell/src/Photo.vala"
 	spin_event_loop ();
-#line 39929 "Photo.c"
+#line 39930 "Photo.c"
 }
 
 
@@ -39947,7 +39948,7 @@ static void library_photo_upgrade_rating_flags (LibraryPhoto* self, guint64 flag
 		media_source_set_rating (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), RATING_REJECTED);
 #line 5208 "/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 39946 "Photo.c"
+#line 39947 "Photo.c"
 	}
 #line 5211 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = flags;
@@ -39957,7 +39958,7 @@ static void library_photo_upgrade_rating_flags (LibraryPhoto* self, guint64 flag
 		media_source_set_rating (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), RATING_FIVE);
 #line 5213 "/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 39956 "Photo.c"
+#line 39957 "Photo.c"
 	}
 }
 
@@ -39974,7 +39975,7 @@ static gboolean library_photo_real_is_trashed (MediaSource* base) {
 	result = _tmp0_;
 #line 5219 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 39973 "Photo.c"
+#line 39974 "Photo.c"
 }
 
 
@@ -39984,7 +39985,7 @@ static void library_photo_real_trash (MediaSource* base) {
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO, LibraryPhoto);
 #line 5223 "/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 39983 "Photo.c"
+#line 39984 "Photo.c"
 }
 
 
@@ -39994,7 +39995,7 @@ static void library_photo_real_untrash (MediaSource* base) {
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO, LibraryPhoto);
 #line 5227 "/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 39993 "Photo.c"
+#line 39994 "Photo.c"
 }
 
 
@@ -40010,7 +40011,7 @@ static gboolean library_photo_real_is_offline (Monitorable* base) {
 	result = _tmp0_;
 #line 5231 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 40009 "Photo.c"
+#line 40010 "Photo.c"
 }
 
 
@@ -40020,7 +40021,7 @@ static void library_photo_real_mark_offline (Monitorable* base) {
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO, LibraryPhoto);
 #line 5235 "/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 40019 "Photo.c"
+#line 40020 "Photo.c"
 }
 
 
@@ -40030,7 +40031,7 @@ static void library_photo_real_mark_online (Monitorable* base) {
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO, LibraryPhoto);
 #line 5239 "/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 40029 "Photo.c"
+#line 40030 "Photo.c"
 }
 
 
@@ -40046,7 +40047,7 @@ static gboolean library_photo_real_is_flagged (Flaggable* base) {
 	result = _tmp0_;
 #line 5243 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 40045 "Photo.c"
+#line 40046 "Photo.c"
 }
 
 
@@ -40064,7 +40065,7 @@ static void library_photo_real_mark_flagged (Flaggable* base) {
 	photo_add_flags (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), LIBRARY_PHOTO_FLAG_FLAGGED, _tmp1_);
 #line 5247 "/home/jens/Source/shotwell/src/Photo.vala"
 	_alteration_unref0 (_tmp1_);
-#line 40063 "Photo.c"
+#line 40064 "Photo.c"
 }
 
 
@@ -40082,7 +40083,7 @@ static void library_photo_real_mark_unflagged (Flaggable* base) {
 	photo_remove_flags (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), LIBRARY_PHOTO_FLAG_FLAGGED, _tmp1_);
 #line 5251 "/home/jens/Source/shotwell/src/Photo.vala"
 	_alteration_unref0 (_tmp1_);
-#line 40081 "Photo.c"
+#line 40082 "Photo.c"
 }
 
 
@@ -40105,7 +40106,7 @@ static gboolean library_photo_real_internal_delete_backing (DataSource* base, GE
 		g_propagate_error (error, _inner_error_);
 #line 5257 "/home/jens/Source/shotwell/src/Photo.vala"
 		return FALSE;
-#line 40104 "Photo.c"
+#line 40105 "Photo.c"
 	}
 #line 5257 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (!_tmp0_) {
@@ -40113,7 +40114,7 @@ static gboolean library_photo_real_internal_delete_backing (DataSource* base, GE
 		result = FALSE;
 #line 5258 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 40112 "Photo.c"
+#line 40113 "Photo.c"
 	}
 #line 5260 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = media_source_delete_original_file (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource));
@@ -40121,7 +40122,7 @@ static gboolean library_photo_real_internal_delete_backing (DataSource* base, GE
 	result = _tmp2_;
 #line 5260 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 40120 "Photo.c"
+#line 40121 "Photo.c"
 }
 
 
@@ -40138,7 +40139,7 @@ static void library_photo_real_destroy (DataSource* base) {
 	photo_id = _tmp0_;
 #line 5267 "/home/jens/Source/shotwell/src/Photo.vala"
 	thumbnail_cache_remove (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_THUMBNAIL_SOURCE, ThumbnailSource));
-#line 40137 "Photo.c"
+#line 40138 "Photo.c"
 	{
 		PhotoTable* _tmp1_ = NULL;
 		PhotoTable* _tmp2_ = NULL;
@@ -40157,8 +40158,8 @@ static void library_photo_real_destroy (DataSource* base) {
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 5273 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
-#line 40156 "Photo.c"
-				goto __catch396_database_error;
+#line 40157 "Photo.c"
+				goto __catch409_database_error;
 			}
 #line 5273 "/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);
@@ -40166,11 +40167,11 @@ static void library_photo_real_destroy (DataSource* base) {
 			g_clear_error (&_inner_error_);
 #line 5273 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 40165 "Photo.c"
+#line 40166 "Photo.c"
 		}
 	}
-	goto __finally396;
-	__catch396_database_error:
+	goto __finally409;
+	__catch409_database_error:
 	{
 		GError* err = NULL;
 		GError* _tmp4_ = NULL;
@@ -40184,9 +40185,9 @@ static void library_photo_real_destroy (DataSource* base) {
 		app_window_database_error (_tmp4_);
 #line 5272 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_error_free0 (err);
-#line 40183 "Photo.c"
+#line 40184 "Photo.c"
 	}
-	__finally396:
+	__finally409:
 #line 5272 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 5272 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -40195,11 +40196,11 @@ static void library_photo_real_destroy (DataSource* base) {
 		g_clear_error (&_inner_error_);
 #line 5272 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 40194 "Photo.c"
+#line 40195 "Photo.c"
 	}
 #line 5278 "/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 40198 "Photo.c"
+#line 40199 "Photo.c"
 }
 
 
@@ -40229,7 +40230,7 @@ gboolean library_photo_has_nontrash_duplicate (GFile* file, const gchar* thumbna
 	result = _tmp5_;
 #line 5283 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 40228 "Photo.c"
+#line 40229 "Photo.c"
 }
 
 
@@ -40275,7 +40276,7 @@ void library_photo_get_nontrash_duplicate (GFile* file, const gchar* thumbnail_m
 	if (_tmp7_ == NULL) {
 #line 5290 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp6_ = TRUE;
-#line 40274 "Photo.c"
+#line 40275 "Photo.c"
 	} else {
 		PhotoID* _tmp8_ = NULL;
 		gint _tmp8__length1 = 0;
@@ -40285,11 +40286,11 @@ void library_photo_get_nontrash_duplicate (GFile* file, const gchar* thumbnail_m
 		_tmp8__length1 = ids_length1;
 #line 5290 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp6_ = _tmp8__length1 == 0;
-#line 40284 "Photo.c"
+#line 40285 "Photo.c"
 	}
 #line 5290 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp6_) {
-#line 40288 "Photo.c"
+#line 40289 "Photo.c"
 		PhotoID _tmp9_ = {0};
 #line 5291 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_id_init (&_tmp9_, PHOTO_ID_INVALID);
@@ -40299,13 +40300,13 @@ void library_photo_get_nontrash_duplicate (GFile* file, const gchar* thumbnail_m
 		ids = (g_free (ids), NULL);
 #line 5291 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 40298 "Photo.c"
+#line 40299 "Photo.c"
 	}
 #line 5293 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp10_ = ids;
 #line 5293 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp10__length1 = ids_length1;
-#line 40304 "Photo.c"
+#line 40305 "Photo.c"
 	{
 		PhotoID* id_collection = NULL;
 		gint id_collection_length1 = 0;
@@ -40317,11 +40318,11 @@ void library_photo_get_nontrash_duplicate (GFile* file, const gchar* thumbnail_m
 		id_collection_length1 = _tmp10__length1;
 #line 5293 "/home/jens/Source/shotwell/src/Photo.vala"
 		for (id_it = 0; id_it < _tmp10__length1; id_it = id_it + 1) {
-#line 40316 "Photo.c"
+#line 40317 "Photo.c"
 			PhotoID id = {0};
 #line 5293 "/home/jens/Source/shotwell/src/Photo.vala"
 			id = id_collection[id_it];
-#line 40320 "Photo.c"
+#line 40321 "Photo.c"
 			{
 				LibraryPhoto* photo = NULL;
 				LibraryPhotoSourceCollection* _tmp11_ = NULL;
@@ -40341,7 +40342,7 @@ void library_photo_get_nontrash_duplicate (GFile* file, const gchar* thumbnail_m
 				_tmp15_ = photo;
 #line 5295 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp15_ != NULL) {
-#line 40340 "Photo.c"
+#line 40341 "Photo.c"
 					LibraryPhoto* _tmp16_ = NULL;
 					gboolean _tmp17_ = FALSE;
 #line 5295 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -40350,11 +40351,11 @@ void library_photo_get_nontrash_duplicate (GFile* file, const gchar* thumbnail_m
 					_tmp17_ = media_source_is_trashed (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_MEDIA_SOURCE, MediaSource));
 #line 5295 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp14_ = !_tmp17_;
-#line 40349 "Photo.c"
+#line 40350 "Photo.c"
 				} else {
 #line 5295 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp14_ = FALSE;
-#line 40353 "Photo.c"
+#line 40354 "Photo.c"
 				}
 #line 5295 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp14_) {
@@ -40366,11 +40367,11 @@ void library_photo_get_nontrash_duplicate (GFile* file, const gchar* thumbnail_m
 					ids = (g_free (ids), NULL);
 #line 5296 "/home/jens/Source/shotwell/src/Photo.vala"
 					return;
-#line 40365 "Photo.c"
+#line 40366 "Photo.c"
 				}
 #line 5293 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (photo);
-#line 40369 "Photo.c"
+#line 40370 "Photo.c"
 			}
 		}
 	}
@@ -40382,7 +40383,7 @@ void library_photo_get_nontrash_duplicate (GFile* file, const gchar* thumbnail_m
 	ids = (g_free (ids), NULL);
 #line 5299 "/home/jens/Source/shotwell/src/Photo.vala"
 	return;
-#line 40381 "Photo.c"
+#line 40382 "Photo.c"
 }
 
 
@@ -40427,7 +40428,7 @@ static gboolean library_photo_real_has_user_generated_metadata (Photo* base) {
 	_tmp3_ = metadata;
 #line 5306 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp3_ == NULL) {
-#line 40426 "Photo.c"
+#line 40427 "Photo.c"
 		gboolean _tmp4_ = FALSE;
 		gboolean _tmp5_ = FALSE;
 		GeeList* _tmp6_ = NULL;
@@ -40437,7 +40438,7 @@ static gboolean library_photo_real_has_user_generated_metadata (Photo* base) {
 		if (_tmp6_ != NULL) {
 #line 5307 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp5_ = TRUE;
-#line 40436 "Photo.c"
+#line 40437 "Photo.c"
 		} else {
 			GeeList* _tmp7_ = NULL;
 			gint _tmp8_ = 0;
@@ -40450,20 +40451,20 @@ static gboolean library_photo_real_has_user_generated_metadata (Photo* base) {
 			_tmp9_ = _tmp8_;
 #line 5307 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp5_ = _tmp9_ > 0;
-#line 40449 "Photo.c"
+#line 40450 "Photo.c"
 		}
 #line 5307 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp5_) {
 #line 5307 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp4_ = TRUE;
-#line 40455 "Photo.c"
+#line 40456 "Photo.c"
 		} else {
 			Rating _tmp10_ = 0;
 #line 5307 "/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"
 			_tmp4_ = _tmp10_ != RATING_UNRATED;
-#line 40462 "Photo.c"
+#line 40463 "Photo.c"
 		}
 #line 5307 "/home/jens/Source/shotwell/src/Photo.vala"
 		result = _tmp4_;
@@ -40473,7 +40474,7 @@ static gboolean library_photo_real_has_user_generated_metadata (Photo* base) {
 		_g_object_unref0 (tags);
 #line 5307 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 40472 "Photo.c"
+#line 40473 "Photo.c"
 	}
 #line 5309 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp11_ = media_source_get_rating (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource));
@@ -40491,7 +40492,7 @@ static gboolean library_photo_real_has_user_generated_metadata (Photo* base) {
 		_g_object_unref0 (tags);
 #line 5310 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 40490 "Photo.c"
+#line 40491 "Photo.c"
 	}
 #line 5312 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp14_ = metadata;
@@ -40503,7 +40504,7 @@ static gboolean library_photo_real_has_user_generated_metadata (Photo* base) {
 	_tmp17_ = tags;
 #line 5313 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp17_ != NULL) {
-#line 40502 "Photo.c"
+#line 40503 "Photo.c"
 		GeeList* _tmp18_ = NULL;
 		gint _tmp19_ = 0;
 		gint _tmp20_ = 0;
@@ -40515,11 +40516,11 @@ static gboolean library_photo_real_has_user_generated_metadata (Photo* base) {
 		_tmp20_ = _tmp19_;
 #line 5313 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp16_ = _tmp20_;
-#line 40514 "Photo.c"
+#line 40515 "Photo.c"
 	} else {
 #line 5313 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp16_ = 0;
-#line 40518 "Photo.c"
+#line 40519 "Photo.c"
 	}
 #line 5313 "/home/jens/Source/shotwell/src/Photo.vala"
 	tags_count = _tmp16_;
@@ -40527,7 +40528,7 @@ static gboolean library_photo_real_has_user_generated_metadata (Photo* base) {
 	_tmp22_ = keywords;
 #line 5314 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp22_ != NULL) {
-#line 40526 "Photo.c"
+#line 40527 "Photo.c"
 		GeeSet* _tmp23_ = NULL;
 		gint _tmp24_ = 0;
 		gint _tmp25_ = 0;
@@ -40539,11 +40540,11 @@ static gboolean library_photo_real_has_user_generated_metadata (Photo* base) {
 		_tmp25_ = _tmp24_;
 #line 5314 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp21_ = _tmp25_;
-#line 40538 "Photo.c"
+#line 40539 "Photo.c"
 	} else {
 #line 5314 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp21_ = 0;
-#line 40542 "Photo.c"
+#line 40543 "Photo.c"
 	}
 #line 5314 "/home/jens/Source/shotwell/src/Photo.vala"
 	keywords_count = _tmp21_;
@@ -40563,27 +40564,27 @@ static gboolean library_photo_real_has_user_generated_metadata (Photo* base) {
 		_g_object_unref0 (tags);
 #line 5317 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 40562 "Photo.c"
+#line 40563 "Photo.c"
 	}
 #line 5319 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp29_ = tags;
 #line 5319 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp29_ != NULL) {
-#line 40568 "Photo.c"
+#line 40569 "Photo.c"
 		GeeSet* _tmp30_ = NULL;
 #line 5319 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp30_ = keywords;
 #line 5319 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp28_ = _tmp30_ != NULL;
-#line 40574 "Photo.c"
+#line 40575 "Photo.c"
 	} else {
 #line 5319 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp28_ = FALSE;
-#line 40578 "Photo.c"
+#line 40579 "Photo.c"
 	}
 #line 5319 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp28_) {
-#line 40582 "Photo.c"
+#line 40583 "Photo.c"
 		{
 			GeeList* _tag_list = NULL;
 			GeeList* _tmp31_ = NULL;
@@ -40611,7 +40612,7 @@ static gboolean library_photo_real_has_user_generated_metadata (Photo* base) {
 			_tag_index = -1;
 #line 5320 "/home/jens/Source/shotwell/src/Photo.vala"
 			while (TRUE) {
-#line 40610 "Photo.c"
+#line 40611 "Photo.c"
 				gint _tmp36_ = 0;
 				gint _tmp37_ = 0;
 				gint _tmp38_ = 0;
@@ -40639,7 +40640,7 @@ static gboolean library_photo_real_has_user_generated_metadata (Photo* base) {
 				if (!(_tmp37_ < _tmp38_)) {
 #line 5320 "/home/jens/Source/shotwell/src/Photo.vala"
 					break;
-#line 40638 "Photo.c"
+#line 40639 "Photo.c"
 				}
 #line 5320 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp39_ = _tag_list;
@@ -40685,15 +40686,15 @@ static gboolean library_photo_real_has_user_generated_metadata (Photo* base) {
 					_g_object_unref0 (tags);
 #line 5322 "/home/jens/Source/shotwell/src/Photo.vala"
 					return result;
-#line 40684 "Photo.c"
+#line 40685 "Photo.c"
 				}
 #line 5320 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (tag);
-#line 40688 "Photo.c"
+#line 40689 "Photo.c"
 			}
 #line 5320 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (_tag_list);
-#line 40692 "Photo.c"
+#line 40693 "Photo.c"
 		}
 	}
 #line 5326 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -40706,7 +40707,7 @@ static gboolean library_photo_real_has_user_generated_metadata (Photo* base) {
 	_g_object_unref0 (tags);
 #line 5326 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 40705 "Photo.c"
+#line 40706 "Photo.c"
 }
 
 
@@ -40732,7 +40733,7 @@ static void library_photo_real_set_user_metadata_for_export (Photo* base, PhotoM
 	_tmp2_ = photo_tags;
 #line 5331 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp2_ != NULL) {
-#line 40731 "Photo.c"
+#line 40732 "Photo.c"
 		GeeCollection* string_tags = NULL;
 		GeeArrayList* _tmp3_ = NULL;
 		PhotoMetadata* _tmp19_ = NULL;
@@ -40741,7 +40742,7 @@ static void library_photo_real_set_user_metadata_for_export (Photo* base, PhotoM
 		_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"
 		string_tags = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 40740 "Photo.c"
+#line 40741 "Photo.c"
 		{
 			GeeList* _tag_list = NULL;
 			GeeList* _tmp4_ = NULL;
@@ -40769,7 +40770,7 @@ static void library_photo_real_set_user_metadata_for_export (Photo* base, PhotoM
 			_tag_index = -1;
 #line 5333 "/home/jens/Source/shotwell/src/Photo.vala"
 			while (TRUE) {
-#line 40768 "Photo.c"
+#line 40769 "Photo.c"
 				gint _tmp9_ = 0;
 				gint _tmp10_ = 0;
 				gint _tmp11_ = 0;
@@ -40793,7 +40794,7 @@ static void library_photo_real_set_user_metadata_for_export (Photo* base, PhotoM
 				if (!(_tmp10_ < _tmp11_)) {
 #line 5333 "/home/jens/Source/shotwell/src/Photo.vala"
 					break;
-#line 40792 "Photo.c"
+#line 40793 "Photo.c"
 				}
 #line 5333 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp12_ = _tag_list;
@@ -40817,11 +40818,11 @@ static void library_photo_real_set_user_metadata_for_export (Photo* base, PhotoM
 				_g_free0 (_tmp18_);
 #line 5333 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (tag);
-#line 40816 "Photo.c"
+#line 40817 "Photo.c"
 			}
 #line 5333 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (_tag_list);
-#line 40820 "Photo.c"
+#line 40821 "Photo.c"
 		}
 #line 5336 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp19_ = metadata;
@@ -40831,14 +40832,14 @@ static void library_photo_real_set_user_metadata_for_export (Photo* base, PhotoM
 		photo_metadata_set_keywords (_tmp19_, _tmp20_, PHOTO_METADATA_SET_OPTION_ALL_DOMAINS);
 #line 5331 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (string_tags);
-#line 40830 "Photo.c"
+#line 40831 "Photo.c"
 	} else {
 		PhotoMetadata* _tmp21_ = NULL;
 #line 5338 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp21_ = metadata;
 #line 5338 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_metadata_set_keywords (_tmp21_, NULL, PHOTO_METADATA_SET_OPTION_ALL_DOMAINS);
-#line 40837 "Photo.c"
+#line 40838 "Photo.c"
 	}
 #line 5340 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp22_ = metadata;
@@ -40848,7 +40849,7 @@ static void library_photo_real_set_user_metadata_for_export (Photo* base, PhotoM
 	photo_metadata_set_rating (_tmp22_, _tmp23_);
 #line 5329 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (photo_tags);
-#line 40847 "Photo.c"
+#line 40848 "Photo.c"
 }
 
 
@@ -40874,7 +40875,7 @@ static void library_photo_real_apply_user_metadata_for_reimport (Photo* base, Ph
 	_tmp1_ = photo_metadata_has_hierarchical_keywords (_tmp0_);
 #line 5346 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp1_) {
-#line 40873 "Photo.c"
+#line 40874 "Photo.c"
 		PhotoMetadata* _tmp2_ = NULL;
 		GeeSet* _tmp3_ = NULL;
 		GeeSet* _tmp4_ = NULL;
@@ -40893,7 +40894,7 @@ static void library_photo_real_apply_user_metadata_for_reimport (Photo* base, Ph
 		new_htag_index = _tmp5_;
 #line 5347 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_tmp4_);
-#line 40892 "Photo.c"
+#line 40893 "Photo.c"
 	}
 #line 5351 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp6_ = metadata;
@@ -40905,7 +40906,7 @@ static void library_photo_real_apply_user_metadata_for_reimport (Photo* base, Ph
 	_tmp8_ = keywords;
 #line 5352 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp8_ != NULL) {
-#line 40904 "Photo.c"
+#line 40905 "Photo.c"
 		{
 			GeeIterator* _keyword_it = NULL;
 			GeeCollection* _tmp9_ = NULL;
@@ -40918,7 +40919,7 @@ static void library_photo_real_apply_user_metadata_for_reimport (Photo* base, Ph
 			_keyword_it = _tmp10_;
 #line 5353 "/home/jens/Source/shotwell/src/Photo.vala"
 			while (TRUE) {
-#line 40917 "Photo.c"
+#line 40918 "Photo.c"
 				GeeIterator* _tmp11_ = NULL;
 				gboolean _tmp12_ = FALSE;
 				gchar* keyword = NULL;
@@ -40949,7 +40950,7 @@ static void library_photo_real_apply_user_metadata_for_reimport (Photo* base, Ph
 				if (!_tmp12_) {
 #line 5353 "/home/jens/Source/shotwell/src/Photo.vala"
 					break;
-#line 40948 "Photo.c"
+#line 40949 "Photo.c"
 				}
 #line 5353 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp13_ = _keyword_it;
@@ -40961,7 +40962,7 @@ static void library_photo_real_apply_user_metadata_for_reimport (Photo* base, Ph
 				_tmp16_ = new_htag_index;
 #line 5354 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp16_ != NULL) {
-#line 40960 "Photo.c"
+#line 40961 "Photo.c"
 					HierarchicalTagIndex* _tmp17_ = NULL;
 					const gchar* _tmp18_ = NULL;
 					gboolean _tmp19_ = FALSE;
@@ -40973,11 +40974,11 @@ static void library_photo_real_apply_user_metadata_for_reimport (Photo* base, Ph
 					_tmp19_ = hierarchical_tag_index_is_tag_in_index (_tmp17_, _tmp18_);
 #line 5354 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp15_ = _tmp19_;
-#line 40972 "Photo.c"
+#line 40973 "Photo.c"
 				} else {
 #line 5354 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp15_ = FALSE;
-#line 40976 "Photo.c"
+#line 40977 "Photo.c"
 				}
 #line 5354 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp15_) {
@@ -40985,7 +40986,7 @@ static void library_photo_real_apply_user_metadata_for_reimport (Photo* base, Ph
 					_g_free0 (keyword);
 #line 5355 "/home/jens/Source/shotwell/src/Photo.vala"
 					continue;
-#line 40984 "Photo.c"
+#line 40985 "Photo.c"
 				}
 #line 5357 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp20_ = keyword;
@@ -41007,7 +41008,7 @@ static void library_photo_real_apply_user_metadata_for_reimport (Photo* base, Ph
 				_tmp26_ = tag_source_collection_exists (_tmp24_, _tmp25_, FALSE);
 #line 5361 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp26_) {
-#line 41006 "Photo.c"
+#line 41007 "Photo.c"
 					const gchar* _tmp27_ = NULL;
 					Tag* _tmp28_ = NULL;
 					Tag* _tmp29_ = NULL;
@@ -41029,7 +41030,7 @@ static void library_photo_real_apply_user_metadata_for_reimport (Photo* base, Ph
 					_g_free0 (keyword);
 #line 5363 "/home/jens/Source/shotwell/src/Photo.vala"
 					continue;
-#line 41028 "Photo.c"
+#line 41029 "Photo.c"
 				}
 #line 5366 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp30_ = tag_global;
@@ -41039,7 +41040,7 @@ static void library_photo_real_apply_user_metadata_for_reimport (Photo* base, Ph
 				_tmp32_ = tag_source_collection_exists (_tmp30_, _tmp31_, FALSE);
 #line 5366 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp32_) {
-#line 41038 "Photo.c"
+#line 41039 "Photo.c"
 					const gchar* _tmp33_ = NULL;
 					Tag* _tmp34_ = NULL;
 					Tag* _tmp35_ = NULL;
@@ -41061,7 +41062,7 @@ static void library_photo_real_apply_user_metadata_for_reimport (Photo* base, Ph
 					_g_free0 (keyword);
 #line 5368 "/home/jens/Source/shotwell/src/Photo.vala"
 					continue;
-#line 41060 "Photo.c"
+#line 41061 "Photo.c"
 				}
 #line 5371 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp36_ = keyword;
@@ -41079,18 +41080,18 @@ static void library_photo_real_apply_user_metadata_for_reimport (Photo* base, Ph
 				_g_free0 (safe_keyword);
 #line 5353 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_free0 (keyword);
-#line 41078 "Photo.c"
+#line 41079 "Photo.c"
 			}
 #line 5353 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (_keyword_it);
-#line 41082 "Photo.c"
+#line 41083 "Photo.c"
 		}
 	}
 #line 5375 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp39_ = new_htag_index;
 #line 5375 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp39_ != NULL) {
-#line 41089 "Photo.c"
+#line 41090 "Photo.c"
 		{
 			GeeIterator* _path_it = NULL;
 			HierarchicalTagIndex* _tmp40_ = NULL;
@@ -41114,7 +41115,7 @@ static void library_photo_real_apply_user_metadata_for_reimport (Photo* base, Ph
 			_path_it = _tmp44_;
 #line 5376 "/home/jens/Source/shotwell/src/Photo.vala"
 			while (TRUE) {
-#line 41113 "Photo.c"
+#line 41114 "Photo.c"
 				GeeIterator* _tmp45_ = NULL;
 				gboolean _tmp46_ = FALSE;
 				gchar* path = NULL;
@@ -41131,7 +41132,7 @@ static void library_photo_real_apply_user_metadata_for_reimport (Photo* base, Ph
 				if (!_tmp46_) {
 #line 5376 "/home/jens/Source/shotwell/src/Photo.vala"
 					break;
-#line 41130 "Photo.c"
+#line 41131 "Photo.c"
 				}
 #line 5376 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp47_ = _path_it;
@@ -41151,18 +41152,18 @@ static void library_photo_real_apply_user_metadata_for_reimport (Photo* base, Ph
 				_g_object_unref0 (_tmp51_);
 #line 5376 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_free0 (path);
-#line 41150 "Photo.c"
+#line 41151 "Photo.c"
 			}
 #line 5376 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (_path_it);
-#line 41154 "Photo.c"
+#line 41155 "Photo.c"
 		}
 	}
 #line 5343 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (keywords);
 #line 5343 "/home/jens/Source/shotwell/src/Photo.vala"
 	_hierarchical_tag_index_unref0 (new_htag_index);
-#line 41161 "Photo.c"
+#line 41162 "Photo.c"
 }
 
 
@@ -41211,7 +41212,7 @@ static void library_photo_class_init (LibraryPhotoClass * klass) {
 	((PhotoClass *) klass)->apply_user_metadata_for_reimport = library_photo_real_apply_user_metadata_for_reimport;
 #line 4944 "/home/jens/Source/shotwell/src/Photo.vala"
 	G_OBJECT_CLASS (klass)->finalize = library_photo_finalize;
-#line 41210 "Photo.c"
+#line 41211 "Photo.c"
 }
 
 
@@ -41224,7 +41225,7 @@ static void library_photo_flaggable_interface_init (FlaggableIface * iface) {
 	iface->mark_flagged = (void (*)(Flaggable*)) library_photo_real_mark_flagged;
 #line 4944 "/home/jens/Source/shotwell/src/Photo.vala"
 	iface->mark_unflagged = (void (*)(Flaggable*)) library_photo_real_mark_unflagged;
-#line 41223 "Photo.c"
+#line 41224 "Photo.c"
 }
 
 
@@ -41241,7 +41242,7 @@ static void library_photo_monitorable_interface_init (MonitorableIface * iface)
 	iface->set_master_file = (void (*)(Monitorable*, GFile*)) photo_set_master_file;
 #line 4944 "/home/jens/Source/shotwell/src/Photo.vala"
 	iface->set_master_timestamp = (void (*)(Monitorable*, GFileInfo*)) photo_set_master_timestamp;
-#line 41240 "Photo.c"
+#line 41241 "Photo.c"
 }
 
 
@@ -41252,7 +41253,7 @@ static void library_photo_instance_init (LibraryPhoto * self) {
 	self->priv->block_thumbnail_generation = FALSE;
 #line 4956 "/home/jens/Source/shotwell/src/Photo.vala"
 	self->priv->thumbnail_scheduler = NULL;
-#line 41251 "Photo.c"
+#line 41252 "Photo.c"
 }
 
 
@@ -41266,7 +41267,7 @@ static void library_photo_finalize (GObject* obj) {
 	_g_object_unref0 (self->priv->import_keywords);
 #line 4944 "/home/jens/Source/shotwell/src/Photo.vala"
 	G_OBJECT_CLASS (library_photo_parent_class)->finalize (obj);
-#line 41265 "Photo.c"
+#line 41266 "Photo.c"
 }
 
 
@@ -41309,14 +41310,14 @@ LibraryPhotoSourceHoldingTank* library_photo_source_holding_tank_construct (GTyp
 	self = (LibraryPhotoSourceHoldingTank*) media_source_holding_tank_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), _tmp1_, _tmp1__target, _tmp2_, _tmp2__target);
 #line 5393 "/home/jens/Source/shotwell/src/Photo.vala"
 	return self;
-#line 41308 "Photo.c"
+#line 41309 "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"
 	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 41315 "Photo.c"
+#line 41316 "Photo.c"
 }
 
 
@@ -41354,7 +41355,7 @@ LibraryPhoto* library_photo_source_holding_tank_fetch_by_backing_file (LibraryPh
 		result = ret;
 #line 5402 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 41353 "Photo.c"
+#line 41354 "Photo.c"
 	}
 #line 5404 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = self->priv->development_file_map;
@@ -41368,21 +41369,21 @@ LibraryPhoto* library_photo_source_holding_tank_fetch_by_backing_file (LibraryPh
 	_g_object_unref0 (ret);
 #line 5404 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 41367 "Photo.c"
+#line 41368 "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"
 	library_photo_source_holding_tank_on_editable_replaced ((LibraryPhotoSourceHoldingTank*) self, _sender, old_file, new_file);
-#line 41374 "Photo.c"
+#line 41375 "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"
 	library_photo_source_holding_tank_on_raw_development_modified ((LibraryPhotoSourceHoldingTank*) self, _sender);
-#line 41381 "Photo.c"
+#line 41382 "Photo.c"
 }
 
 
@@ -41402,7 +41403,7 @@ static void library_photo_source_holding_tank_real_notify_contents_altered (Sour
 	_tmp0_ = added;
 #line 5409 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp0_ != NULL) {
-#line 41401 "Photo.c"
+#line 41402 "Photo.c"
 		{
 			GeeIterator* _source_it = NULL;
 			GeeCollection* _tmp1_ = NULL;
@@ -41415,7 +41416,7 @@ static void library_photo_source_holding_tank_real_notify_contents_altered (Sour
 			_source_it = _tmp2_;
 #line 5410 "/home/jens/Source/shotwell/src/Photo.vala"
 			while (TRUE) {
-#line 41414 "Photo.c"
+#line 41415 "Photo.c"
 				GeeIterator* _tmp3_ = NULL;
 				gboolean _tmp4_ = FALSE;
 				DataSource* source = NULL;
@@ -41442,7 +41443,7 @@ static void library_photo_source_holding_tank_real_notify_contents_altered (Sour
 				if (!_tmp4_) {
 #line 5410 "/home/jens/Source/shotwell/src/Photo.vala"
 					break;
-#line 41441 "Photo.c"
+#line 41442 "Photo.c"
 				}
 #line 5410 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp5_ = _source_it;
@@ -41468,7 +41469,7 @@ static void library_photo_source_holding_tank_real_notify_contents_altered (Sour
 				_g_object_unref0 (_tmp11_);
 #line 5414 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp12_) {
-#line 41467 "Photo.c"
+#line 41468 "Photo.c"
 					GeeHashMap* _tmp13_ = NULL;
 					LibraryPhoto* _tmp14_ = NULL;
 					GFile* _tmp15_ = NULL;
@@ -41507,7 +41508,7 @@ static void library_photo_source_holding_tank_real_notify_contents_altered (Sour
 					gee_multi_map_set (_tmp18_, _tmp19_, _tmp22_);
 #line 5416 "/home/jens/Source/shotwell/src/Photo.vala"
 					_g_object_unref0 (_tmp22_);
-#line 41506 "Photo.c"
+#line 41507 "Photo.c"
 				}
 #line 5420 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp23_ = photo;
@@ -41519,7 +41520,7 @@ static void library_photo_source_holding_tank_real_notify_contents_altered (Sour
 				_tmp25_ = raw_files;
 #line 5421 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp25_ != NULL) {
-#line 41518 "Photo.c"
+#line 41519 "Photo.c"
 					{
 						GeeIterator* _f_it = NULL;
 						GeeCollection* _tmp26_ = NULL;
@@ -41532,7 +41533,7 @@ static void library_photo_source_holding_tank_real_notify_contents_altered (Sour
 						_f_it = _tmp27_;
 #line 5422 "/home/jens/Source/shotwell/src/Photo.vala"
 						while (TRUE) {
-#line 41531 "Photo.c"
+#line 41532 "Photo.c"
 							GeeIterator* _tmp28_ = NULL;
 							gboolean _tmp29_ = FALSE;
 							GFile* f = NULL;
@@ -41552,7 +41553,7 @@ static void library_photo_source_holding_tank_real_notify_contents_altered (Sour
 							if (!_tmp29_) {
 #line 5422 "/home/jens/Source/shotwell/src/Photo.vala"
 								break;
-#line 41551 "Photo.c"
+#line 41552 "Photo.c"
 							}
 #line 5422 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp30_ = _f_it;
@@ -41578,11 +41579,11 @@ static void library_photo_source_holding_tank_real_notify_contents_altered (Sour
 							gee_multi_map_set (_tmp35_, _tmp36_, _tmp37_);
 #line 5422 "/home/jens/Source/shotwell/src/Photo.vala"
 							_g_object_unref0 (f);
-#line 41577 "Photo.c"
+#line 41578 "Photo.c"
 						}
 #line 5422 "/home/jens/Source/shotwell/src/Photo.vala"
 						_g_object_unref0 (_f_it);
-#line 41581 "Photo.c"
+#line 41582 "Photo.c"
 					}
 				}
 #line 5428 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -41599,18 +41600,18 @@ static void library_photo_source_holding_tank_real_notify_contents_altered (Sour
 				_g_object_unref0 (photo);
 #line 5410 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (source);
-#line 41598 "Photo.c"
+#line 41599 "Photo.c"
 			}
 #line 5410 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (_source_it);
-#line 41602 "Photo.c"
+#line 41603 "Photo.c"
 		}
 	}
 #line 5433 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp40_ = removed;
 #line 5433 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp40_ != NULL) {
-#line 41609 "Photo.c"
+#line 41610 "Photo.c"
 		{
 			GeeIterator* _source_it = NULL;
 			GeeCollection* _tmp41_ = NULL;
@@ -41623,7 +41624,7 @@ static void library_photo_source_holding_tank_real_notify_contents_altered (Sour
 			_source_it = _tmp42_;
 #line 5434 "/home/jens/Source/shotwell/src/Photo.vala"
 			while (TRUE) {
-#line 41622 "Photo.c"
+#line 41623 "Photo.c"
 				GeeIterator* _tmp43_ = NULL;
 				gboolean _tmp44_ = FALSE;
 				DataSource* source = NULL;
@@ -41648,7 +41649,7 @@ static void library_photo_source_holding_tank_real_notify_contents_altered (Sour
 				if (!_tmp44_) {
 #line 5434 "/home/jens/Source/shotwell/src/Photo.vala"
 					break;
-#line 41647 "Photo.c"
+#line 41648 "Photo.c"
 				}
 #line 5434 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp45_ = _source_it;
@@ -41662,7 +41663,7 @@ static void library_photo_source_holding_tank_real_notify_contents_altered (Sour
 				_tmp48_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp47_, TYPE_LIBRARY_PHOTO, LibraryPhoto));
 #line 5435 "/home/jens/Source/shotwell/src/Photo.vala"
 				photo = _tmp48_;
-#line 41661 "Photo.c"
+#line 41662 "Photo.c"
 				{
 					GeeIterator* _f_it = NULL;
 					GeeMultiMap* _tmp49_ = NULL;
@@ -41689,7 +41690,7 @@ static void library_photo_source_holding_tank_real_notify_contents_altered (Sour
 					_f_it = _tmp54_;
 #line 5436 "/home/jens/Source/shotwell/src/Photo.vala"
 					while (TRUE) {
-#line 41688 "Photo.c"
+#line 41689 "Photo.c"
 						GeeIterator* _tmp55_ = NULL;
 						gboolean _tmp56_ = FALSE;
 						GFile* f = NULL;
@@ -41705,7 +41706,7 @@ static void library_photo_source_holding_tank_real_notify_contents_altered (Sour
 						if (!_tmp56_) {
 #line 5436 "/home/jens/Source/shotwell/src/Photo.vala"
 							break;
-#line 41704 "Photo.c"
+#line 41705 "Photo.c"
 						}
 #line 5436 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp57_ = _f_it;
@@ -41721,11 +41722,11 @@ static void library_photo_source_holding_tank_real_notify_contents_altered (Sour
 						gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp59_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp60_, NULL);
 #line 5436 "/home/jens/Source/shotwell/src/Photo.vala"
 						_g_object_unref0 (f);
-#line 41720 "Photo.c"
+#line 41721 "Photo.c"
 					}
 #line 5436 "/home/jens/Source/shotwell/src/Photo.vala"
 					_g_object_unref0 (_f_it);
-#line 41724 "Photo.c"
+#line 41725 "Photo.c"
 				}
 				{
 					GeeIterator* _f_it = NULL;
@@ -41753,7 +41754,7 @@ static void library_photo_source_holding_tank_real_notify_contents_altered (Sour
 					_f_it = _tmp66_;
 #line 5439 "/home/jens/Source/shotwell/src/Photo.vala"
 					while (TRUE) {
-#line 41752 "Photo.c"
+#line 41753 "Photo.c"
 						GeeIterator* _tmp67_ = NULL;
 						gboolean _tmp68_ = FALSE;
 						GFile* f = NULL;
@@ -41769,7 +41770,7 @@ static void library_photo_source_holding_tank_real_notify_contents_altered (Sour
 						if (!_tmp68_) {
 #line 5439 "/home/jens/Source/shotwell/src/Photo.vala"
 							break;
-#line 41768 "Photo.c"
+#line 41769 "Photo.c"
 						}
 #line 5439 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp69_ = _f_it;
@@ -41785,11 +41786,11 @@ static void library_photo_source_holding_tank_real_notify_contents_altered (Sour
 						gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp71_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp72_, NULL);
 #line 5439 "/home/jens/Source/shotwell/src/Photo.vala"
 						_g_object_unref0 (f);
-#line 41784 "Photo.c"
+#line 41785 "Photo.c"
 					}
 #line 5439 "/home/jens/Source/shotwell/src/Photo.vala"
 					_g_object_unref0 (_f_it);
-#line 41788 "Photo.c"
+#line 41789 "Photo.c"
 				}
 #line 5442 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp73_ = self->priv->reverse_editable_file_map;
@@ -41819,11 +41820,11 @@ static void library_photo_source_holding_tank_real_notify_contents_altered (Sour
 				_g_object_unref0 (photo);
 #line 5434 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (source);
-#line 41818 "Photo.c"
+#line 41819 "Photo.c"
 			}
 #line 5434 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (_source_it);
-#line 41822 "Photo.c"
+#line 41823 "Photo.c"
 		}
 	}
 #line 5450 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -41832,7 +41833,7 @@ static void library_photo_source_holding_tank_real_notify_contents_altered (Sour
 	_tmp82_ = removed;
 #line 5450 "/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 41831 "Photo.c"
+#line 41832 "Photo.c"
 }
 
 
@@ -41868,7 +41869,7 @@ static void library_photo_source_holding_tank_on_editable_replaced (LibraryPhoto
 	_tmp3_ = old_file;
 #line 5457 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp3_ != NULL) {
-#line 41867 "Photo.c"
+#line 41868 "Photo.c"
 		GeeHashMap* _tmp4_ = NULL;
 		GFile* _tmp5_ = NULL;
 		GeeMultiMap* _tmp6_ = NULL;
@@ -41888,13 +41889,13 @@ static void library_photo_source_holding_tank_on_editable_replaced (LibraryPhoto
 		_tmp8_ = old_file;
 #line 5459 "/home/jens/Source/shotwell/src/Photo.vala"
 		gee_multi_map_remove (_tmp6_, _tmp7_, _tmp8_);
-#line 41887 "Photo.c"
+#line 41888 "Photo.c"
 	}
 #line 5462 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp9_ = new_file;
 #line 5462 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp9_ != NULL) {
-#line 41893 "Photo.c"
+#line 41894 "Photo.c"
 		GeeHashMap* _tmp10_ = NULL;
 		GFile* _tmp11_ = NULL;
 		LibraryPhoto* _tmp12_ = NULL;
@@ -41906,7 +41907,7 @@ static void library_photo_source_holding_tank_on_editable_replaced (LibraryPhoto
 		_tmp12_ = photo;
 #line 5463 "/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 41905 "Photo.c"
+#line 41906 "Photo.c"
 	}
 #line 5464 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp13_ = self->priv->reverse_editable_file_map;
@@ -41918,7 +41919,7 @@ static void library_photo_source_holding_tank_on_editable_replaced (LibraryPhoto
 	gee_multi_map_set (_tmp13_, _tmp14_, _tmp15_);
 #line 5453 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (photo);
-#line 41917 "Photo.c"
+#line 41918 "Photo.c"
 }
 
 
@@ -41956,7 +41957,7 @@ static void library_photo_source_holding_tank_on_raw_development_modified (Libra
 	_tmp5_ = gee_multi_map_contains (_tmp3_, _tmp4_);
 #line 5472 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp5_) {
-#line 41955 "Photo.c"
+#line 41956 "Photo.c"
 		GeeMultiMap* _tmp18_ = NULL;
 		LibraryPhoto* _tmp19_ = NULL;
 		{
@@ -41985,7 +41986,7 @@ static void library_photo_source_holding_tank_on_raw_development_modified (Libra
 			_f_it = _tmp11_;
 #line 5473 "/home/jens/Source/shotwell/src/Photo.vala"
 			while (TRUE) {
-#line 41984 "Photo.c"
+#line 41985 "Photo.c"
 				GeeIterator* _tmp12_ = NULL;
 				gboolean _tmp13_ = FALSE;
 				GFile* f = NULL;
@@ -42001,7 +42002,7 @@ static void library_photo_source_holding_tank_on_raw_development_modified (Libra
 				if (!_tmp13_) {
 #line 5473 "/home/jens/Source/shotwell/src/Photo.vala"
 					break;
-#line 42000 "Photo.c"
+#line 42001 "Photo.c"
 				}
 #line 5473 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp14_ = _f_it;
@@ -42017,11 +42018,11 @@ static void library_photo_source_holding_tank_on_raw_development_modified (Libra
 				gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp17_, NULL);
 #line 5473 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (f);
-#line 42016 "Photo.c"
+#line 42017 "Photo.c"
 			}
 #line 5473 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (_f_it);
-#line 42020 "Photo.c"
+#line 42021 "Photo.c"
 		}
 #line 5475 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp18_ = self->priv->reverse_development_file_map;
@@ -42029,7 +42030,7 @@ static void library_photo_source_holding_tank_on_raw_development_modified (Libra
 		_tmp19_ = photo;
 #line 5475 "/home/jens/Source/shotwell/src/Photo.vala"
 		gee_multi_map_remove_all (_tmp18_, _tmp19_);
-#line 42028 "Photo.c"
+#line 42029 "Photo.c"
 	}
 #line 5479 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp20_ = photo;
@@ -42041,7 +42042,7 @@ static void library_photo_source_holding_tank_on_raw_development_modified (Libra
 	_tmp22_ = raw_list;
 #line 5480 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp22_ != NULL) {
-#line 42040 "Photo.c"
+#line 42041 "Photo.c"
 		{
 			GeeIterator* _f_it = NULL;
 			GeeCollection* _tmp23_ = NULL;
@@ -42054,7 +42055,7 @@ static void library_photo_source_holding_tank_on_raw_development_modified (Libra
 			_f_it = _tmp24_;
 #line 5481 "/home/jens/Source/shotwell/src/Photo.vala"
 			while (TRUE) {
-#line 42053 "Photo.c"
+#line 42054 "Photo.c"
 				GeeIterator* _tmp25_ = NULL;
 				gboolean _tmp26_ = FALSE;
 				GFile* f = NULL;
@@ -42074,7 +42075,7 @@ static void library_photo_source_holding_tank_on_raw_development_modified (Libra
 				if (!_tmp26_) {
 #line 5481 "/home/jens/Source/shotwell/src/Photo.vala"
 					break;
-#line 42073 "Photo.c"
+#line 42074 "Photo.c"
 				}
 #line 5481 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp27_ = _f_it;
@@ -42100,18 +42101,18 @@ static void library_photo_source_holding_tank_on_raw_development_modified (Libra
 				gee_multi_map_set (_tmp32_, _tmp33_, _tmp34_);
 #line 5481 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (f);
-#line 42099 "Photo.c"
+#line 42100 "Photo.c"
 			}
 #line 5481 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (_f_it);
-#line 42103 "Photo.c"
+#line 42104 "Photo.c"
 		}
 	}
 #line 5467 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (raw_list);
 #line 5467 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (photo);
-#line 42110 "Photo.c"
+#line 42111 "Photo.c"
 }
 
 
@@ -42124,7 +42125,7 @@ static void library_photo_source_holding_tank_class_init (LibraryPhotoSourceHold
 	g_type_class_add_private (klass, sizeof (LibraryPhotoSourceHoldingTankPrivate));
 #line 5383 "/home/jens/Source/shotwell/src/Photo.vala"
 	((SourceHoldingTankClass *) klass)->notify_contents_altered = library_photo_source_holding_tank_real_notify_contents_altered;
-#line 42123 "Photo.c"
+#line 42124 "Photo.c"
 }
 
 
@@ -42151,7 +42152,7 @@ static void library_photo_source_holding_tank_instance_init (LibraryPhotoSourceH
 	_tmp3_ = gee_hash_multi_map_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, G_TYPE_FILE, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL);
 #line 5390 "/home/jens/Source/shotwell/src/Photo.vala"
 	self->priv->reverse_development_file_map = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_MULTI_MAP, GeeMultiMap);
-#line 42150 "Photo.c"
+#line 42151 "Photo.c"
 }
 
 
@@ -42169,7 +42170,7 @@ static void library_photo_source_holding_tank_finalize (SourceHoldingTank* obj)
 	_g_object_unref0 (self->priv->reverse_development_file_map);
 #line 5383 "/home/jens/Source/shotwell/src/Photo.vala"
 	SOURCE_HOLDING_TANK_CLASS (library_photo_source_holding_tank_parent_class)->finalize (obj);
-#line 42168 "Photo.c"
+#line 42169 "Photo.c"
 }
 
 
diff --git a/src/PhotoMonitor.c b/src/PhotoMonitor.c
index 923a311..0eb420e 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 __catch572_database_error;
+					goto __catch585_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 __finally572;
-		__catch572_database_error:
+		goto __finally585;
+		__catch585_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"
 		}
-		__finally572:
+		__finally585:
 #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 __catch573_database_error;
+					goto __catch586_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 __finally573;
-		__catch573_database_error:
+		goto __finally586;
+		__catch586_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"
 		}
-		__finally573:
+		__finally586:
 #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 __catch574_database_error;
+				goto __catch587_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 __finally574;
-	__catch574_database_error:
+	goto __finally587;
+	__catch587_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"
 	}
-	__finally574:
+	__finally587:
 #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 __catch575_database_error;
+				goto __catch588_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 __finally575;
-	__catch575_database_error:
+	goto __finally588;
+	__catch588_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"
 	}
-	__finally575:
+	__finally588:
 #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 __catch576_database_error;
+				goto __catch589_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 __finally576;
-	__catch576_database_error:
+	goto __finally589;
+	__catch589_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"
 	}
-	__finally576:
+	__finally589:
 #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 __catch577_g_error;
+			goto __catch590_g_error;
 		}
 #line 176 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 		self->mark_online = _tmp0_;
 #line 8035 "PhotoMonitor.c"
 	}
-	goto __finally577;
-	__catch577_g_error:
+	goto __finally590;
+	__catch590_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"
 	}
-	__finally577:
+	__finally590:
 #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 __catch578_g_error;
+			goto __catch591_g_error;
 		}
 #line 198 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 		self->success = _tmp0_;
 #line 8213 "PhotoMonitor.c"
 	}
-	goto __finally578;
-	__catch578_g_error:
+	goto __finally591;
+	__catch591_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"
 	}
-	__finally578:
+	__finally591:
 #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 __catch579_g_error;
+			goto __catch592_g_error;
 		}
 #line 220 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 		self->success = _tmp0_;
 #line 8391 "PhotoMonitor.c"
 	}
-	goto __finally579;
-	__catch579_g_error:
+	goto __finally592;
+	__catch592_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"
 	}
-	__finally579:
+	__finally592:
 #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 c2639d4..33c1611 100644
--- a/src/PhotoPage.c
+++ b/src/PhotoPage.c
@@ -1677,7 +1677,7 @@ void editing_host_page_on_rotate_clockwise (EditingHostPage* self);
 static void _editing_host_page_on_rotate_clockwise_gtk_tool_button_clicked (GtkToolButton* _sender, gpointer self);
 #define RESOURCES_CROP "shotwell-crop"
 #define RESOURCES_CROP_LABEL _ ("Crop")
-#define RESOURCES_CROP_TOOLTIP _ ("Crop the photo's size")
+#define RESOURCES_CROP_TOOLTIP _ ("Crop the photo’s size")
 static void editing_host_page_on_crop_toggled (EditingHostPage* self);
 static void _editing_host_page_on_crop_toggled_gtk_toggle_tool_button_toggled (GtkToggleToolButton* _sender, gpointer self);
 #define RESOURCES_STRAIGHTEN "shotwell-straighten"
@@ -1692,12 +1692,12 @@ static void editing_host_page_on_redeye_toggled (EditingHostPage* self);
 static void _editing_host_page_on_redeye_toggled_gtk_toggle_tool_button_toggled (GtkToggleToolButton* _sender, gpointer self);
 #define RESOURCES_ADJUST "image-adjust"
 #define RESOURCES_ADJUST_LABEL _ ("Adjust")
-#define RESOURCES_ADJUST_TOOLTIP _ ("Adjust the photo's color and tone")
+#define RESOURCES_ADJUST_TOOLTIP _ ("Adjust the photo’s color and tone")
 static void editing_host_page_on_adjust_toggled (EditingHostPage* self);
 static void _editing_host_page_on_adjust_toggled_gtk_toggle_tool_button_toggled (GtkToggleToolButton* _sender, gpointer self);
 #define RESOURCES_ENHANCE_LABEL _ ("Enhance")
 #define RESOURCES_ENHANCE "shotwell-auto-enhance"
-#define RESOURCES_ENHANCE_TOOLTIP _ ("Automatically improve the photo's appearance")
+#define RESOURCES_ENHANCE_TOOLTIP _ ("Automatically improve the photo’s appearance")
 void editing_host_page_on_enhance (EditingHostPage* self);
 static void _editing_host_page_on_enhance_gtk_tool_button_clicked (GtkToolButton* _sender, gpointer self);
 GdkPixbuf* resources_load_icon (const gchar* name, gint scale);
@@ -2186,17 +2186,17 @@ GtkActionEntry* page_init_collect_action_entries (Page* self, int* result_length
 #define TRANSLATABLE "translatable"
 static void library_photo_page_on_export (LibraryPhotoPage* self);
 static void _library_photo_page_on_export_gtk_action_callback (GtkAction* action, gpointer self);
-#define RESOURCES_EXPORT_MENU _ ("_Export...")
+#define RESOURCES_EXPORT_MENU _ ("_Export…")
 static void _vala_array_add193 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
 #define RESOURCES_PRINT_LABEL _ ("_Print")
 static void library_photo_page_on_print (LibraryPhotoPage* self);
 static void _library_photo_page_on_print_gtk_action_callback (GtkAction* action, gpointer self);
-#define RESOURCES_PRINT_MENU _ ("_Print...")
+#define RESOURCES_PRINT_MENU _ ("_Print…")
 static void _vala_array_add194 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
 #define RESOURCES_PUBLISH "applications-internet"
 static void library_photo_page_on_publish (LibraryPhotoPage* self);
 static void _library_photo_page_on_publish_gtk_action_callback (GtkAction* action, gpointer self);
-#define RESOURCES_PUBLISH_MENU _ ("Pu_blish...")
+#define RESOURCES_PUBLISH_MENU _ ("Pu_blish…")
 #define RESOURCES_PUBLISH_TOOLTIP _ ("Publish to various websites")
 static void _vala_array_add195 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
 #define RESOURCES_REMOVE_LABEL _ ("_Remove")
@@ -2258,13 +2258,13 @@ static void _editing_host_page_on_revert_gtk_action_callback (GtkAction* action,
 #define RESOURCES_REVERT_MENU _ ("Re_vert to Original")
 static void _vala_array_add213 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
 static void _editing_host_page_on_edit_title_gtk_action_callback (GtkAction* action, gpointer self);
-#define RESOURCES_EDIT_TITLE_MENU _ ("Edit _Title...")
+#define RESOURCES_EDIT_TITLE_MENU _ ("Edit _Title…")
 static void _vala_array_add214 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
 static void _editing_host_page_on_edit_comment_gtk_action_callback (GtkAction* action, gpointer self);
-#define RESOURCES_EDIT_COMMENT_MENU _ ("Edit _Comment...")
+#define RESOURCES_EDIT_COMMENT_MENU _ ("Edit _Comment…")
 static void _vala_array_add215 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
 static void _editing_host_page_on_adjust_date_time_gtk_action_callback (GtkAction* action, gpointer self);
-#define RESOURCES_ADJUST_DATE_TIME_MENU _ ("_Adjust Date and Time...")
+#define RESOURCES_ADJUST_DATE_TIME_MENU _ ("_Adjust Date and Time…")
 static void _vala_array_add216 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
 #define RESOURCES_EDIT_LABEL _ ("_Edit")
 static void library_photo_page_on_external_edit (LibraryPhotoPage* self);
@@ -2277,7 +2277,7 @@ static void _library_photo_page_on_external_edit_raw_gtk_action_callback (GtkAct
 static void _vala_array_add218 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
 static void library_photo_page_on_send_to (LibraryPhotoPage* self);
 static void _library_photo_page_on_send_to_gtk_action_callback (GtkAction* action, gpointer self);
-#define RESOURCES_SEND_TO_MENU _ ("Send _To...")
+#define RESOURCES_SEND_TO_MENU _ ("Send _To…")
 static void _vala_array_add219 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
 static void _editing_host_page_on_set_background_gtk_action_callback (GtkAction* action, gpointer self);
 #define RESOURCES_SET_BACKGROUND_MENU _ ("Set as _Desktop Background")
@@ -2336,19 +2336,19 @@ static void _editing_host_page_snap_zoom_to_max_gtk_action_callback (GtkAction*
 static void _vala_array_add236 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
 static void library_photo_page_on_add_tags (LibraryPhotoPage* self);
 static void _library_photo_page_on_add_tags_gtk_action_callback (GtkAction* action, gpointer self);
-#define RESOURCES_ADD_TAGS_MENU _ ("Add _Tags...")
+#define RESOURCES_ADD_TAGS_MENU _ ("Add _Tags…")
 static void _vala_array_add237 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
 static void library_photo_page_on_modify_tags (LibraryPhotoPage* self);
 static void _library_photo_page_on_modify_tags_gtk_action_callback (GtkAction* action, gpointer self);
-#define RESOURCES_MODIFY_TAGS_MENU _ ("Modif_y Tags...")
+#define RESOURCES_MODIFY_TAGS_MENU _ ("Modif_y Tags…")
 static void _vala_array_add238 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
 static void library_photo_page_on_slideshow (LibraryPhotoPage* self);
 static void _library_photo_page_on_slideshow_gtk_action_callback (GtkAction* action, gpointer self);
 static void _vala_array_add239 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
 static void _vala_array_add240 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
-#define RESOURCES_SEND_TO_CONTEXT_MENU _ ("Send T_o...")
+#define RESOURCES_SEND_TO_CONTEXT_MENU _ ("Send T_o…")
 static void _vala_array_add241 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
-#define RESOURCES_ADD_TAGS_CONTEXT_MENU _ ("_Add Tags...")
+#define RESOURCES_ADD_TAGS_CONTEXT_MENU _ ("_Add Tags…")
 static void _vala_array_add242 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
 static GtkToggleActionEntry* library_photo_page_real_init_collect_toggle_action_entries (Page* base, int* result_length1);
 GtkToggleActionEntry* page_init_collect_toggle_action_entries (Page* self, int* result_length1);
@@ -2356,7 +2356,7 @@ static void library_photo_page_on_display_ratings (LibraryPhotoPage* self, GtkAc
 static void _library_photo_page_on_display_ratings_gtk_action_callback (GtkAction* action, gpointer self);
 gboolean configuration_facade_get_display_photo_ratings (ConfigurationFacade* self);
 #define RESOURCES_VIEW_RATINGS_MENU _ ("_Ratings")
-#define RESOURCES_VIEW_RATINGS_TOOLTIP _ ("Display each photo's rating")
+#define RESOURCES_VIEW_RATINGS_TOOLTIP _ ("Display each photo’s rating")
 static void _vala_array_add243 (GtkToggleActionEntry** array, int* length, int* size, const GtkToggleActionEntry* value);
 static InjectionGroup** library_photo_page_real_init_collect_injection_groups (Page* base, int* result_length1);
 InjectionGroup** page_init_collect_injection_groups (Page* self, int* result_length1);
@@ -4108,7 +4108,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 4108 "PhotoPage.c"
-			goto __catch230_g_error;
+			goto __catch243_g_error;
 		}
 #line 29 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_ = _tmp0_;
@@ -4122,8 +4122,8 @@ static void zoom_buffer_iso_source_fetch_job_real_execute (BackgroundJob* base)
 		_g_object_unref0 (_tmp0_);
 #line 4121 "PhotoPage.c"
 	}
-	goto __finally230;
-	__catch230_g_error:
+	goto __finally243;
+	__catch243_g_error:
 	{
 		GError* fetch_error = NULL;
 #line 28 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -4137,7 +4137,7 @@ static void zoom_buffer_iso_source_fetch_job_real_execute (BackgroundJob* base)
 		_g_error_free0 (fetch_error);
 #line 4135 "PhotoPage.c"
 	}
-	__finally230:
+	__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"
@@ -7143,7 +7143,7 @@ static void editing_host_page_on_pixbuf_fetched (EditingHostPage* self, Photo* p
 #line 965 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 7141 "PhotoPage.c"
-					goto __catch231_g_error;
+					goto __catch244_g_error;
 				}
 #line 968 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_tmp23_ = tool_pixbuf;
@@ -7166,8 +7166,8 @@ static void editing_host_page_on_pixbuf_fetched (EditingHostPage* self, Photo* p
 				_g_object_unref0 (tool_pixbuf);
 #line 7163 "PhotoPage.c"
 			}
-			goto __finally231;
-			__catch231_g_error:
+			goto __finally244;
+			__catch244_g_error:
 			{
 				GError* err = NULL;
 				Photo* _tmp26_ = NULL;
@@ -7201,7 +7201,7 @@ static void editing_host_page_on_pixbuf_fetched (EditingHostPage* self, Photo* p
 				return;
 #line 7198 "PhotoPage.c"
 			}
-			__finally231:
+			__finally244:
 #line 963 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 963 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -8209,7 +8209,7 @@ void editing_host_page_set_photo_missing (EditingHostPage* self, gboolean missin
 #line 1132 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 8207 "PhotoPage.c"
-				goto __catch232_g_error;
+				goto __catch245_g_error;
 			}
 #line 1134 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp10_ = pixbuf;
@@ -8239,8 +8239,8 @@ void editing_host_page_set_photo_missing (EditingHostPage* self, gboolean missin
 			_g_object_unref0 (pixbuf);
 #line 8236 "PhotoPage.c"
 		}
-		goto __finally232;
-		__catch232_g_error:
+		goto __finally245;
+		__catch245_g_error:
 		{
 			GError* err = NULL;
 			GdkPixbuf* _tmp19_ = NULL;
@@ -8275,7 +8275,7 @@ void editing_host_page_set_photo_missing (EditingHostPage* self, gboolean missin
 			_g_error_free0 (err);
 #line 8272 "PhotoPage.c"
 		}
-		__finally232:
+		__finally245:
 #line 1131 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1131 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -8376,7 +8376,7 @@ static GdkPixbuf* editing_host_page_get_zoom_pixbuf (EditingHostPage* self, Phot
 #line 1157 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 8374 "PhotoPage.c"
-				goto __catch233_g_error;
+				goto __catch246_g_error;
 			}
 #line 1157 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp8_ = _tmp4_;
@@ -8390,8 +8390,8 @@ static GdkPixbuf* editing_host_page_get_zoom_pixbuf (EditingHostPage* self, Phot
 			_g_object_unref0 (_tmp4_);
 #line 8387 "PhotoPage.c"
 		}
-		goto __finally233;
-		__catch233_g_error:
+		goto __finally246;
+		__catch246_g_error:
 		{
 			GError* err = NULL;
 			GError* _tmp9_ = NULL;
@@ -8410,7 +8410,7 @@ static GdkPixbuf* editing_host_page_get_zoom_pixbuf (EditingHostPage* self, Phot
 			_g_error_free0 (err);
 #line 8407 "PhotoPage.c"
 		}
-		__finally233:
+		__finally246:
 #line 1156 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1156 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -8934,7 +8934,7 @@ static void editing_host_page_quick_update_pixbuf (EditingHostPage* self) {
 #line 1252 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 8932 "PhotoPage.c"
-			goto __catch234_g_error;
+			goto __catch247_g_error;
 		}
 #line 1252 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp23_ = editing_host_page_get_photo (self);
@@ -8950,8 +8950,8 @@ static void editing_host_page_quick_update_pixbuf (EditingHostPage* self) {
 		_g_object_unref0 (_tmp17_);
 #line 8947 "PhotoPage.c"
 	}
-	goto __finally234;
-	__catch234_g_error:
+	goto __finally247;
+	__catch247_g_error:
 	{
 		GError* err = NULL;
 		GError* _tmp26_ = NULL;
@@ -8970,7 +8970,7 @@ static void editing_host_page_quick_update_pixbuf (EditingHostPage* self) {
 		_g_error_free0 (err);
 #line 8967 "PhotoPage.c"
 	}
-	__finally234:
+	__finally247:
 #line 1251 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1251 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -9077,7 +9077,7 @@ static gboolean editing_host_page_update_pixbuf (EditingHostPage* self) {
 #line 1279 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 9075 "PhotoPage.c"
-				goto __catch235_g_error;
+				goto __catch248_g_error;
 			}
 #line 1279 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp12_ = _tmp6_;
@@ -9104,8 +9104,8 @@ static gboolean editing_host_page_update_pixbuf (EditingHostPage* self) {
 #line 9100 "PhotoPage.c"
 		}
 	}
-	goto __finally235;
-	__catch235_g_error:
+	goto __finally248;
+	__catch248_g_error:
 	{
 		GError* err = NULL;
 		GError* _tmp15_ = NULL;
@@ -9126,7 +9126,7 @@ static gboolean editing_host_page_update_pixbuf (EditingHostPage* self) {
 		_g_error_free0 (err);
 #line 9123 "PhotoPage.c"
 	}
-	__finally235:
+	__finally248:
 #line 1276 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1276 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -9837,7 +9837,7 @@ static void editing_host_page_swap_in_original (EditingHostPage* self) {
 #line 1393 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 9835 "PhotoPage.c"
-			goto __catch236_g_error;
+			goto __catch249_g_error;
 		}
 #line 1392 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp5_ = editing_host_page_get_photo (self);
@@ -9857,8 +9857,8 @@ static void editing_host_page_swap_in_original (EditingHostPage* self) {
 		_g_object_unref0 (_tmp0_);
 #line 9854 "PhotoPage.c"
 	}
-	goto __finally236;
-	__catch236_g_error:
+	goto __finally249;
+	__catch249_g_error:
 	{
 		GError* err = NULL;
 #line 1391 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -9873,7 +9873,7 @@ static void editing_host_page_swap_in_original (EditingHostPage* self) {
 		return;
 #line 9870 "PhotoPage.c"
 	}
-	__finally236:
+	__finally249:
 #line 1391 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1391 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -10053,7 +10053,7 @@ static void editing_host_page_activate_tool (EditingHostPage* self, EditingTools
 #line 1441 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 10051 "PhotoPage.c"
-			goto __catch237_g_error;
+			goto __catch250_g_error;
 		}
 #line 1441 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp15_ = _tmp7_;
@@ -10079,8 +10079,8 @@ static void editing_host_page_activate_tool (EditingHostPage* self, EditingTools
 		_g_object_unref0 (_tmp7_);
 #line 10076 "PhotoPage.c"
 	}
-	goto __finally237;
-	__catch237_g_error:
+	goto __finally250;
+	__catch250_g_error:
 	{
 		GError* err = NULL;
 		GError* _tmp18_ = NULL;
@@ -10115,7 +10115,7 @@ static void editing_host_page_activate_tool (EditingHostPage* self, EditingTools
 		return;
 #line 10112 "PhotoPage.c"
 	}
-	__finally237:
+	__finally250:
 #line 1439 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1439 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -20737,7 +20737,7 @@ static void library_photo_page_on_external_edit (LibraryPhotoPage* self) {
 #line 3174 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 20735 "PhotoPage.c"
-			goto __catch238_g_error;
+			goto __catch251_g_error;
 		}
 #line 3175 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp5_ = app_window_get_instance ();
@@ -20749,8 +20749,8 @@ static void library_photo_page_on_external_edit (LibraryPhotoPage* self) {
 		_g_object_unref0 (_tmp6_);
 #line 20746 "PhotoPage.c"
 	}
-	goto __finally238;
-	__catch238_g_error:
+	goto __finally251;
+	__catch251_g_error:
 	{
 		GError* err = NULL;
 		AppWindow* _tmp7_ = NULL;
@@ -20784,7 +20784,7 @@ static void library_photo_page_on_external_edit (LibraryPhotoPage* self) {
 		_g_error_free0 (err);
 #line 20781 "PhotoPage.c"
 	}
-	__finally238:
+	__finally251:
 #line 3172 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 3172 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -20857,7 +20857,7 @@ static void library_photo_page_on_external_edit_raw (LibraryPhotoPage* self) {
 #line 3192 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 20855 "PhotoPage.c"
-			goto __catch239_g_error;
+			goto __catch252_g_error;
 		}
 #line 3193 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp9_ = app_window_get_instance ();
@@ -20869,8 +20869,8 @@ static void library_photo_page_on_external_edit_raw (LibraryPhotoPage* self) {
 		_g_object_unref0 (_tmp10_);
 #line 20866 "PhotoPage.c"
 	}
-	goto __finally239;
-	__catch239_g_error:
+	goto __finally252;
+	__catch252_g_error:
 	{
 		GError* err = NULL;
 		AppWindow* _tmp11_ = NULL;
@@ -20904,7 +20904,7 @@ static void library_photo_page_on_external_edit_raw (LibraryPhotoPage* self) {
 		_g_error_free0 (err);
 #line 20901 "PhotoPage.c"
 	}
-	__finally239:
+	__finally252:
 #line 3190 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 3190 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -21108,11 +21108,11 @@ static void library_photo_page_on_export (LibraryPhotoPage* self) {
 #line 3225 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 21106 "PhotoPage.c"
-			goto __catch240_g_error;
+			goto __catch253_g_error;
 		}
 	}
-	goto __finally240;
-	__catch240_g_error:
+	goto __finally253;
+	__catch253_g_error:
 	{
 		GError* err = NULL;
 		const gchar* _tmp33_ = NULL;
@@ -21153,7 +21153,7 @@ static void library_photo_page_on_export (LibraryPhotoPage* self) {
 		_g_error_free0 (err);
 #line 21150 "PhotoPage.c"
 	}
-	__finally240:
+	__finally253:
 #line 3224 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 3224 "/home/jens/Source/shotwell/src/PhotoPage.vala"
diff --git a/src/PixbufCache.c b/src/PixbufCache.c
index 2b5d14c..33816ed 100644
--- a/src/PixbufCache.c
+++ b/src/PixbufCache.c
@@ -2298,7 +2298,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 2301 "PixbufCache.c"
-			goto __catch442_g_error;
+			goto __catch455_g_error;
 		}
 #line 50 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 		_tmp4_ = _tmp0_;
@@ -2312,8 +2312,8 @@ static void pixbuf_cache_baseline_fetch_job_real_execute (BackgroundJob* base) {
 		_g_object_unref0 (_tmp0_);
 #line 2314 "PixbufCache.c"
 	}
-	goto __finally442;
-	__catch442_g_error:
+	goto __finally455;
+	__catch455_g_error:
 	{
 		GError* err = NULL;
 		GError* _tmp5_ = NULL;
@@ -2334,7 +2334,7 @@ static void pixbuf_cache_baseline_fetch_job_real_execute (BackgroundJob* base) {
 		_g_error_free0 (err);
 #line 2336 "PixbufCache.c"
 	}
-	__finally442:
+	__finally455:
 #line 49 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 49 "/home/jens/Source/shotwell/src/PixbufCache.vala"
@@ -2437,7 +2437,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 2440 "PixbufCache.c"
-			goto __catch443_g_error;
+			goto __catch456_g_error;
 		}
 #line 65 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 		_tmp4_ = _tmp0_;
@@ -2451,8 +2451,8 @@ static void pixbuf_cache_master_fetch_job_real_execute (BackgroundJob* base) {
 		_g_object_unref0 (_tmp0_);
 #line 2453 "PixbufCache.c"
 	}
-	goto __finally443;
-	__catch443_g_error:
+	goto __finally456;
+	__catch456_g_error:
 	{
 		GError* err = NULL;
 		GError* _tmp5_ = NULL;
@@ -2473,7 +2473,7 @@ static void pixbuf_cache_master_fetch_job_real_execute (BackgroundJob* base) {
 		_g_error_free0 (err);
 #line 2475 "PixbufCache.c"
 	}
-	__finally443:
+	__finally456:
 #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 3f2eda2..78ac793 100644
--- a/src/Printing.c
+++ b/src/Printing.c
@@ -6002,7 +6002,7 @@ StandardPrintSize** print_manager_get_standard_sizes (PrintManager* self, int* r
 #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 x 3 in.)");
+	_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"
@@ -6016,7 +6016,7 @@ StandardPrintSize** print_manager_get_standard_sizes (PrintManager* self, int* r
 #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 x 5 in.)");
+	_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"
@@ -6030,7 +6030,7 @@ StandardPrintSize** print_manager_get_standard_sizes (PrintManager* self, int* r
 #line 824 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp11__length1 = _result__length1;
 #line 824 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp12_ = _ ("4 x 6 in.");
+	_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"
@@ -6044,7 +6044,7 @@ StandardPrintSize** print_manager_get_standard_sizes (PrintManager* self, int* r
 #line 827 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp16__length1 = _result__length1;
 #line 827 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp17_ = _ ("5 x 7 in.");
+	_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"
@@ -6058,7 +6058,7 @@ StandardPrintSize** print_manager_get_standard_sizes (PrintManager* self, int* r
 #line 830 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp21__length1 = _result__length1;
 #line 830 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp22_ = _ ("8 x 10 in.");
+	_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"
@@ -6072,7 +6072,7 @@ StandardPrintSize** print_manager_get_standard_sizes (PrintManager* self, int* r
 #line 833 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp26__length1 = _result__length1;
 #line 833 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp27_ = _ ("11 x 14 in.");
+	_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"
@@ -6086,7 +6086,7 @@ StandardPrintSize** print_manager_get_standard_sizes (PrintManager* self, int* r
 #line 836 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp31__length1 = _result__length1;
 #line 836 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp32_ = _ ("16 x 20 in.");
+	_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"
@@ -6112,7 +6112,7 @@ StandardPrintSize** print_manager_get_standard_sizes (PrintManager* self, int* r
 #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 x 13 cm)");
+	_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"
@@ -6126,7 +6126,7 @@ StandardPrintSize** print_manager_get_standard_sizes (PrintManager* self, int* r
 #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 x 15 cm)");
+	_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"
@@ -6140,7 +6140,7 @@ StandardPrintSize** print_manager_get_standard_sizes (PrintManager* self, int* r
 #line 848 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp50__length1 = _result__length1;
 #line 848 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp51_ = _ ("13 x 18 cm");
+	_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"
@@ -6154,7 +6154,7 @@ StandardPrintSize** print_manager_get_standard_sizes (PrintManager* self, int* r
 #line 851 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp55__length1 = _result__length1;
 #line 851 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp56_ = _ ("18 x 24 cm");
+	_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"
@@ -6168,7 +6168,7 @@ StandardPrintSize** print_manager_get_standard_sizes (PrintManager* self, int* r
 #line 854 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp60__length1 = _result__length1;
 #line 854 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp61_ = _ ("20 x 30 cm");
+	_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"
@@ -6182,7 +6182,7 @@ StandardPrintSize** print_manager_get_standard_sizes (PrintManager* self, int* r
 #line 857 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp65__length1 = _result__length1;
 #line 857 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp66_ = _ ("24 x 40 cm");
+	_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"
@@ -6196,7 +6196,7 @@ StandardPrintSize** print_manager_get_standard_sizes (PrintManager* self, int* r
 #line 860 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp70__length1 = _result__length1;
 #line 860 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp71_ = _ ("30 x 40 cm");
+	_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"
@@ -6378,7 +6378,7 @@ void print_manager_spool_photo (PrintManager* self, GeeCollection* to_print) {
 #line 889 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp12_ = _tmp11_;
 #line 889 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp13_ = _ ("Printing...");
+	_tmp13_ = _ ("Printing…");
 #line 889 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp14_ = self->priv->cancellable;
 #line 889 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -6415,7 +6415,7 @@ void print_manager_spool_photo (PrintManager* self, GeeCollection* to_print) {
 #line 893 "/home/jens/Source/shotwell/src/Printing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 6417 "Printing.c"
-			goto __catch457_g_error;
+			goto __catch470_g_error;
 		}
 #line 895 "/home/jens/Source/shotwell/src/Printing.vala"
 		if (_result_ == GTK_PRINT_OPERATION_RESULT_APPLY) {
@@ -6433,8 +6433,8 @@ void print_manager_spool_photo (PrintManager* self, GeeCollection* to_print) {
 #line 6433 "Printing.c"
 		}
 	}
-	goto __finally457;
-	__catch457_g_error:
+	goto __finally470;
+	__catch470_g_error:
 	{
 		GError* e = NULL;
 		GError* _tmp22_ = NULL;
@@ -6460,7 +6460,7 @@ void print_manager_spool_photo (PrintManager* self, GeeCollection* to_print) {
 		_g_error_free0 (e);
 #line 6461 "Printing.c"
 	}
-	__finally457:
+	__finally470:
 #line 892 "/home/jens/Source/shotwell/src/Printing.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 892 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -7984,7 +7984,7 @@ static void print_manager_fit_image_to_canvas (PrintManager* self, Photo* photo,
 #line 1089 "/home/jens/Source/shotwell/src/Printing.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 7986 "Printing.c"
-				goto __catch458_g_error;
+				goto __catch471_g_error;
 			}
 #line 1090 "/home/jens/Source/shotwell/src/Printing.vala"
 			_tmp52_ = photo_pixbuf;
@@ -8111,7 +8111,7 @@ static void print_manager_fit_image_to_canvas (PrintManager* self, Photo* photo,
 #line 1104 "/home/jens/Source/shotwell/src/Printing.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 8113 "Printing.c"
-				goto __catch458_g_error;
+				goto __catch471_g_error;
 			}
 #line 1105 "/home/jens/Source/shotwell/src/Printing.vala"
 			_tmp85_ = photo_pixbuf;
@@ -8137,8 +8137,8 @@ static void print_manager_fit_image_to_canvas (PrintManager* self, Photo* photo,
 		cairo_paint (_tmp89_);
 #line 8138 "Printing.c"
 	}
-	goto __finally458;
-	__catch458_g_error:
+	goto __finally471;
+	__catch471_g_error:
 	{
 		GError* e = NULL;
 		PrintJob* _tmp90_ = NULL;
@@ -8173,7 +8173,7 @@ static void print_manager_fit_image_to_canvas (PrintManager* self, Photo* photo,
 		_g_error_free0 (e);
 #line 8174 "Printing.c"
 	}
-	__finally458:
+	__finally471:
 #line 1086 "/home/jens/Source/shotwell/src/Printing.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1086 "/home/jens/Source/shotwell/src/Printing.vala"
diff --git a/src/Printing.vala b/src/Printing.vala
index 1f255b3..f099ed2 100644
--- a/src/Printing.vala
+++ b/src/Printing.vala
@@ -815,49 +815,49 @@ public class PrintManager {
     public StandardPrintSize[] get_standard_sizes() {
         StandardPrintSize[] result = new StandardPrintSize[0];
 
-        result += new StandardPrintSize(_("Wallet (2 x 3 in.)"),
+        result += new StandardPrintSize(_("Wallet (2 × 3 in.)"),
             Measurement(3, MeasurementUnit.INCHES),
             Measurement(2, MeasurementUnit.INCHES));
-        result += new StandardPrintSize(_("Notecard (3 x 5 in.)"),
+        result += new StandardPrintSize(_("Notecard (3 × 5 in.)"),
             Measurement(5, MeasurementUnit.INCHES),
             Measurement(3, MeasurementUnit.INCHES));
-        result += new StandardPrintSize(_("4 x 6 in."),
+        result += new StandardPrintSize(_("4 × 6 in."),
             Measurement(6, MeasurementUnit.INCHES),
             Measurement(4, MeasurementUnit.INCHES));
-        result += new StandardPrintSize(_("5 x 7 in."),
+        result += new StandardPrintSize(_("5 × 7 in."),
             Measurement(7, MeasurementUnit.INCHES),
             Measurement(5, MeasurementUnit.INCHES));
-        result += new StandardPrintSize(_("8 x 10 in."),
+        result += new StandardPrintSize(_("8 × 10 in."),
             Measurement(10, MeasurementUnit.INCHES),
             Measurement(8, MeasurementUnit.INCHES));
-        result += new StandardPrintSize(_("11 x 14 in."),
+        result += new StandardPrintSize(_("11 × 14 in."),
             Measurement(14, MeasurementUnit.INCHES),
             Measurement(11, MeasurementUnit.INCHES));
-        result += new StandardPrintSize(_("16 x 20 in."),
+        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 x 13 cm)"),
+        result += new StandardPrintSize(_("Metric Wallet (9 × 13 cm)"),
             Measurement(13, MeasurementUnit.CENTIMETERS),
             Measurement(9, MeasurementUnit.CENTIMETERS));
-        result += new StandardPrintSize(_("Postcard (10 x 15 cm)"),
+        result += new StandardPrintSize(_("Postcard (10 × 15 cm)"),
             Measurement(15, MeasurementUnit.CENTIMETERS),
             Measurement(10, MeasurementUnit.CENTIMETERS));
-        result += new StandardPrintSize(_("13 x 18 cm"),
+        result += new StandardPrintSize(_("13 × 18 cm"),
             Measurement(18, MeasurementUnit.CENTIMETERS),
             Measurement(13, MeasurementUnit.CENTIMETERS));
-        result += new StandardPrintSize(_("18 x 24 cm"),
+        result += new StandardPrintSize(_("18 × 24 cm"),
             Measurement(24, MeasurementUnit.CENTIMETERS),
             Measurement(18, MeasurementUnit.CENTIMETERS));
-        result += new StandardPrintSize(_("20 x 30 cm"),
+        result += new StandardPrintSize(_("20 × 30 cm"),
             Measurement(30, MeasurementUnit.CENTIMETERS),
             Measurement(20, MeasurementUnit.CENTIMETERS));
-        result += new StandardPrintSize(_("24 x 40 cm"),
+        result += new StandardPrintSize(_("24 × 40 cm"),
             Measurement(40, MeasurementUnit.CENTIMETERS),
             Measurement(24, MeasurementUnit.CENTIMETERS));
-        result += new StandardPrintSize(_("30 x 40 cm"),
+        result += new StandardPrintSize(_("30 × 40 cm"),
             Measurement(40, MeasurementUnit.CENTIMETERS),
             Measurement(30, MeasurementUnit.CENTIMETERS));
 
@@ -886,7 +886,7 @@ public class PrintManager {
         AppWindow.get_instance().set_busy_cursor();
         
         cancellable = new Cancellable();
-        progress_dialog = new ProgressDialog(AppWindow.get_instance(), _("Printing..."), cancellable);
+        progress_dialog = new ProgressDialog(AppWindow.get_instance(), _("Printing…"), cancellable);
         
         string? err_msg = null;
         try {
diff --git a/src/Properties.c b/src/Properties.c
index cf4eb43..2efd284 100644
--- a/src/Properties.c
+++ b/src/Properties.c
@@ -4471,7 +4471,7 @@ static void extended_properties_window_extended_properties_real_get_single_prope
 #line 540 "/home/jens/Source/shotwell/src/Properties.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 4474 "Properties.c"
-				goto __catch422_g_error;
+				goto __catch435_g_error;
 			}
 #line 540 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp23_ = _tmp20_;
@@ -4485,8 +4485,8 @@ static void extended_properties_window_extended_properties_real_get_single_prope
 			_media_metadata_unref0 (_tmp20_);
 #line 4487 "Properties.c"
 		}
-		goto __finally422;
-		__catch422_g_error:
+		goto __finally435;
+		__catch435_g_error:
 		{
 			GError* e = NULL;
 			Photo* _tmp24_ = NULL;
@@ -4507,7 +4507,7 @@ static void extended_properties_window_extended_properties_real_get_single_prope
 			_g_error_free0 (e);
 #line 4509 "Properties.c"
 		}
-		__finally422:
+		__finally435:
 #line 535 "/home/jens/Source/shotwell/src/Properties.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 535 "/home/jens/Source/shotwell/src/Properties.vala"
@@ -4799,7 +4799,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 4802 "Properties.c"
-				goto __catch423_g_regex_error;
+				goto __catch436_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);
@@ -4824,7 +4824,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 4827 "Properties.c"
-				goto __catch423_g_regex_error;
+				goto __catch436_g_regex_error;
 			}
 #line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			_g_regex_unref0 (regex);
@@ -4850,8 +4850,8 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		return result;
 #line 4852 "Properties.c"
 	}
-	goto __finally423;
-	__catch423_g_regex_error:
+	goto __finally436;
+	__catch436_g_regex_error:
 	{
 		GError* e = NULL;
 #line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -4864,7 +4864,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		_g_error_free0 (e);
 #line 4866 "Properties.c"
 	}
-	__finally423:
+	__finally436:
 #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 0143e70..2fb4a0d 100644
--- a/src/Resources.c
+++ b/src/Resources.c
@@ -305,7 +305,7 @@ GeeMap* resources_providers = NULL;
 #define RESOURCES_ZOOM_OUT_LABEL _ ("Zoom _Out")
 #define RESOURCES_ENHANCE_MENU _ ("_Enhance")
 #define RESOURCES_ENHANCE_LABEL _ ("Enhance")
-#define RESOURCES_ENHANCE_TOOLTIP _ ("Automatically improve the photo's appearance")
+#define RESOURCES_ENHANCE_TOOLTIP _ ("Automatically improve the photo’s appearance")
 #define RESOURCES_COPY_ADJUSTMENTS_MENU _ ("_Copy Color Adjustments")
 #define RESOURCES_COPY_ADJUSTMENTS_LABEL _ ("Copy Color Adjustments")
 #define RESOURCES_COPY_ADJUSTMENTS_TOOLTIP _ ("Copy the color adjustments applied to the photo")
@@ -314,7 +314,7 @@ GeeMap* resources_providers = NULL;
 #define RESOURCES_PASTE_ADJUSTMENTS_TOOLTIP _ ("Apply copied color adjustments to the selected photos")
 #define RESOURCES_CROP_MENU _ ("_Crop")
 #define RESOURCES_CROP_LABEL _ ("Crop")
-#define RESOURCES_CROP_TOOLTIP _ ("Crop the photo's size")
+#define RESOURCES_CROP_TOOLTIP _ ("Crop the photo’s size")
 #define RESOURCES_STRAIGHTEN_MENU _ ("_Straighten")
 #define RESOURCES_STRAIGHTEN_LABEL _ ("Straighten")
 #define RESOURCES_STRAIGHTEN_TOOLTIP _ ("Straighten the photo")
@@ -323,19 +323,19 @@ GeeMap* resources_providers = NULL;
 #define RESOURCES_RED_EYE_TOOLTIP _ ("Reduce or eliminate any red-eye effects in the photo")
 #define RESOURCES_ADJUST_MENU _ ("_Adjust")
 #define RESOURCES_ADJUST_LABEL _ ("Adjust")
-#define RESOURCES_ADJUST_TOOLTIP _ ("Adjust the photo's color and tone")
+#define RESOURCES_ADJUST_TOOLTIP _ ("Adjust the photo’s color and tone")
 #define RESOURCES_REVERT_MENU _ ("Re_vert to Original")
 #define RESOURCES_REVERT_LABEL _ ("Revert to Original")
 #define RESOURCES_REVERT_EDITABLE_MENU _ ("Revert External E_dits")
 #define RESOURCES_REVERT_EDITABLE_TOOLTIP _ ("Revert to the master photo")
 #define RESOURCES_SET_BACKGROUND_MENU _ ("Set as _Desktop Background")
 #define RESOURCES_SET_BACKGROUND_TOOLTIP _ ("Set selected image to be the new desktop background")
-#define RESOURCES_SET_BACKGROUND_SLIDESHOW_MENU _ ("Set as _Desktop Slideshow...")
+#define RESOURCES_SET_BACKGROUND_SLIDESHOW_MENU _ ("Set as _Desktop Slideshow…")
 #define RESOURCES_UNDO_MENU _ ("_Undo")
 #define RESOURCES_UNDO_LABEL _ ("Undo")
 #define RESOURCES_REDO_MENU _ ("_Redo")
 #define RESOURCES_REDO_LABEL _ ("Redo")
-#define RESOURCES_RENAME_EVENT_MENU _ ("Re_name Event...")
+#define RESOURCES_RENAME_EVENT_MENU _ ("Re_name Event…")
 #define RESOURCES_RENAME_EVENT_LABEL _ ("Rename Event")
 #define RESOURCES_MAKE_KEY_PHOTO_MENU _ ("Make _Key Photo for Event")
 #define RESOURCES_MAKE_KEY_PHOTO_LABEL _ ("Make Key Photo for Event")
@@ -371,35 +371,35 @@ GeeMap* resources_providers = NULL;
 #define RESOURCES_DISPLAY_UNRATED_OR_HIGHER_MENU _ ("_All Photos")
 #define RESOURCES_DISPLAY_UNRATED_OR_HIGHER_TOOLTIP _ ("Show all photos")
 #define RESOURCES_VIEW_RATINGS_MENU _ ("_Ratings")
-#define RESOURCES_VIEW_RATINGS_TOOLTIP _ ("Display each photo's rating")
+#define RESOURCES_VIEW_RATINGS_TOOLTIP _ ("Display each photo’s rating")
 #define RESOURCES_FILTER_PHOTOS_MENU _ ("_Filter Photos")
 #define RESOURCES_FILTER_PHOTOS_LABEL _ ("Filter Photos")
 #define RESOURCES_FILTER_PHOTOS_TOOLTIP _ ("Limit the number of photos displayed based on a filter")
 #define RESOURCES_DUPLICATE_PHOTO_MENU _ ("_Duplicate")
 #define RESOURCES_DUPLICATE_PHOTO_LABEL _ ("Duplicate")
 #define RESOURCES_DUPLICATE_PHOTO_TOOLTIP _ ("Make a duplicate of the photo")
-#define RESOURCES_EXPORT_MENU _ ("_Export...")
-#define RESOURCES_PRINT_MENU _ ("_Print...")
-#define RESOURCES_PUBLISH_MENU _ ("Pu_blish...")
+#define RESOURCES_EXPORT_MENU _ ("_Export…")
+#define RESOURCES_PRINT_MENU _ ("_Print…")
+#define RESOURCES_PUBLISH_MENU _ ("Pu_blish…")
 #define RESOURCES_PUBLISH_LABEL _ ("Publish")
 #define RESOURCES_PUBLISH_TOOLTIP _ ("Publish to various websites")
-#define RESOURCES_EDIT_TITLE_MENU _ ("Edit _Title...")
+#define RESOURCES_EDIT_TITLE_MENU _ ("Edit _Title…")
 #define RESOURCES_EDIT_TITLE_LABEL "Edit Title"
-#define RESOURCES_EDIT_COMMENT_MENU _ ("Edit _Comment...")
+#define RESOURCES_EDIT_COMMENT_MENU _ ("Edit _Comment…")
 #define RESOURCES_EDIT_COMMENT_LABEL _ ("Edit Comment")
-#define RESOURCES_EDIT_EVENT_COMMENT_MENU _ ("Edit Event _Comment...")
+#define RESOURCES_EDIT_EVENT_COMMENT_MENU _ ("Edit Event _Comment…")
 #define RESOURCES_EDIT_EVENT_COMMENT_LABEL _ ("Edit Event Comment")
-#define RESOURCES_ADJUST_DATE_TIME_MENU _ ("_Adjust Date and Time...")
+#define RESOURCES_ADJUST_DATE_TIME_MENU _ ("_Adjust Date and Time…")
 #define RESOURCES_ADJUST_DATE_TIME_LABEL _ ("Adjust Date and Time")
-#define RESOURCES_ADD_TAGS_MENU _ ("Add _Tags...")
-#define RESOURCES_ADD_TAGS_CONTEXT_MENU _ ("_Add Tags...")
+#define RESOURCES_ADD_TAGS_MENU _ ("Add _Tags…")
+#define RESOURCES_ADD_TAGS_CONTEXT_MENU _ ("_Add Tags…")
 #define RESOURCES_ADD_TAGS_TITLE "Add Tags"
 #define RESOURCES_PREFERENCES_MENU _ ("_Preferences")
 #define RESOURCES_EXTERNAL_EDIT_MENU _ ("Open With E_xternal Editor")
 #define RESOURCES_EXTERNAL_EDIT_RAW_MENU _ ("Open With RA_W Editor")
-#define RESOURCES_SEND_TO_MENU _ ("Send _To...")
-#define RESOURCES_SEND_TO_CONTEXT_MENU _ ("Send T_o...")
-#define RESOURCES_FIND_MENU _ ("_Find...")
+#define RESOURCES_SEND_TO_MENU _ ("Send _To…")
+#define RESOURCES_SEND_TO_CONTEXT_MENU _ ("Send T_o…")
+#define RESOURCES_FIND_MENU _ ("_Find…")
 #define RESOURCES_FIND_LABEL _ ("Find")
 #define RESOURCES_FIND_TOOLTIP _ ("Find an image by typing text that appears in its name or tags")
 #define RESOURCES_FLAG_MENU _ ("_Flag")
@@ -414,8 +414,8 @@ gchar* resources_delete_tag_label (const gchar* name);
 #define RESOURCES_NEW_CHILD_TAG_SIDEBAR_MENU _ ("_New")
 gchar* resources_rename_tag_menu (const gchar* name);
 gchar* resources_rename_tag_label (const gchar* old_name, const gchar* new_name);
-#define RESOURCES_RENAME_TAG_SIDEBAR_MENU _ ("_Rename...")
-#define RESOURCES_MODIFY_TAGS_MENU _ ("Modif_y Tags...")
+#define RESOURCES_RENAME_TAG_SIDEBAR_MENU _ ("_Rename…")
+#define RESOURCES_MODIFY_TAGS_MENU _ ("Modif_y Tags…")
 #define RESOURCES_MODIFY_TAGS_LABEL _ ("Modify Tags")
 gchar* resources_tag_photos_label (const gchar* name, gint count);
 gchar* resources_tag_photos_tooltip (const gchar* name, gint count);
@@ -426,8 +426,8 @@ gchar* resources_rename_search_exists_message (const gchar* name);
 #define RESOURCES_DEFAULT_SAVED_SEARCH_NAME _ ("Saved Search")
 #define RESOURCES_DELETE_SAVED_SEARCH_DIALOG_TITLE _ ("Delete Search")
 #define RESOURCES_DELETE_SEARCH_MENU _ ("_Delete")
-#define RESOURCES_EDIT_SEARCH_MENU _ ("_Edit...")
-#define RESOURCES_RENAME_SEARCH_MENU _ ("Re_name...")
+#define RESOURCES_EDIT_SEARCH_MENU _ ("_Edit…")
+#define RESOURCES_RENAME_SEARCH_MENU _ ("Re_name…")
 gchar* resources_rename_search_label (const gchar* old_name, const gchar* new_name);
 gchar* resources_delete_search_label (const gchar* name);
 GType rating_get_type (void) G_GNUC_CONST;
@@ -447,7 +447,7 @@ void resources_generate_rating_strings (void);
 #define RESOURCES_RESTORE_PHOTOS_MENU _ ("_Restore")
 #define RESOURCES_RESTORE_PHOTOS_TOOLTIP _ ("Move the selected photos back into the library")
 #define RESOURCES_JUMP_TO_FILE_MENU _ ("Show in File Mana_ger")
-#define RESOURCES_JUMP_TO_FILE_TOOLTIP _ ("Open the selected photo's directory in the file manager")
+#define RESOURCES_JUMP_TO_FILE_TOOLTIP _ ("Open the selected photo’s directory in the file manager")
 gchar* resources_jump_to_file_failed (GError* err);
 #define RESOURCES_REMOVE_FROM_LIBRARY_MENU _ ("R_emove From Library")
 #define RESOURCES_MOVE_TO_TRASH_MENU _ ("_Move to Trash")
@@ -539,7 +539,7 @@ gchar* resources_add_tags_label (gchar** names, int names_length1) {
 		gchar* _tmp6_ = NULL;
 		gchar* _tmp7_ = NULL;
 #line 340 "/home/jens/Source/shotwell/src/Resources.vala"
-		_tmp1_ = _ ("Add Tag \"%s\"");
+		_tmp1_ = _ ("Add Tag “%s”");
 #line 340 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp2_ = names;
 #line 340 "/home/jens/Source/shotwell/src/Resources.vala"
@@ -585,7 +585,7 @@ gchar* resources_add_tags_label (gchar** names, int names_length1) {
 			gchar* _tmp18_ = NULL;
 			gchar* _tmp19_ = NULL;
 #line 343 "/home/jens/Source/shotwell/src/Resources.vala"
-			_tmp9_ = _ ("Add Tags \"%s\" and \"%s\"");
+			_tmp9_ = _ ("Add Tags “%s” and “%s”");
 #line 343 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp10_ = names;
 #line 343 "/home/jens/Source/shotwell/src/Resources.vala"
@@ -644,7 +644,7 @@ gchar* resources_delete_tag_menu (const gchar* name) {
 #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"
-	_tmp0_ = _ ("_Delete Tag \"%s\"");
+	_tmp0_ = _ ("_Delete Tag “%s”");
 #line 353 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp1_ = name;
 #line 353 "/home/jens/Source/shotwell/src/Resources.vala"
@@ -665,7 +665,7 @@ gchar* resources_delete_tag_label (const gchar* name) {
 #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"
-	_tmp0_ = _ ("Delete Tag \"%s\"");
+	_tmp0_ = _ ("Delete Tag “%s”");
 #line 357 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp1_ = name;
 #line 357 "/home/jens/Source/shotwell/src/Resources.vala"
@@ -686,7 +686,7 @@ gchar* resources_rename_tag_menu (const gchar* name) {
 #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"
-	_tmp0_ = _ ("Re_name Tag \"%s\"...");
+	_tmp0_ = _ ("Re_name Tag “%s”…");
 #line 366 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp1_ = name;
 #line 366 "/home/jens/Source/shotwell/src/Resources.vala"
@@ -710,7 +710,7 @@ gchar* resources_rename_tag_label (const gchar* old_name, const gchar* new_name)
 #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"
-	_tmp0_ = _ ("Rename Tag \"%s\" to \"%s\"");
+	_tmp0_ = _ ("Rename Tag “%s” to “%s”");
 #line 370 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp1_ = old_name;
 #line 370 "/home/jens/Source/shotwell/src/Resources.vala"
@@ -740,14 +740,14 @@ gchar* resources_tag_photos_label (const gchar* name, gint count) {
 #line 713 "Resources.c"
 		const gchar* _tmp2_ = NULL;
 #line 379 "/home/jens/Source/shotwell/src/Resources.vala"
-		_tmp2_ = _ ("Tag Photo as \"%s\"");
+		_tmp2_ = _ ("Tag Photo as “%s”");
 #line 379 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp0_ = _tmp2_;
 #line 719 "Resources.c"
 	} else {
 		const gchar* _tmp3_ = NULL;
 #line 379 "/home/jens/Source/shotwell/src/Resources.vala"
-		_tmp3_ = _ ("Tag Photos as \"%s\"");
+		_tmp3_ = _ ("Tag Photos as “%s”");
 #line 379 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp0_ = _tmp3_;
 #line 726 "Resources.c"
@@ -779,14 +779,14 @@ gchar* resources_tag_photos_tooltip (const gchar* name, gint count) {
 #line 752 "Resources.c"
 		const gchar* _tmp2_ = NULL;
 #line 383 "/home/jens/Source/shotwell/src/Resources.vala"
-		_tmp2_ = _ ("Tag the selected photo as \"%s\"");
+		_tmp2_ = _ ("Tag the selected photo as “%s”");
 #line 383 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp0_ = _tmp2_;
 #line 758 "Resources.c"
 	} else {
 		const gchar* _tmp3_ = NULL;
 #line 384 "/home/jens/Source/shotwell/src/Resources.vala"
-		_tmp3_ = _ ("Tag the selected photos as \"%s\"");
+		_tmp3_ = _ ("Tag the selected photos as “%s”");
 #line 384 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp0_ = _tmp3_;
 #line 765 "Resources.c"
@@ -818,14 +818,14 @@ gchar* resources_untag_photos_menu (const gchar* name, gint count) {
 #line 791 "Resources.c"
 		const gchar* _tmp2_ = NULL;
 #line 388 "/home/jens/Source/shotwell/src/Resources.vala"
-		_tmp2_ = _ ("Remove Tag \"%s\" From _Photo");
+		_tmp2_ = _ ("Remove Tag “%s” From _Photo");
 #line 388 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp0_ = _tmp2_;
 #line 797 "Resources.c"
 	} else {
 		const gchar* _tmp3_ = NULL;
 #line 389 "/home/jens/Source/shotwell/src/Resources.vala"
-		_tmp3_ = _ ("Remove Tag \"%s\" From _Photos");
+		_tmp3_ = _ ("Remove Tag “%s” From _Photos");
 #line 389 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp0_ = _tmp3_;
 #line 804 "Resources.c"
@@ -857,14 +857,14 @@ gchar* resources_untag_photos_label (const gchar* name, gint count) {
 #line 830 "Resources.c"
 		const gchar* _tmp2_ = NULL;
 #line 393 "/home/jens/Source/shotwell/src/Resources.vala"
-		_tmp2_ = _ ("Remove Tag \"%s\" From Photo");
+		_tmp2_ = _ ("Remove Tag “%s” From Photo");
 #line 393 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp0_ = _tmp2_;
 #line 836 "Resources.c"
 	} else {
 		const gchar* _tmp3_ = NULL;
 #line 394 "/home/jens/Source/shotwell/src/Resources.vala"
-		_tmp3_ = _ ("Remove Tag \"%s\" From Photos");
+		_tmp3_ = _ ("Remove Tag “%s” From Photos");
 #line 394 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp0_ = _tmp3_;
 #line 843 "Resources.c"
@@ -889,7 +889,7 @@ gchar* resources_rename_tag_exists_message (const gchar* name) {
 #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_ = _ ("Unable to rename tag to \"%s\" because the tag already exists.");
+	_tmp0_ = _ ("Unable to rename tag to “%s” because the tag already exists.");
 #line 398 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp1_ = name;
 #line 398 "/home/jens/Source/shotwell/src/Resources.vala"
@@ -910,7 +910,7 @@ gchar* resources_rename_search_exists_message (const gchar* name) {
 #line 401 "/home/jens/Source/shotwell/src/Resources.vala"
 	g_return_val_if_fail (name != NULL, NULL);
 #line 402 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp0_ = _ ("Unable to rename search to \"%s\" because the search already exists.");
+	_tmp0_ = _ ("Unable to rename search to “%s” because the search already exists.");
 #line 402 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp1_ = name;
 #line 402 "/home/jens/Source/shotwell/src/Resources.vala"
@@ -934,7 +934,7 @@ gchar* resources_rename_search_label (const gchar* old_name, const gchar* new_na
 #line 413 "/home/jens/Source/shotwell/src/Resources.vala"
 	g_return_val_if_fail (new_name != NULL, NULL);
 #line 414 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp0_ = _ ("Rename Search \"%s\" to \"%s\"");
+	_tmp0_ = _ ("Rename Search “%s” to “%s”");
 #line 414 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp1_ = old_name;
 #line 414 "/home/jens/Source/shotwell/src/Resources.vala"
@@ -957,7 +957,7 @@ gchar* resources_delete_search_label (const gchar* name) {
 #line 417 "/home/jens/Source/shotwell/src/Resources.vala"
 	g_return_val_if_fail (name != NULL, NULL);
 #line 418 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp0_ = _ ("Delete Search \"%s\"");
+	_tmp0_ = _ ("Delete Search “%s”");
 #line 418 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp1_ = name;
 #line 418 "/home/jens/Source/shotwell/src/Resources.vala"
@@ -3063,7 +3063,7 @@ GdkPixbuf* resources_get_noninterpretable_badge_pixbuf (void) {
 #line 884 "/home/jens/Source/shotwell/src/Resources.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 3038 "Resources.c"
-				goto __catch416_g_error;
+				goto __catch429_g_error;
 			}
 #line 884 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp12_ = _tmp1_;
@@ -3077,8 +3077,8 @@ GdkPixbuf* resources_get_noninterpretable_badge_pixbuf (void) {
 			_g_object_unref0 (_tmp1_);
 #line 3051 "Resources.c"
 		}
-		goto __finally416;
-		__catch416_g_error:
+		goto __finally429;
+		__catch429_g_error:
 		{
 			GError* err = NULL;
 			const gchar* _tmp13_ = NULL;
@@ -3095,7 +3095,7 @@ GdkPixbuf* resources_get_noninterpretable_badge_pixbuf (void) {
 			_g_error_free0 (err);
 #line 3068 "Resources.c"
 		}
-		__finally416:
+		__finally429:
 #line 883 "/home/jens/Source/shotwell/src/Resources.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 883 "/home/jens/Source/shotwell/src/Resources.vala"
@@ -3420,7 +3420,7 @@ GdkPixbuf* resources_load_icon (const gchar* name, gint scale) {
 #line 943 "/home/jens/Source/shotwell/src/Resources.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 3394 "Resources.c"
-			goto __catch417_g_error;
+			goto __catch430_g_error;
 		}
 #line 943 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp12_ = _tmp4_;
@@ -3434,8 +3434,8 @@ GdkPixbuf* resources_load_icon (const gchar* name, gint scale) {
 		_g_object_unref0 (_tmp4_);
 #line 3407 "Resources.c"
 	}
-	goto __finally417;
-	__catch417_g_error:
+	goto __finally430;
+	__catch430_g_error:
 	{
 		GError* err = NULL;
 		const gchar* _tmp13_ = NULL;
@@ -3457,7 +3457,7 @@ GdkPixbuf* resources_load_icon (const gchar* name, gint scale) {
 		_g_error_free0 (err);
 #line 3430 "Resources.c"
 	}
-	__finally417:
+	__finally430:
 #line 942 "/home/jens/Source/shotwell/src/Resources.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 942 "/home/jens/Source/shotwell/src/Resources.vala"
@@ -3570,7 +3570,7 @@ void resources_add_stock_icon (GFile* file, const gchar* stock_id) {
 #line 957 "/home/jens/Source/shotwell/src/Resources.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 3544 "Resources.c"
-			goto __catch418_g_error;
+			goto __catch431_g_error;
 		}
 #line 957 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp6_ = _tmp0_;
@@ -3584,8 +3584,8 @@ void resources_add_stock_icon (GFile* file, const gchar* stock_id) {
 		_g_object_unref0 (_tmp0_);
 #line 3557 "Resources.c"
 	}
-	goto __finally418;
-	__catch418_g_error:
+	goto __finally431;
+	__catch431_g_error:
 	{
 		GError* err = NULL;
 		const gchar* _tmp7_ = NULL;
@@ -3607,7 +3607,7 @@ void resources_add_stock_icon (GFile* file, const gchar* stock_id) {
 		_g_error_free0 (err);
 #line 3580 "Resources.c"
 	}
-	__finally418:
+	__finally431:
 #line 956 "/home/jens/Source/shotwell/src/Resources.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 956 "/home/jens/Source/shotwell/src/Resources.vala"
@@ -3736,7 +3736,7 @@ void resources_add_stock_icon_from_themed_icon (GThemedIcon* gicon, const gchar*
 #line 981 "/home/jens/Source/shotwell/src/Resources.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 3710 "Resources.c"
-			goto __catch419_g_error;
+			goto __catch432_g_error;
 		}
 #line 982 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp16_ = modify;
@@ -3778,8 +3778,8 @@ void resources_add_stock_icon_from_themed_icon (GThemedIcon* gicon, const gchar*
 		_g_object_unref0 (pix);
 #line 3751 "Resources.c"
 	}
-	goto __finally419;
-	__catch419_g_error:
+	goto __finally432;
+	__catch432_g_error:
 	{
 		GError* err = NULL;
 		GError* _tmp24_ = NULL;
@@ -3798,7 +3798,7 @@ void resources_add_stock_icon_from_themed_icon (GThemedIcon* gicon, const gchar*
 		_g_error_free0 (err);
 #line 3771 "Resources.c"
 	}
-	__finally419:
+	__finally432:
 #line 980 "/home/jens/Source/shotwell/src/Resources.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 980 "/home/jens/Source/shotwell/src/Resources.vala"
@@ -4268,11 +4268,11 @@ void resources_style_widget (GtkWidget* widget, const gchar* stylesheet) {
 #line 1076 "/home/jens/Source/shotwell/src/Resources.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 4242 "Resources.c"
-			goto __catch420_g_error;
+			goto __catch433_g_error;
 		}
 	}
-	goto __finally420;
-	__catch420_g_error:
+	goto __finally433;
+	__catch433_g_error:
 	{
 		GError* e = NULL;
 		const gchar* _tmp14_ = NULL;
@@ -4298,7 +4298,7 @@ void resources_style_widget (GtkWidget* widget, const gchar* stylesheet) {
 		return;
 #line 4271 "Resources.c"
 	}
-	__finally420:
+	__finally433:
 #line 1075 "/home/jens/Source/shotwell/src/Resources.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1075 "/home/jens/Source/shotwell/src/Resources.vala"
diff --git a/src/Resources.vala b/src/Resources.vala
index 39f587b..138772e 100644
--- a/src/Resources.vala
+++ b/src/Resources.vala
@@ -185,7 +185,7 @@ along with Shotwell; if not, write to the Free Software Foundation, Inc.,
     
     public const string ENHANCE_MENU = _("_Enhance");
     public const string ENHANCE_LABEL = _("Enhance");
-    public const string ENHANCE_TOOLTIP = _("Automatically improve the photo's appearance");
+    public const string ENHANCE_TOOLTIP = _("Automatically improve the photo’s appearance");
     
     public const string COPY_ADJUSTMENTS_MENU = _("_Copy Color Adjustments");
     public const string COPY_ADJUSTMENTS_LABEL = _("Copy Color Adjustments");
@@ -197,7 +197,7 @@ along with Shotwell; if not, write to the Free Software Foundation, Inc.,
     
     public const string CROP_MENU = _("_Crop");
     public const string CROP_LABEL = _("Crop");
-    public const string CROP_TOOLTIP = _("Crop the photo's size");
+    public const string CROP_TOOLTIP = _("Crop the photo’s size");
 
     public const string STRAIGHTEN_MENU = _("_Straighten");
     public const string STRAIGHTEN_LABEL = _("Straighten");    
@@ -209,7 +209,7 @@ along with Shotwell; if not, write to the Free Software Foundation, Inc.,
     
     public const string ADJUST_MENU = _("_Adjust");
     public const string ADJUST_LABEL = _("Adjust");
-    public const string ADJUST_TOOLTIP = _("Adjust the photo's color and tone");
+    public const string ADJUST_TOOLTIP = _("Adjust the photo’s color and tone");
     
     public const string REVERT_MENU = _("Re_vert to Original");
     public const string REVERT_LABEL = _("Revert to Original");
@@ -219,7 +219,7 @@ along with Shotwell; if not, write to the Free Software Foundation, Inc.,
     
     public const string SET_BACKGROUND_MENU = _("Set as _Desktop Background");
     public const string SET_BACKGROUND_TOOLTIP = _("Set selected image to be the new desktop background");
-    public const string SET_BACKGROUND_SLIDESHOW_MENU = _("Set as _Desktop Slideshow...");
+    public const string SET_BACKGROUND_SLIDESHOW_MENU = _("Set as _Desktop Slideshow…");
     
     public const string UNDO_MENU = _("_Undo");
     public const string UNDO_LABEL = _("Undo");
@@ -227,7 +227,7 @@ along with Shotwell; if not, write to the Free Software Foundation, Inc.,
     public const string REDO_MENU = _("_Redo");
     public const string REDO_LABEL = _("Redo");
     
-    public const string RENAME_EVENT_MENU = _("Re_name Event...");
+    public const string RENAME_EVENT_MENU = _("Re_name Event…");
     public const string RENAME_EVENT_LABEL = _("Rename Event");
     
     public const string MAKE_KEY_PHOTO_MENU = _("Make _Key Photo for Event");
@@ -277,7 +277,7 @@ along with Shotwell; if not, write to the Free Software Foundation, Inc.,
     public const string DISPLAY_UNRATED_OR_HIGHER_TOOLTIP = _("Show all photos");
 
     public const string VIEW_RATINGS_MENU = _("_Ratings");
-    public const string VIEW_RATINGS_TOOLTIP = _("Display each photo's rating");
+    public const string VIEW_RATINGS_TOOLTIP = _("Display each photo’s rating");
 
     public const string FILTER_PHOTOS_MENU = _("_Filter Photos");
     public const string FILTER_PHOTOS_LABEL = _("Filter Photos");
@@ -287,30 +287,30 @@ along with Shotwell; if not, write to the Free Software Foundation, Inc.,
     public const string DUPLICATE_PHOTO_LABEL = _("Duplicate");
     public const string DUPLICATE_PHOTO_TOOLTIP = _("Make a duplicate of the photo");
 
-    public const string EXPORT_MENU = _("_Export...");
+    public const string EXPORT_MENU = _("_Export…");
     
-    public const string PRINT_MENU = _("_Print...");
+    public const string PRINT_MENU = _("_Print…");
     
-    public const string PUBLISH_MENU = _("Pu_blish...");
+    public const string PUBLISH_MENU = _("Pu_blish…");
     public const string PUBLISH_LABEL = _("Publish");
     public const string PUBLISH_TOOLTIP = _("Publish to various websites");
 
-    public const string EDIT_TITLE_MENU = _("Edit _Title...");
+    public const string EDIT_TITLE_MENU = _("Edit _Title…");
     // Button label
     public const string EDIT_TITLE_LABEL = NC_("Button Label", "Edit Title");
 
-    public const string EDIT_COMMENT_MENU = _("Edit _Comment...");
+    public const string EDIT_COMMENT_MENU = _("Edit _Comment…");
     // Button label
     public const string EDIT_COMMENT_LABEL = _("Edit Comment");
 
-    public const string EDIT_EVENT_COMMENT_MENU = _("Edit Event _Comment...");
+    public const string EDIT_EVENT_COMMENT_MENU = _("Edit Event _Comment…");
     public const string EDIT_EVENT_COMMENT_LABEL = _("Edit Event Comment");
 
-    public const string ADJUST_DATE_TIME_MENU = _("_Adjust Date and Time...");
+    public const string ADJUST_DATE_TIME_MENU = _("_Adjust Date and Time…");
     public const string ADJUST_DATE_TIME_LABEL = _("Adjust Date and Time");
     
-    public const string ADD_TAGS_MENU = _("Add _Tags...");
-    public const string ADD_TAGS_CONTEXT_MENU = _("_Add Tags...");
+    public const string ADD_TAGS_MENU = _("Add _Tags…");
+    public const string ADD_TAGS_CONTEXT_MENU = _("_Add Tags…");
     // Dialog title
     public const string ADD_TAGS_TITLE = NC_("Dialog Title", "Add Tags");
 
@@ -320,10 +320,10 @@ along with Shotwell; if not, write to the Free Software Foundation, Inc.,
     
     public const string EXTERNAL_EDIT_RAW_MENU = _("Open With RA_W Editor");
     
-    public const string SEND_TO_MENU = _("Send _To...");
-    public const string SEND_TO_CONTEXT_MENU = _("Send T_o...");
+    public const string SEND_TO_MENU = _("Send _To…");
+    public const string SEND_TO_CONTEXT_MENU = _("Send T_o…");
     
-    public const string FIND_MENU = _("_Find...");
+    public const string FIND_MENU = _("_Find…");
     public const string FIND_LABEL = _("Find");
     public const string FIND_TOOLTIP = _("Find an image by typing text that appears in its name or tags");
     
@@ -337,10 +337,10 @@ along with Shotwell; if not, write to the Free Software Foundation, Inc.,
     
     public string add_tags_label(string[] names) {
         if (names.length == 1) {
-            return _("Add Tag \"%s\"").printf(HierarchicalTagUtilities.get_basename(names[0]));
+            return _("Add Tag “%s”").printf(HierarchicalTagUtilities.get_basename(names[0]));
         } else if (names.length == 2) {
             // Used when adding two tags to photo(s)
-            return _("Add Tags \"%s\" and \"%s\"").printf(
+            return _("Add Tags “%s” and “%s”").printf(
                 HierarchicalTagUtilities.get_basename(names[0]),
                 HierarchicalTagUtilities.get_basename(names[1]));
         } else {
@@ -350,11 +350,11 @@ along with Shotwell; if not, write to the Free Software Foundation, Inc.,
     }
     
     public string delete_tag_menu(string name) {
-        return _("_Delete Tag \"%s\"").printf(name);
+        return _("_Delete Tag “%s”").printf(name);
     }
     
     public string delete_tag_label(string name) {
-        return _("Delete Tag \"%s\"").printf(name);
+        return _("Delete Tag “%s”").printf(name);
     }
     
     public const string DELETE_TAG_TITLE = _("Delete Tag");
@@ -363,43 +363,43 @@ along with Shotwell; if not, write to the Free Software Foundation, Inc.,
     public const string NEW_CHILD_TAG_SIDEBAR_MENU = _("_New");
     
     public string rename_tag_menu(string name) {
-        return _("Re_name Tag \"%s\"...").printf(name);
+        return _("Re_name Tag “%s”…").printf(name);
     }
     
     public string rename_tag_label(string old_name, string new_name) {
-        return _("Rename Tag \"%s\" to \"%s\"").printf(old_name, new_name);
+        return _("Rename Tag “%s” to “%s”").printf(old_name, new_name);
     }
     
-    public const string RENAME_TAG_SIDEBAR_MENU = _("_Rename...");
+    public const string RENAME_TAG_SIDEBAR_MENU = _("_Rename…");
     
-    public const string MODIFY_TAGS_MENU = _("Modif_y Tags...");
+    public const string MODIFY_TAGS_MENU = _("Modif_y Tags…");
     public const string MODIFY_TAGS_LABEL = _("Modify Tags");
     
     public string tag_photos_label(string name, int count) {
-        return ((count == 1) ? _("Tag Photo as \"%s\"") : _("Tag Photos as \"%s\"")).printf(name);
+        return ((count == 1) ? _("Tag Photo as “%s”") : _("Tag Photos as “%s”")).printf(name);
     }
     
     public string tag_photos_tooltip(string name, int count) {
-        return ((count == 1) ? _("Tag the selected photo as \"%s\"") :
-            _("Tag the selected photos as \"%s\"")).printf(name);
+        return ((count == 1) ? _("Tag the selected photo as “%s”") :
+            _("Tag the selected photos as “%s”")).printf(name);
     }
     
     public string untag_photos_menu(string name, int count) {
-        return ((count == 1) ? _("Remove Tag \"%s\" From _Photo") :
-            _("Remove Tag \"%s\" From _Photos")).printf(name);
+        return ((count == 1) ? _("Remove Tag “%s” From _Photo") :
+            _("Remove Tag “%s” From _Photos")).printf(name);
     }
     
     public string untag_photos_label(string name, int count) {
-        return ((count == 1) ? _("Remove Tag \"%s\" From Photo") :
-            _("Remove Tag \"%s\" From Photos")).printf(name);
+        return ((count == 1) ? _("Remove Tag “%s” From Photo") :
+            _("Remove Tag “%s” From Photos")).printf(name);
     }
     
     public static string rename_tag_exists_message(string name) {
-        return _("Unable to rename tag to \"%s\" because the tag already exists.").printf(name);
+        return _("Unable to rename tag to “%s” because the tag already exists.").printf(name);
     }
     
     public static string rename_search_exists_message(string name) {
-        return _("Unable to rename search to \"%s\" because the search already exists.").printf(name);
+        return _("Unable to rename search to “%s” because the search already exists.").printf(name);
     }
     
     public const string DEFAULT_SAVED_SEARCH_NAME = _("Saved Search");
@@ -407,15 +407,15 @@ along with Shotwell; if not, write to the Free Software Foundation, Inc.,
     public const string DELETE_SAVED_SEARCH_DIALOG_TITLE = _("Delete Search");
     
     public const string DELETE_SEARCH_MENU = _("_Delete");
-    public const string EDIT_SEARCH_MENU = _("_Edit...");
-    public const string RENAME_SEARCH_MENU = _("Re_name...");
+    public const string EDIT_SEARCH_MENU = _("_Edit…");
+    public const string RENAME_SEARCH_MENU = _("Re_name…");
     
     public string rename_search_label(string old_name, string new_name) {
-        return _("Rename Search \"%s\" to \"%s\"").printf(old_name, new_name);
+        return _("Rename Search “%s” to “%s”").printf(old_name, new_name);
     }
     
     public string delete_search_label(string name) {
-        return _("Delete Search \"%s\"").printf(name);
+        return _("Delete Search “%s”").printf(name);
     }
     
     private unowned string rating_menu(Rating rating) {
@@ -679,7 +679,7 @@ along with Shotwell; if not, write to the Free Software Foundation, Inc.,
     public const string RESTORE_PHOTOS_TOOLTIP = _("Move the selected photos back into the library");
     
     public const string JUMP_TO_FILE_MENU = _("Show in File Mana_ger");
-    public const string JUMP_TO_FILE_TOOLTIP = _("Open the selected photo's directory in the file manager");
+    public const string JUMP_TO_FILE_TOOLTIP = _("Open the selected photo’s directory in the file manager");
     
     public string jump_to_file_failed(Error err) {
         return _("Unable to open in file manager: %s").printf(err.message);
diff --git a/src/SearchFilter.c b/src/SearchFilter.c
index 7204a17..7723bcf 100644
--- a/src/SearchFilter.c
+++ b/src/SearchFilter.c
@@ -5855,11 +5855,11 @@ SearchFilterToolbar* search_filter_toolbar_construct (GType object_type, SearchF
 #line 1146 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 5858 "SearchFilter.c"
-			goto __catch580_g_error;
+			goto __catch593_g_error;
 		}
 	}
-	goto __finally580;
-	__catch580_g_error:
+	goto __finally593;
+	__catch593_g_error:
 	{
 		GError* err = NULL;
 		const gchar* _tmp14_ = NULL;
@@ -5897,7 +5897,7 @@ SearchFilterToolbar* search_filter_toolbar_construct (GType object_type, SearchF
 		_g_error_free0 (err);
 #line 5899 "SearchFilter.c"
 	}
-	__finally580:
+	__finally593:
 #line 1145 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1145 "/home/jens/Source/shotwell/src/SearchFilter.vala"
diff --git a/src/SlideshowPage.c b/src/SlideshowPage.c
index 0b471d6..119391a 100644
--- a/src/SlideshowPage.c
+++ b/src/SlideshowPage.c
@@ -1110,7 +1110,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 1113 "SlideshowPage.c"
-					goto __catch450_g_error;
+					goto __catch463_g_error;
 				}
 #line 225 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 				_tmp7_ = _tmp3_;
@@ -1124,8 +1124,8 @@ static gboolean slideshow_page_get_next_photo (SlideshowPage* self, Photo* start
 				_g_object_unref0 (_tmp3_);
 #line 1126 "SlideshowPage.c"
 			}
-			goto __finally450;
-			__catch450_g_error:
+			goto __finally463;
+			__catch463_g_error:
 			{
 				GError* err = NULL;
 				Photo* _tmp8_ = NULL;
@@ -1334,7 +1334,7 @@ static gboolean slideshow_page_get_next_photo (SlideshowPage* self, Photo* start
 				continue;
 #line 1336 "SlideshowPage.c"
 			}
-			__finally450:
+			__finally463:
 #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 ecb8dfb..0d9a04a 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 __catch459_database_error;
+				goto __catch472_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 __finally459;
-	__catch459_database_error:
+	goto __finally472;
+	__catch472_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"
 	}
-	__finally459:
+	__finally472:
 #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 __catch460_database_error;
+								goto __catch473_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 __finally460;
-					__catch460_database_error:
+					goto __finally473;
+					__catch473_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"
 					}
-					__finally460:
+					__finally473:
 #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 __catch461_database_error;
+				goto __catch474_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 __finally461;
-	__catch461_database_error:
+	goto __finally474;
+	__catch474_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"
 	}
-	__finally461:
+	__finally474:
 #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 __catch462_database_error;
+				goto __catch475_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 __finally462;
-	__catch462_database_error:
+	goto __finally475;
+	__catch475_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"
 	}
-	__finally462:
+	__finally475:
 #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 __catch463_database_error;
+				goto __catch476_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 __finally463;
-	__catch463_database_error:
+	goto __finally476;
+	__catch476_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"
 	}
-	__finally463:
+	__finally476:
 #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 __catch464_database_error;
+				goto __catch477_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 __finally464;
-	__catch464_database_error:
+	goto __finally477;
+	__catch477_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"
 	}
-	__finally464:
+	__finally477:
 #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 __catch465_database_error;
+				goto __catch478_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 __finally465;
-	__catch465_database_error:
+	goto __finally478;
+	__catch478_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"
 	}
-	__finally465:
+	__finally478:
 #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 __catch466_database_error;
+				goto __catch479_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 __finally466;
-	__catch466_database_error:
+	goto __finally479;
+	__catch479_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"
 	}
-	__finally466:
+	__finally479:
 #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 a68977d..aeb39de 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 __catch223_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 __finally223;
-	__catch223_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 __finally223;
+			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"
 	}
-	__finally223:
+	__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 __catch224_g_error;
+				goto __catch237_g_error;
 			}
 		}
-		goto __finally224;
-		__catch224_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"
 		}
-		__finally224:
+		__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 __catch225_g_error;
+			goto __catch238_g_error;
 		}
 	}
-	goto __finally225;
-	__catch225_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"
 	}
-	__finally225:
+	__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 __catch226_g_error;
+			goto __catch239_g_error;
 		}
 	}
-	goto __finally226;
-	__catch226_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"
 	}
-	__finally226:
+	__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 __catch227_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 __finally227;
-	__catch227_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 __catch228_g_error;
+					goto __catch241_g_error;
 				}
 			}
-			goto __finally228;
-			__catch228_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"
 			}
-			__finally228:
+			__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"
 	}
-	__finally227:
+	__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 f72cc11..01bf175 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 __catch535_database_error;
+				goto __catch548_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 __finally535;
-	__catch535_database_error:
+	goto __finally548;
+	__catch548_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"
 	}
-	__finally535:
+	__finally548:
 #line 93 "/home/jens/Source/shotwell/src/Tombstone.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 93 "/home/jens/Source/shotwell/src/Tombstone.vala"
@@ -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 __catch536_g_error;
+						goto __catch549_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 __finally536;
-				__catch536_g_error:
+				goto __finally549;
+				__catch549_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"
 				}
-				__finally536:
+				__finally549:
 #line 126 "/home/jens/Source/shotwell/src/Tombstone.vala"
 				if (G_UNLIKELY (_data_->_inner_error_ != NULL)) {
 #line 126 "/home/jens/Source/shotwell/src/Tombstone.vala"
@@ -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 __catch537_database_error;
+					goto __catch550_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 __finally537;
-		__catch537_database_error:
+		goto __finally550;
+		__catch550_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"
 		}
-		__finally537:
+		__finally550:
 #line 153 "/home/jens/Source/shotwell/src/Tombstone.vala"
 		if (G_UNLIKELY (_data_->_inner_error_ != NULL)) {
 #line 153 "/home/jens/Source/shotwell/src/Tombstone.vala"
@@ -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 __catch538_database_error;
+				goto __catch551_database_error;
 			}
 #line 211 "/home/jens/Source/shotwell/src/Tombstone.vala"
 			rows = (_vala_array_free (rows, rows_length1, (GDestroyNotify) tombstone_row_unref), NULL);
@@ -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 __finally538;
-	__catch538_database_error:
+	goto __finally551;
+	__catch551_database_error:
 	{
 		GError* err = NULL;
 		GError* _tmp8_ = NULL;
@@ -2423,7 +2423,7 @@ void tombstone_init (void) {
 		_g_error_free0 (err);
 #line 2424 "Tombstone.c"
 	}
-	__finally538:
+	__finally551:
 #line 210 "/home/jens/Source/shotwell/src/Tombstone.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 210 "/home/jens/Source/shotwell/src/Tombstone.vala"
@@ -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 __catch539_database_error;
+				goto __catch552_database_error;
 			}
 #line 297 "/home/jens/Source/shotwell/src/Tombstone.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -3221,8 +3221,8 @@ void tombstone_move (Tombstone* self, GFile* file) {
 #line 3221 "Tombstone.c"
 		}
 	}
-	goto __finally539;
-	__catch539_database_error:
+	goto __finally552;
+	__catch552_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"
 	}
-	__finally539:
+	__finally552:
 #line 296 "/home/jens/Source/shotwell/src/Tombstone.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 296 "/home/jens/Source/shotwell/src/Tombstone.vala"
@@ -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 __catch540_database_error;
+				goto __catch553_database_error;
 			}
 #line 328 "/home/jens/Source/shotwell/src/Tombstone.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -3468,8 +3468,8 @@ static void tombstone_real_destroy (DataSource* base) {
 #line 3468 "Tombstone.c"
 		}
 	}
-	goto __finally540;
-	__catch540_database_error:
+	goto __finally553;
+	__catch553_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"
 	}
-	__finally540:
+	__finally553:
 #line 327 "/home/jens/Source/shotwell/src/Tombstone.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 327 "/home/jens/Source/shotwell/src/Tombstone.vala"
diff --git a/src/Upgrades.c b/src/Upgrades.c
index 420cc7c..9d41ad1 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 __catch581_g_error;
+			goto __catch594_g_error;
 		}
 #line 73 "/home/jens/Source/shotwell/src/Upgrades.vala"
 		self->priv->num_mimics = _tmp0_;
 #line 1131 "Upgrades.c"
 	}
-	goto __finally581;
-	__catch581_g_error:
+	goto __finally594;
+	__catch594_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"
 	}
-	__finally581:
+	__finally594:
 #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 __catch582_g_error;
+			goto __catch595_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 __catch582_g_error;
+			goto __catch595_g_error;
 		}
 	}
-	goto __finally582;
-	__catch582_g_error:
+	goto __finally595;
+	__catch595_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"
 	}
-	__finally582:
+	__finally595:
 #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 15409fe..e6c388c 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 __catch563_g_error;
+			goto __catch576_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 __catch563_g_error;
+			goto __catch576_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 __catch563_g_error;
+					goto __catch576_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 __catch563_g_error;
+					goto __catch576_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 __finally563;
-	__catch563_g_error:
+	goto __finally576;
+	__catch576_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"
 	}
-	__finally563:
+	__finally576:
 #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 __catch564_g_error;
+			goto __catch577_g_error;
 		}
 	}
-	goto __finally564;
-	__catch564_g_error:
+	goto __finally577;
+	__catch577_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"
 	}
-	__finally564:
+	__finally577:
 #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 __catch565_g_error;
+			goto __catch578_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 __catch565_g_error;
+				goto __catch578_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 __catch565_g_error;
+						goto __catch578_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 __catch565_g_error;
+							goto __catch578_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 __catch565_g_error;
+							goto __catch578_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 __catch565_g_error;
+						goto __catch578_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 __catch565_g_error;
+				goto __catch578_g_error;
 			}
 		}
 	}
-	goto __finally565;
-	__catch565_g_error:
+	goto __finally578;
+	__catch578_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"
 	}
-	__finally565:
+	__finally578:
 #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 __catch566_g_error;
+			goto __catch579_g_error;
 		}
 	}
-	goto __finally566;
-	__catch566_g_error:
+	goto __finally579;
+	__catch579_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"
 	}
-	__finally566:
+	__finally579:
 #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 __catch567_g_error;
+			goto __catch580_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 __catch567_g_error;
+			goto __catch580_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 __catch567_g_error;
+				goto __catch580_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 __finally567;
-	__catch567_g_error:
+	goto __finally580;
+	__catch580_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"
 	}
-	__finally567:
+	__finally580:
 #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 __catch568_g_error;
+			goto __catch581_g_error;
 		}
 	}
-	goto __finally568;
-	__catch568_g_error:
+	goto __finally581;
+	__catch581_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"
 	}
-	__finally568:
+	__finally581:
 #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 __catch569_g_error;
+			goto __catch582_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 __catch569_g_error;
+			goto __catch582_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 __catch569_g_error;
+			goto __catch582_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 __finally569;
-	__catch569_g_error:
+	goto __finally582;
+	__catch582_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"
 	}
-	__finally569:
+	__finally582:
 #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 __catch570_g_error;
+			goto __catch583_g_error;
 		}
 	}
-	goto __finally570;
-	__catch570_g_error:
+	goto __finally583;
+	__catch583_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"
 	}
-	__finally570:
+	__finally583:
 #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 aad43f3..8529037 100644
--- a/src/VideoSupport.c
+++ b/src/VideoSupport.c
@@ -2322,7 +2322,7 @@ ImportResult video_reader_prepare_for_import (VideoImportParams* params) {
 #line 89 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 2325 "VideoSupport.c"
-			goto __catch482_g_error;
+			goto __catch495_g_error;
 		}
 #line 89 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp6_ = _tmp3_;
@@ -2336,8 +2336,8 @@ ImportResult video_reader_prepare_for_import (VideoImportParams* params) {
 		_g_object_unref0 (_tmp3_);
 #line 2338 "VideoSupport.c"
 	}
-	goto __finally482;
-	__catch482_g_error:
+	goto __finally495;
+	__catch495_g_error:
 	{
 		GError* err = NULL;
 #line 88 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -2356,7 +2356,7 @@ ImportResult video_reader_prepare_for_import (VideoImportParams* params) {
 		return result;
 #line 2358 "VideoSupport.c"
 	}
-	__finally482:
+	__finally495:
 #line 88 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 88 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -2475,7 +2475,7 @@ ImportResult video_reader_prepare_for_import (VideoImportParams* params) {
 #line 119 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (_inner_error_->domain == VIDEO_ERROR) {
 #line 2478 "VideoSupport.c"
-				goto __catch483_video_error;
+				goto __catch496_video_error;
 			}
 #line 119 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_object_unref0 (preview_frame);
@@ -2501,8 +2501,8 @@ ImportResult video_reader_prepare_for_import (VideoImportParams* params) {
 		clip_duration = _tmp26_;
 #line 2503 "VideoSupport.c"
 	}
-	goto __finally483;
-	__catch483_video_error:
+	goto __finally496;
+	__catch496_video_error:
 	{
 		GError* err = NULL;
 		GError* _tmp29_ = NULL;
@@ -2555,7 +2555,7 @@ ImportResult video_reader_prepare_for_import (VideoImportParams* params) {
 		_g_error_free0 (err);
 #line 2556 "VideoSupport.c"
 	}
-	__finally483:
+	__finally496:
 #line 118 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 118 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -2604,7 +2604,7 @@ ImportResult video_reader_prepare_for_import (VideoImportParams* params) {
 #line 132 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 2606 "VideoSupport.c"
-			goto __catch484_g_error;
+			goto __catch497_g_error;
 		}
 #line 133 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp33_ = metadata;
@@ -2700,8 +2700,8 @@ ImportResult video_reader_prepare_for_import (VideoImportParams* params) {
 		_media_metadata_unref0 (metadata);
 #line 2701 "VideoSupport.c"
 	}
-	goto __finally484;
-	__catch484_g_error:
+	goto __finally497;
+	__catch497_g_error:
 	{
 		GError* err = NULL;
 		GError* _tmp51_ = NULL;
@@ -2720,7 +2720,7 @@ ImportResult video_reader_prepare_for_import (VideoImportParams* params) {
 		_g_error_free0 (err);
 #line 2721 "VideoSupport.c"
 	}
-	__finally484:
+	__finally497:
 #line 131 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 131 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -3093,7 +3093,7 @@ static void video_reader_read_internal (VideoReader* self, GError** error) {
 #line 190 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 3095 "VideoSupport.c"
-			goto __catch485_g_error;
+			goto __catch498_g_error;
 		}
 #line 191 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp9_ = d;
@@ -3116,7 +3116,7 @@ static void video_reader_read_internal (VideoReader* self, GError** error) {
 #line 191 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_object_unref0 (d);
 #line 3118 "VideoSupport.c"
-			goto __catch485_g_error;
+			goto __catch498_g_error;
 		}
 #line 193 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp15_ = info;
@@ -3209,8 +3209,8 @@ static void video_reader_read_internal (VideoReader* self, GError** error) {
 		_g_object_unref0 (d);
 #line 3210 "VideoSupport.c"
 	}
-	goto __finally485;
-	__catch485_g_error:
+	goto __finally498;
+	__catch498_g_error:
 	{
 		GError* e = NULL;
 		GError* _tmp35_ = NULL;
@@ -3250,9 +3250,9 @@ static void video_reader_read_internal (VideoReader* self, GError** error) {
 #line 208 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_error_free0 (e);
 #line 3252 "VideoSupport.c"
-		goto __finally485;
+		goto __finally498;
 	}
-	__finally485:
+	__finally498:
 #line 189 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 189 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -3410,7 +3410,7 @@ static GdkPixbuf* video_reader_thumbnailer (VideoReader* self, const gchar* vide
 #line 231 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 3412 "VideoSupport.c"
-			goto __catch486_g_error;
+			goto __catch499_g_error;
 		}
 #line 234 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp14_ = self->priv->thumbnailer_pid;
@@ -3418,8 +3418,8 @@ static GdkPixbuf* video_reader_thumbnailer (VideoReader* self, const gchar* vide
 		g_debug ("VideoSupport.vala:234: Spawned thumbnailer, child pid: %d", (gint) _tmp14_);
 #line 3419 "VideoSupport.c"
 	}
-	goto __finally486;
-	__catch486_g_error:
+	goto __finally499;
+	__catch499_g_error:
 	{
 		GError* e = NULL;
 		GError* _tmp15_ = NULL;
@@ -3457,7 +3457,7 @@ static GdkPixbuf* video_reader_thumbnailer (VideoReader* self, const gchar* vide
 		return result;
 #line 3458 "VideoSupport.c"
 	}
-	__finally486:
+	__finally499:
 #line 230 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 230 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -3500,7 +3500,7 @@ static GdkPixbuf* video_reader_thumbnailer (VideoReader* self, const gchar* vide
 #line 249 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_object_unref0 (unix_input);
 #line 3502 "VideoSupport.c"
-			goto __catch487_g_error;
+			goto __catch500_g_error;
 		}
 #line 249 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp24_ = _tmp21_;
@@ -3516,8 +3516,8 @@ static GdkPixbuf* video_reader_thumbnailer (VideoReader* self, const gchar* vide
 		_g_object_unref0 (unix_input);
 #line 3517 "VideoSupport.c"
 	}
-	goto __finally487;
-	__catch487_g_error:
+	goto __finally500;
+	__catch500_g_error:
 	{
 		GError* e = NULL;
 		GError* _tmp25_ = NULL;
@@ -3540,7 +3540,7 @@ static GdkPixbuf* video_reader_thumbnailer (VideoReader* self, const gchar* vide
 		_g_error_free0 (e);
 #line 3541 "VideoSupport.c"
 	}
-	__finally487:
+	__finally500:
 #line 247 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 247 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -4223,15 +4223,12 @@ Video* video_new (VideoRow* row) {
 
 
 void video_init (ProgressMonitor monitor, void* monitor_target) {
-	gchar** fake_args = NULL;
-	gchar** _tmp0_ = NULL;
-	gint fake_args_length1 = 0;
-	gint _fake_args_size_ = 0;
-	gchar** fake_unowned_args = NULL;
-	gchar** _tmp1_ = NULL;
-	gint _tmp1__length1 = 0;
-	gint fake_unowned_args_length1 = 0;
-	gint _fake_unowned_args_size_ = 0;
+	gchar** args = NULL;
+	gint args_length1 = 0;
+	gint _args_size_ = 0;
+	GstRegistry* registry = NULL;
+	GstRegistry* _tmp0_ = NULL;
+	GstRegistry* _tmp1_ = NULL;
 	gint saved_state = 0;
 	ConfigFacade* _tmp2_ = NULL;
 	ConfigFacade* _tmp3_ = NULL;
@@ -4240,30 +4237,37 @@ void video_init (ProgressMonitor monitor, void* monitor_target) {
 	GstRegistry* _tmp6_ = NULL;
 	guint32 _tmp7_ = 0U;
 	gint _tmp8_ = 0;
-	VideoSourceCollection* _tmp11_ = NULL;
+	GstPluginFeature* feature = NULL;
+	GstRegistry* _tmp11_ = NULL;
+	GstPluginFeature* _tmp12_ = NULL;
+	GstPluginFeature* _tmp13_ = NULL;
+	GstRegistry* _tmp16_ = NULL;
+	GstPluginFeature* _tmp17_ = NULL;
+	GstPluginFeature* _tmp18_ = NULL;
+	VideoSourceCollection* _tmp21_ = NULL;
 	GeeArrayList* all = NULL;
-	VideoTable* _tmp12_ = NULL;
-	VideoTable* _tmp13_ = NULL;
-	GeeArrayList* _tmp14_ = NULL;
-	GeeArrayList* _tmp15_ = NULL;
+	VideoTable* _tmp22_ = NULL;
+	VideoTable* _tmp23_ = NULL;
+	GeeArrayList* _tmp24_ = NULL;
+	GeeArrayList* _tmp25_ = NULL;
 	GeeArrayList* all_videos = NULL;
-	GeeArrayList* _tmp16_ = NULL;
+	GeeArrayList* _tmp26_ = NULL;
 	GeeArrayList* trashed_videos = NULL;
-	GeeArrayList* _tmp17_ = NULL;
+	GeeArrayList* _tmp27_ = NULL;
 	GeeArrayList* offline_videos = NULL;
-	GeeArrayList* _tmp18_ = NULL;
+	GeeArrayList* _tmp28_ = NULL;
 	gint count = 0;
-	GeeArrayList* _tmp19_ = NULL;
-	gint _tmp20_ = 0;
-	gint _tmp21_ = 0;
-	VideoSourceCollection* _tmp48_ = NULL;
-	GeeArrayList* _tmp49_ = NULL;
-	VideoSourceCollection* _tmp50_ = NULL;
-	GeeArrayList* _tmp51_ = NULL;
-	VideoSourceCollection* _tmp52_ = NULL;
-	GeeArrayList* _tmp53_ = NULL;
-	GeeCollection* _tmp54_ = NULL;
-	GeeCollection* _tmp55_ = NULL;
+	GeeArrayList* _tmp29_ = NULL;
+	gint _tmp30_ = 0;
+	gint _tmp31_ = 0;
+	VideoSourceCollection* _tmp58_ = NULL;
+	GeeArrayList* _tmp59_ = NULL;
+	VideoSourceCollection* _tmp60_ = NULL;
+	GeeArrayList* _tmp61_ = NULL;
+	VideoSourceCollection* _tmp62_ = NULL;
+	GeeArrayList* _tmp63_ = NULL;
+	GeeCollection* _tmp64_ = NULL;
+	GeeCollection* _tmp65_ = NULL;
 #line 364 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video_interpreter_state_changed = FALSE;
 #line 365 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -4273,25 +4277,19 @@ void video_init (ProgressMonitor monitor, void* monitor_target) {
 #line 367 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video_offline_regen_complete = FALSE;
 #line 371 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp0_ = g_new0 (gchar*, 0 + 1);
-#line 371 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	fake_args = _tmp0_;
+	args = NULL;
 #line 371 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	fake_args_length1 = 0;
+	args_length1 = 0;
 #line 371 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_fake_args_size_ = fake_args_length1;
-#line 372 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp1_ = fake_args;
-#line 372 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp1__length1 = fake_args_length1;
+	_args_size_ = args_length1;
 #line 372 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	fake_unowned_args = _tmp1_;
-#line 372 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	fake_unowned_args_length1 = _tmp1__length1;
-#line 372 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_fake_unowned_args_size_ = fake_unowned_args_length1;
-#line 373 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	gst_init (&fake_unowned_args_length1, &fake_unowned_args);
+	gst_init (&args_length1, &args);
+#line 374 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	_tmp0_ = gst_registry_get ();
+#line 374 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	_tmp1_ = _g_object_ref0 (_tmp0_);
+#line 374 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	registry = _tmp1_;
 #line 375 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp2_ = config_facade_get_instance ();
 #line 375 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -4305,7 +4303,7 @@ void video_init (ProgressMonitor monitor, void* monitor_target) {
 #line 375 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	saved_state = _tmp5_;
 #line 376 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp6_ = gst_registry_get ();
+	_tmp6_ = registry;
 #line 376 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp7_ = gst_registry_get_feature_list_cookie (_tmp6_);
 #line 376 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -4319,7 +4317,7 @@ void video_init (ProgressMonitor monitor, void* monitor_target) {
 "l video thumbnails are out of date");
 #line 379 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		video_interpreter_state_changed = TRUE;
-#line 4321 "VideoSupport.c"
+#line 4319 "VideoSupport.c"
 	} else {
 		gint _tmp9_ = 0;
 		gint _tmp10_ = 0;
@@ -4334,222 +4332,266 @@ void video_init (ProgressMonitor monitor, void* monitor_target) {
 " may be out of date");
 #line 382 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			video_interpreter_state_changed = TRUE;
-#line 4335 "VideoSupport.c"
+#line 4333 "VideoSupport.c"
 		}
 	}
-#line 385 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp11_ = video_source_collection_new ();
-#line 385 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_data_collection_unref0 (video_global);
-#line 385 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	video_global = _tmp11_;
-#line 387 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp12_ = video_table_get_instance ();
-#line 387 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp13_ = _tmp12_;
-#line 387 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp14_ = video_table_get_all (_tmp13_);
-#line 387 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp15_ = _tmp14_;
-#line 387 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_database_table_unref0 (_tmp13_);
-#line 387 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	all = _tmp15_;
-#line 388 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp16_ = gee_array_list_new (TYPE_VIDEO, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
-#line 388 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	all_videos = _tmp16_;
-#line 389 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp17_ = gee_array_list_new (TYPE_VIDEO, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
-#line 389 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	trashed_videos = _tmp17_;
-#line 390 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp18_ = gee_array_list_new (TYPE_VIDEO, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
-#line 390 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	offline_videos = _tmp18_;
 #line 391 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp19_ = all;
+	_tmp11_ = registry;
 #line 391 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp20_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 391 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp21_ = _tmp20_;
+	_tmp12_ = gst_registry_find_feature (_tmp11_, "vaapidecodebin", gst_element_factory_get_type ());
 #line 391 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	count = _tmp21_;
-#line 4376 "VideoSupport.c"
-	{
-		gint ctr = 0;
-#line 392 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		ctr = 0;
-#line 4381 "VideoSupport.c"
-		{
-			gboolean _tmp22_ = FALSE;
-#line 392 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			_tmp22_ = TRUE;
-#line 392 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			while (TRUE) {
-#line 4388 "VideoSupport.c"
-				gint _tmp24_ = 0;
-				gint _tmp25_ = 0;
-				Video* video = NULL;
-				GeeArrayList* _tmp26_ = NULL;
-				gint _tmp27_ = 0;
-				gpointer _tmp28_ = NULL;
-				VideoRow* _tmp29_ = NULL;
-				Video* _tmp30_ = NULL;
-				Video* _tmp31_ = NULL;
-				gboolean _tmp32_ = FALSE;
-				Video* _tmp34_ = NULL;
-				gboolean _tmp35_ = FALSE;
-				ProgressMonitor _tmp44_ = NULL;
-				void* _tmp44__target = NULL;
-#line 392 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				if (!_tmp22_) {
-#line 4405 "VideoSupport.c"
-					gint _tmp23_ = 0;
-#line 392 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-					_tmp23_ = ctr;
-#line 392 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-					ctr = _tmp23_ + 1;
-#line 4411 "VideoSupport.c"
-				}
-#line 392 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				_tmp22_ = FALSE;
-#line 392 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				_tmp24_ = ctr;
-#line 392 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				_tmp25_ = count;
-#line 392 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				if (!(_tmp24_ < _tmp25_)) {
-#line 392 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-					break;
-#line 4423 "VideoSupport.c"
-				}
-#line 393 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				_tmp26_ = all;
+	feature = _tmp12_;
 #line 393 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				_tmp27_ = ctr;
+	_tmp13_ = feature;
 #line 393 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				_tmp28_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp27_);
-#line 393 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				_tmp29_ = (VideoRow*) _tmp28_;
-#line 393 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				_tmp30_ = video_new (_tmp29_);
-#line 393 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				_tmp31_ = _tmp30_;
-#line 393 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				_video_row_unref0 (_tmp29_);
-#line 393 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				video = _tmp31_;
-#line 395 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				_tmp32_ = video_interpreter_state_changed;
-#line 395 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				if (_tmp32_) {
-#line 4445 "VideoSupport.c"
-					Video* _tmp33_ = NULL;
-#line 396 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-					_tmp33_ = video;
-#line 396 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-					video_set_is_interpretable (_tmp33_, FALSE);
-#line 4451 "VideoSupport.c"
-				}
-#line 398 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				_tmp34_ = video;
-#line 398 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				_tmp35_ = media_source_is_trashed (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 398 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				if (_tmp35_) {
-#line 4459 "VideoSupport.c"
-					GeeArrayList* _tmp36_ = NULL;
-					Video* _tmp37_ = NULL;
-#line 399 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-					_tmp36_ = trashed_videos;
+	if (_tmp13_ != NULL) {
+#line 4346 "VideoSupport.c"
+		GstRegistry* _tmp14_ = NULL;
+		GstPluginFeature* _tmp15_ = NULL;
+#line 394 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+		_tmp14_ = registry;
+#line 394 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+		_tmp15_ = feature;
+#line 394 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+		gst_registry_remove_feature (_tmp14_, _tmp15_);
+#line 4355 "VideoSupport.c"
+	}
+#line 397 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	_tmp16_ = registry;
+#line 397 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	_tmp17_ = gst_registry_find_feature (_tmp16_, "vaapidecode", gst_element_factory_get_type ());
+#line 397 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	_g_object_unref0 (feature);
+#line 397 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	feature = _tmp17_;
 #line 399 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-					_tmp37_ = video;
+	_tmp18_ = feature;
 #line 399 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-					gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp37_);
-#line 4468 "VideoSupport.c"
-				} else {
-					Video* _tmp38_ = NULL;
-					gboolean _tmp39_ = FALSE;
+	if (_tmp18_ != NULL) {
+#line 4369 "VideoSupport.c"
+		GstRegistry* _tmp19_ = NULL;
+		GstPluginFeature* _tmp20_ = NULL;
 #line 400 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-					_tmp38_ = video;
+		_tmp19_ = registry;
 #line 400 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-					_tmp39_ = media_source_is_offline (G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, TYPE_MEDIA_SOURCE, MediaSource));
+		_tmp20_ = feature;
 #line 400 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-					if (_tmp39_) {
-#line 4478 "VideoSupport.c"
-						GeeArrayList* _tmp40_ = NULL;
-						Video* _tmp41_ = NULL;
-#line 401 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-						_tmp40_ = offline_videos;
-#line 401 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-						_tmp41_ = video;
-#line 401 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-						gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp41_);
-#line 4487 "VideoSupport.c"
-					} else {
-						GeeArrayList* _tmp42_ = NULL;
-						Video* _tmp43_ = NULL;
+		gst_registry_remove_feature (_tmp19_, _tmp20_);
+#line 4378 "VideoSupport.c"
+	}
 #line 403 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-						_tmp42_ = all_videos;
+	_tmp21_ = video_source_collection_new ();
 #line 403 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-						_tmp43_ = video;
+	_data_collection_unref0 (video_global);
 #line 403 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-						gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp43_);
-#line 4497 "VideoSupport.c"
-					}
-				}
+	video_global = _tmp21_;
 #line 405 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				_tmp44_ = monitor;
+	_tmp22_ = video_table_get_instance ();
 #line 405 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				_tmp44__target = monitor_target;
+	_tmp23_ = _tmp22_;
 #line 405 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				if (_tmp44_ != NULL) {
-#line 4506 "VideoSupport.c"
-					ProgressMonitor _tmp45_ = NULL;
-					void* _tmp45__target = NULL;
-					gint _tmp46_ = 0;
-					gint _tmp47_ = 0;
-#line 406 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-					_tmp45_ = monitor;
-#line 406 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-					_tmp45__target = monitor_target;
-#line 406 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-					_tmp46_ = ctr;
+	_tmp24_ = video_table_get_all (_tmp23_);
+#line 405 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	_tmp25_ = _tmp24_;
+#line 405 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	_database_table_unref0 (_tmp23_);
+#line 405 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	all = _tmp25_;
 #line 406 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-					_tmp47_ = count;
+	_tmp26_ = 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"
-					_tmp45_ ((guint64) _tmp46_, (guint64) _tmp47_, TRUE, _tmp45__target);
-#line 4521 "VideoSupport.c"
-				}
-#line 392 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				_g_object_unref0 (video);
-#line 4525 "VideoSupport.c"
-			}
-		}
-	}
+	all_videos = _tmp26_;
+#line 407 "/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 407 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	trashed_videos = _tmp27_;
+#line 408 "/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 408 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	offline_videos = _tmp28_;
+#line 409 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	_tmp29_ = all;
 #line 409 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp48_ = video_global;
+	_tmp30_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, GEE_TYPE_COLLECTION, GeeCollection));
 #line 409 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp49_ = trashed_videos;
+	_tmp31_ = _tmp30_;
 #line 409 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	media_source_collection_add_many_to_trash (G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, GEE_TYPE_COLLECTION, GeeCollection));
+	count = _tmp31_;
+#line 4418 "VideoSupport.c"
+	{
+		gint ctr = 0;
+#line 410 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+		ctr = 0;
+#line 4423 "VideoSupport.c"
+		{
+			gboolean _tmp32_ = FALSE;
+#line 410 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+			_tmp32_ = TRUE;
+#line 410 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+			while (TRUE) {
+#line 4430 "VideoSupport.c"
+				gint _tmp34_ = 0;
+				gint _tmp35_ = 0;
+				Video* video = NULL;
+				GeeArrayList* _tmp36_ = NULL;
+				gint _tmp37_ = 0;
+				gpointer _tmp38_ = NULL;
+				VideoRow* _tmp39_ = NULL;
+				Video* _tmp40_ = NULL;
+				Video* _tmp41_ = NULL;
+				gboolean _tmp42_ = FALSE;
+				Video* _tmp44_ = NULL;
+				gboolean _tmp45_ = FALSE;
+				ProgressMonitor _tmp54_ = NULL;
+				void* _tmp54__target = NULL;
+#line 410 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+				if (!_tmp32_) {
+#line 4447 "VideoSupport.c"
+					gint _tmp33_ = 0;
+#line 410 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+					_tmp33_ = ctr;
+#line 410 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+					ctr = _tmp33_ + 1;
+#line 4453 "VideoSupport.c"
+				}
+#line 410 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+				_tmp32_ = FALSE;
 #line 410 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp50_ = video_global;
+				_tmp34_ = ctr;
 #line 410 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp51_ = offline_videos;
+				_tmp35_ = count;
 #line 410 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	media_source_collection_add_many_to_offline (G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp51_, GEE_TYPE_COLLECTION, GeeCollection));
+				if (!(_tmp34_ < _tmp35_)) {
+#line 410 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+					break;
+#line 4465 "VideoSupport.c"
+				}
+#line 411 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+				_tmp36_ = all;
+#line 411 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+				_tmp37_ = ctr;
+#line 411 "/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 411 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp52_ = video_global;
+				_tmp39_ = (VideoRow*) _tmp38_;
 #line 411 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp53_ = all_videos;
+				_tmp40_ = video_new (_tmp39_);
 #line 411 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp54_ = data_collection_add_many (G_TYPE_CHECK_INSTANCE_CAST (_tmp52_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp53_, GEE_TYPE_COLLECTION, GeeCollection), NULL, NULL);
+				_tmp41_ = _tmp40_;
 #line 411 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp55_ = _tmp54_;
+				_video_row_unref0 (_tmp39_);
 #line 411 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_g_object_unref0 (_tmp55_);
+				video = _tmp41_;
+#line 413 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+				_tmp42_ = video_interpreter_state_changed;
+#line 413 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+				if (_tmp42_) {
+#line 4487 "VideoSupport.c"
+					Video* _tmp43_ = NULL;
+#line 414 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+					_tmp43_ = video;
+#line 414 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+					video_set_is_interpretable (_tmp43_, FALSE);
+#line 4493 "VideoSupport.c"
+				}
+#line 416 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+				_tmp44_ = video;
+#line 416 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+				_tmp45_ = media_source_is_trashed (G_TYPE_CHECK_INSTANCE_CAST (_tmp44_, TYPE_MEDIA_SOURCE, MediaSource));
+#line 416 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+				if (_tmp45_) {
+#line 4501 "VideoSupport.c"
+					GeeArrayList* _tmp46_ = NULL;
+					Video* _tmp47_ = NULL;
+#line 417 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+					_tmp46_ = trashed_videos;
+#line 417 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+					_tmp47_ = video;
+#line 417 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+					gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp47_);
+#line 4510 "VideoSupport.c"
+				} else {
+					Video* _tmp48_ = NULL;
+					gboolean _tmp49_ = FALSE;
+#line 418 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+					_tmp48_ = video;
+#line 418 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+					_tmp49_ = media_source_is_offline (G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, TYPE_MEDIA_SOURCE, MediaSource));
+#line 418 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+					if (_tmp49_) {
+#line 4520 "VideoSupport.c"
+						GeeArrayList* _tmp50_ = NULL;
+						Video* _tmp51_ = NULL;
+#line 419 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+						_tmp50_ = offline_videos;
+#line 419 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+						_tmp51_ = video;
+#line 419 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+						gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp51_);
+#line 4529 "VideoSupport.c"
+					} else {
+						GeeArrayList* _tmp52_ = NULL;
+						Video* _tmp53_ = NULL;
+#line 421 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+						_tmp52_ = all_videos;
+#line 421 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+						_tmp53_ = video;
+#line 421 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+						gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp52_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp53_);
+#line 4539 "VideoSupport.c"
+					}
+				}
+#line 423 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+				_tmp54_ = monitor;
+#line 423 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+				_tmp54__target = monitor_target;
+#line 423 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+				if (_tmp54_ != NULL) {
+#line 4548 "VideoSupport.c"
+					ProgressMonitor _tmp55_ = NULL;
+					void* _tmp55__target = NULL;
+					gint _tmp56_ = 0;
+					gint _tmp57_ = 0;
+#line 424 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+					_tmp55_ = monitor;
+#line 424 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+					_tmp55__target = monitor_target;
+#line 424 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+					_tmp56_ = ctr;
+#line 424 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+					_tmp57_ = count;
+#line 424 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+					_tmp55_ ((guint64) _tmp56_, (guint64) _tmp57_, TRUE, _tmp55__target);
+#line 4563 "VideoSupport.c"
+				}
+#line 410 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+				_g_object_unref0 (video);
+#line 4567 "VideoSupport.c"
+			}
+		}
+	}
+#line 427 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	_tmp58_ = video_global;
+#line 427 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	_tmp59_ = trashed_videos;
+#line 427 "/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 428 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	_tmp60_ = video_global;
+#line 428 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	_tmp61_ = offline_videos;
+#line 428 "/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 429 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	_tmp62_ = video_global;
+#line 429 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	_tmp63_ = all_videos;
+#line 429 "/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 429 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	_tmp65_ = _tmp64_;
+#line 429 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	_g_object_unref0 (_tmp65_);
 #line 360 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (offline_videos);
 #line 360 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -4559,21 +4601,23 @@ void video_init (ProgressMonitor monitor, void* monitor_target) {
 #line 360 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (all);
 #line 360 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	fake_args = (_vala_array_free (fake_args, fake_args_length1, (GDestroyNotify) g_free), NULL);
-#line 4561 "VideoSupport.c"
+	_g_object_unref0 (feature);
+#line 360 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	_g_object_unref0 (registry);
+#line 4605 "VideoSupport.c"
 }
 
 
 gboolean video_has_interpreter_state_changed (void) {
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
-#line 415 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 433 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = video_interpreter_state_changed;
-#line 415 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 433 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = _tmp0_;
-#line 415 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 433 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 4574 "VideoSupport.c"
+#line 4618 "VideoSupport.c"
 }
 
 
@@ -4581,39 +4625,39 @@ void video_notify_normal_thumbs_regenerated (void) {
 	gboolean _tmp0_ = FALSE;
 	gboolean _tmp1_ = FALSE;
 	gboolean _tmp2_ = FALSE;
-#line 419 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 437 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = video_normal_regen_complete;
-#line 419 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 437 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp0_) {
-#line 420 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 438 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return;
-#line 4588 "VideoSupport.c"
+#line 4632 "VideoSupport.c"
 	}
-#line 422 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	g_message ("VideoSupport.vala:422: normal video thumbnail regeneration completed");
-#line 424 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 440 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	g_message ("VideoSupport.vala:440: normal video thumbnail regeneration completed");
+#line 442 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video_normal_regen_complete = TRUE;
-#line 425 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 443 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp2_ = video_normal_regen_complete;
-#line 425 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 443 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp2_) {
-#line 4598 "VideoSupport.c"
+#line 4642 "VideoSupport.c"
 		gboolean _tmp3_ = FALSE;
-#line 425 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 443 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp3_ = video_offline_regen_complete;
-#line 425 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 443 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp1_ = _tmp3_;
-#line 4604 "VideoSupport.c"
+#line 4648 "VideoSupport.c"
 	} else {
-#line 425 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 443 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp1_ = FALSE;
-#line 4608 "VideoSupport.c"
+#line 4652 "VideoSupport.c"
 	}
-#line 425 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 443 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp1_) {
-#line 426 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 444 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		video_save_interpreter_state ();
-#line 4614 "VideoSupport.c"
+#line 4658 "VideoSupport.c"
 	}
 }
 
@@ -4622,69 +4666,69 @@ void video_notify_offline_thumbs_regenerated (void) {
 	gboolean _tmp0_ = FALSE;
 	gboolean _tmp1_ = FALSE;
 	gboolean _tmp2_ = FALSE;
-#line 430 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 448 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = video_offline_regen_complete;
-#line 430 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 448 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp0_) {
-#line 431 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 449 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return;
-#line 4629 "VideoSupport.c"
+#line 4673 "VideoSupport.c"
 	}
-#line 433 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	g_message ("VideoSupport.vala:433: offline video thumbnail regeneration completed");
-#line 435 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 451 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	g_message ("VideoSupport.vala:451: offline video thumbnail regeneration completed");
+#line 453 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video_offline_regen_complete = TRUE;
-#line 436 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 454 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp2_ = video_normal_regen_complete;
-#line 436 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 454 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp2_) {
-#line 4639 "VideoSupport.c"
+#line 4683 "VideoSupport.c"
 		gboolean _tmp3_ = FALSE;
-#line 436 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 454 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp3_ = video_offline_regen_complete;
-#line 436 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 454 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp1_ = _tmp3_;
-#line 4645 "VideoSupport.c"
+#line 4689 "VideoSupport.c"
 	} else {
-#line 436 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 454 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp1_ = FALSE;
-#line 4649 "VideoSupport.c"
+#line 4693 "VideoSupport.c"
 	}
-#line 436 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 454 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp1_) {
-#line 437 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 455 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		video_save_interpreter_state ();
-#line 4655 "VideoSupport.c"
+#line 4699 "VideoSupport.c"
 	}
 }
 
 
 static void video_save_interpreter_state (void) {
 	gboolean _tmp0_ = FALSE;
-#line 441 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 459 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = video_interpreter_state_changed;
-#line 441 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 459 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp0_) {
-#line 4666 "VideoSupport.c"
+#line 4710 "VideoSupport.c"
 		ConfigFacade* _tmp1_ = NULL;
 		ConfigFacade* _tmp2_ = NULL;
 		gint _tmp3_ = 0;
-#line 442 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		g_message ("VideoSupport.vala:442: saving video interpreter state to configuration" \
+#line 460 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+		g_message ("VideoSupport.vala:460: saving video interpreter state to configuration" \
 " system");
-#line 444 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 462 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp1_ = config_facade_get_instance ();
-#line 444 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 462 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp2_ = _tmp1_;
-#line 444 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 462 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp3_ = video_current_state;
-#line 444 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 462 "/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 444 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 462 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (_tmp2_);
-#line 445 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 463 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		video_interpreter_state_changed = FALSE;
-#line 4684 "VideoSupport.c"
+#line 4728 "VideoSupport.c"
 	}
 }
 
@@ -4719,27 +4763,27 @@ ExporterUI* video_export_many (GeeCollection* videos, ExporterCompletionCallback
 	ExporterCompletionCallback _tmp51_ = NULL;
 	void* _tmp51__target = NULL;
 	GError * _inner_error_ = NULL;
-#line 452 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 470 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (GEE_IS_COLLECTION (videos), NULL);
-#line 454 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 472 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = videos;
-#line 454 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 472 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp1_ = gee_collection_get_size (_tmp0_);
-#line 454 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 472 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp2_ = _tmp1_;
-#line 454 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 472 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp2_ == 0) {
-#line 455 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 473 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		result = NULL;
-#line 455 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 473 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return result;
-#line 4733 "VideoSupport.c"
+#line 4777 "VideoSupport.c"
 	}
-#line 458 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 476 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp3_ = export_in_place;
-#line 458 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 476 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp3_) {
-#line 4739 "VideoSupport.c"
+#line 4783 "VideoSupport.c"
 		ExporterUI* temp_exporter = NULL;
 		GeeCollection* _tmp4_ = NULL;
 		Scaling _tmp5_ = {0};
@@ -4751,47 +4795,47 @@ ExporterUI* video_export_many (GeeCollection* videos, ExporterCompletionCallback
 		ExporterUI* _tmp11_ = NULL;
 		ExporterCompletionCallback _tmp12_ = NULL;
 		void* _tmp12__target = NULL;
-#line 459 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 477 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp4_ = videos;
-#line 459 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 477 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		scaling_for_original (&_tmp5_);
-#line 459 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 477 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		export_format_parameters_unmodified (&_tmp6_);
-#line 459 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 477 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp7_ = exporter_new_for_temp_file (_tmp4_, &_tmp5_, &_tmp6_);
-#line 459 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 477 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp8_ = _tmp7_;
-#line 459 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 477 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp9_ = exporter_ui_new (_tmp8_);
-#line 459 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 477 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp10_ = _tmp9_;
-#line 459 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 477 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (_tmp8_);
-#line 459 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 477 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		temp_exporter = _tmp10_;
-#line 461 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 479 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp11_ = temp_exporter;
-#line 461 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 479 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp12_ = done;
-#line 461 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 479 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp12__target = done_target;
-#line 461 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 479 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		exporter_ui_export (_tmp11_, _tmp12_, _tmp12__target);
-#line 462 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 480 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		result = temp_exporter;
-#line 462 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 480 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return result;
-#line 4781 "VideoSupport.c"
+#line 4825 "VideoSupport.c"
 	}
-#line 466 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 484 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp13_ = videos;
-#line 466 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 484 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp14_ = gee_collection_get_size (_tmp13_);
-#line 466 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 484 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp15_ = _tmp14_;
-#line 466 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 484 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp15_ == 1) {
-#line 4791 "VideoSupport.c"
+#line 4835 "VideoSupport.c"
 		Video* video = NULL;
 		GFile* save_as = NULL;
 		Video* _tmp24_ = NULL;
@@ -4800,22 +4844,22 @@ ExporterUI* video_export_many (GeeCollection* videos, ExporterCompletionCallback
 		GFile* _tmp27_ = NULL;
 		GFile* _tmp28_ = NULL;
 		GFile* _tmp29_ = NULL;
-#line 467 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 485 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		video = NULL;
-#line 4802 "VideoSupport.c"
+#line 4846 "VideoSupport.c"
 		{
 			GeeIterator* _v_it = NULL;
 			GeeCollection* _tmp16_ = NULL;
 			GeeIterator* _tmp17_ = NULL;
-#line 468 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 486 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp16_ = videos;
-#line 468 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 486 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp17_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 468 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 486 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_v_it = _tmp17_;
-#line 468 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 486 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			while (TRUE) {
-#line 4815 "VideoSupport.c"
+#line 4859 "VideoSupport.c"
 				GeeIterator* _tmp18_ = NULL;
 				gboolean _tmp19_ = FALSE;
 				Video* v = NULL;
@@ -4823,67 +4867,67 @@ ExporterUI* video_export_many (GeeCollection* videos, ExporterCompletionCallback
 				gpointer _tmp21_ = NULL;
 				Video* _tmp22_ = NULL;
 				Video* _tmp23_ = NULL;
-#line 468 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 486 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp18_ = _v_it;
-#line 468 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 486 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp19_ = gee_iterator_next (_tmp18_);
-#line 468 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 486 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				if (!_tmp19_) {
-#line 468 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 486 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					break;
-#line 4831 "VideoSupport.c"
+#line 4875 "VideoSupport.c"
 				}
-#line 468 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 486 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp20_ = _v_it;
-#line 468 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 486 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp21_ = gee_iterator_get (_tmp20_);
-#line 468 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 486 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				v = (Video*) _tmp21_;
-#line 469 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 487 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp22_ = v;
-#line 469 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 487 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp23_ = _g_object_ref0 (_tmp22_);
-#line 469 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 487 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_object_unref0 (video);
-#line 469 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 487 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				video = _tmp23_;
-#line 470 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 488 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_object_unref0 (v);
-#line 470 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 488 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				break;
-#line 4851 "VideoSupport.c"
+#line 4895 "VideoSupport.c"
 			}
-#line 468 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 486 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_object_unref0 (_v_it);
-#line 4855 "VideoSupport.c"
+#line 4899 "VideoSupport.c"
 		}
-#line 473 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 491 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp24_ = video;
-#line 473 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 491 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp25_ = media_source_get_basename (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 473 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 491 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp26_ = _tmp25_;
-#line 473 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 491 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp27_ = export_ui_choose_file (_tmp26_);
-#line 473 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 491 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp28_ = _tmp27_;
-#line 473 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 491 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_free0 (_tmp26_);
-#line 473 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 491 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		save_as = _tmp28_;
-#line 474 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 492 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp29_ = save_as;
-#line 474 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 492 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (_tmp29_ == NULL) {
-#line 475 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 493 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			result = NULL;
-#line 475 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 493 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_object_unref0 (save_as);
-#line 475 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 493 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_object_unref0 (video);
-#line 475 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 493 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return result;
-#line 4883 "VideoSupport.c"
+#line 4927 "VideoSupport.c"
 		}
 		{
 			AppWindow* _tmp30_ = NULL;
@@ -4892,270 +4936,270 @@ ExporterUI* video_export_many (GeeCollection* videos, ExporterCompletionCallback
 			GFile* _tmp33_ = NULL;
 			AppWindow* _tmp34_ = NULL;
 			AppWindow* _tmp35_ = NULL;
-#line 478 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 496 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp30_ = app_window_get_instance ();
-#line 478 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 496 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp31_ = _tmp30_;
-#line 478 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 496 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			page_window_set_busy_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, TYPE_PAGE_WINDOW, PageWindow));
-#line 478 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 496 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_object_unref0 (_tmp31_);
-#line 479 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 497 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp32_ = video;
-#line 479 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 497 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp33_ = save_as;
-#line 479 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 497 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			video_export (_tmp32_, _tmp33_, &_inner_error_);
-#line 479 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 497 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 4908 "VideoSupport.c"
-				goto __catch488_g_error;
+#line 4952 "VideoSupport.c"
+				goto __catch501_g_error;
 			}
-#line 480 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 498 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp34_ = app_window_get_instance ();
-#line 480 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 498 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp35_ = _tmp34_;
-#line 480 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 498 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, TYPE_PAGE_WINDOW, PageWindow));
-#line 480 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 498 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_object_unref0 (_tmp35_);
-#line 4919 "VideoSupport.c"
+#line 4963 "VideoSupport.c"
 		}
-		goto __finally488;
-		__catch488_g_error:
+		goto __finally501;
+		__catch501_g_error:
 		{
 			GError* err = NULL;
 			AppWindow* _tmp36_ = NULL;
 			AppWindow* _tmp37_ = NULL;
 			GFile* _tmp38_ = NULL;
-#line 477 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 495 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			err = _inner_error_;
-#line 477 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 495 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_inner_error_ = NULL;
-#line 482 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 500 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp36_ = app_window_get_instance ();
-#line 482 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 500 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp37_ = _tmp36_;
-#line 482 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 500 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, TYPE_PAGE_WINDOW, PageWindow));
-#line 482 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 500 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_object_unref0 (_tmp37_);
-#line 483 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 501 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp38_ = save_as;
-#line 483 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 501 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			export_error_dialog (_tmp38_, FALSE);
-#line 477 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 495 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_error_free0 (err);
-#line 4946 "VideoSupport.c"
+#line 4990 "VideoSupport.c"
 		}
-		__finally488:
-#line 477 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+		__finally501:
+#line 495 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 477 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 495 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_object_unref0 (save_as);
-#line 477 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 495 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_object_unref0 (video);
-#line 477 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 495 "/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 477 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 495 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_clear_error (&_inner_error_);
-#line 477 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 495 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return NULL;
-#line 4961 "VideoSupport.c"
+#line 5005 "VideoSupport.c"
 		}
-#line 486 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 504 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		result = NULL;
-#line 486 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 504 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (save_as);
-#line 486 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 504 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (video);
-#line 486 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 504 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return result;
-#line 4971 "VideoSupport.c"
+#line 5015 "VideoSupport.c"
 	}
-#line 490 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 508 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp39_ = _ ("Export Videos");
-#line 490 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 508 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp40_ = export_ui_choose_dir (_tmp39_);
-#line 490 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 508 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	export_dir = _tmp40_;
-#line 491 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 509 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp41_ = export_dir;
-#line 491 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 509 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp41_ == NULL) {
-#line 492 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 510 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		result = NULL;
-#line 492 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 510 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (export_dir);
-#line 492 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 510 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return result;
-#line 4989 "VideoSupport.c"
+#line 5033 "VideoSupport.c"
 	}
-#line 494 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 512 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp42_ = videos;
-#line 494 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 512 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp43_ = export_dir;
-#line 494 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 512 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	scaling_for_original (&_tmp44_);
-#line 494 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 512 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	export_format_parameters_unmodified (&_tmp45_);
-#line 494 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 512 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp46_ = exporter_new (_tmp42_, _tmp43_, &_tmp44_, &_tmp45_, FALSE);
-#line 494 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 512 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp47_ = _tmp46_;
-#line 494 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 512 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp48_ = exporter_ui_new (_tmp47_);
-#line 494 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 512 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp49_ = _tmp48_;
-#line 494 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 512 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (_tmp47_);
-#line 494 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 512 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	exporter = _tmp49_;
-#line 496 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 514 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp50_ = exporter;
-#line 496 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 514 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp51_ = done;
-#line 496 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 514 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp51__target = done_target;
-#line 496 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 514 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	exporter_ui_export (_tmp50_, _tmp51_, _tmp51__target);
-#line 498 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 516 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = exporter;
-#line 498 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 516 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (export_dir);
-#line 498 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 516 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 5025 "VideoSupport.c"
+#line 5069 "VideoSupport.c"
 }
 
 
 static void video_real_commit_backlinks (DataSource* base, SourceCollection* sources, const gchar* backlinks) {
 	Video * self;
 	GError * _inner_error_ = NULL;
-#line 501 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 519 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 501 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 519 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail ((sources == NULL) || IS_SOURCE_COLLECTION (sources));
-#line 5036 "VideoSupport.c"
+#line 5080 "VideoSupport.c"
 	{
 		VideoTable* _tmp0_ = NULL;
 		VideoTable* _tmp1_ = NULL;
 		VideoID _tmp2_ = {0};
 		const gchar* _tmp3_ = NULL;
-#line 503 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 521 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = video_table_get_instance ();
-#line 503 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 521 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp1_ = _tmp0_;
-#line 503 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 521 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		video_get_video_id (self, &_tmp2_);
-#line 503 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 521 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp3_ = backlinks;
-#line 503 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 521 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		video_table_update_backlinks (_tmp1_, &_tmp2_, _tmp3_, &_inner_error_);
-#line 503 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 521 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_database_table_unref0 (_tmp1_);
-#line 503 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 521 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 503 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 521 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
-#line 5058 "VideoSupport.c"
-				goto __catch489_database_error;
+#line 5102 "VideoSupport.c"
+				goto __catch502_database_error;
 			}
-#line 503 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 521 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 503 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 521 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_clear_error (&_inner_error_);
-#line 503 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 521 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return;
-#line 5067 "VideoSupport.c"
+#line 5111 "VideoSupport.c"
 		}
 		{
 			VideoRow* _tmp4_ = NULL;
-#line 504 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 522 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp4_ = self->priv->backing_row;
-#line 504 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 522 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 5075 "VideoSupport.c"
+#line 5119 "VideoSupport.c"
 			{
 				VideoRow* _tmp5_ = NULL;
 				const gchar* _tmp6_ = NULL;
 				gchar* _tmp7_ = NULL;
-#line 505 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 523 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp5_ = self->priv->backing_row;
-#line 505 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 523 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp6_ = backlinks;
-#line 505 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 523 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp7_ = g_strdup (_tmp6_);
-#line 505 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 523 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_free0 (_tmp5_->backlinks);
-#line 505 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 523 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp5_->backlinks = _tmp7_;
-#line 5090 "VideoSupport.c"
+#line 5134 "VideoSupport.c"
 			}
-			__finally490:
+			__finally503:
 			{
 				VideoRow* _tmp8_ = NULL;
-#line 504 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 522 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp8_ = self->priv->backing_row;
-#line 504 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 522 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 5099 "VideoSupport.c"
+#line 5143 "VideoSupport.c"
 			}
-#line 504 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 522 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 504 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 522 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				if (_inner_error_->domain == DATABASE_ERROR) {
-#line 5105 "VideoSupport.c"
-					goto __catch489_database_error;
+#line 5149 "VideoSupport.c"
+					goto __catch502_database_error;
 				}
-#line 504 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 522 "/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 504 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 522 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_clear_error (&_inner_error_);
-#line 504 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 522 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				return;
-#line 5114 "VideoSupport.c"
+#line 5158 "VideoSupport.c"
 			}
 		}
 	}
-	goto __finally489;
-	__catch489_database_error:
+	goto __finally502;
+	__catch502_database_error:
 	{
 		GError* err = NULL;
 		gchar* _tmp9_ = NULL;
 		gchar* _tmp10_ = NULL;
 		GError* _tmp11_ = NULL;
 		const gchar* _tmp12_ = NULL;
-#line 502 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 520 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		err = _inner_error_;
-#line 502 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 520 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_inner_error_ = NULL;
-#line 508 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 526 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp9_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject));
-#line 508 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 526 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp10_ = _tmp9_;
-#line 508 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 526 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp11_ = err;
-#line 508 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 526 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp12_ = _tmp11_->message;
-#line 508 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		g_warning ("VideoSupport.vala:508: Unable to update link state for %s: %s", _tmp10_, _tmp12_);
-#line 508 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 526 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+		g_warning ("VideoSupport.vala:526: Unable to update link state for %s: %s", _tmp10_, _tmp12_);
+#line 526 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_free0 (_tmp10_);
-#line 502 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 520 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_error_free0 (err);
-#line 5144 "VideoSupport.c"
+#line 5188 "VideoSupport.c"
 	}
-	__finally489:
-#line 502 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	__finally502:
+#line 520 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 502 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 520 "/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 502 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 520 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_clear_error (&_inner_error_);
-#line 502 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 520 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return;
-#line 5155 "VideoSupport.c"
+#line 5199 "VideoSupport.c"
 	}
 }
 
@@ -5164,18 +5208,18 @@ static gboolean video_real_set_event_id (MediaSource* base, EventID* event_id) {
 	Video * self;
 	gboolean result = FALSE;
 	GError * _inner_error_ = NULL;
-#line 512 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 530 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 512 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 530 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (event_id != NULL, FALSE);
-#line 5168 "VideoSupport.c"
+#line 5212 "VideoSupport.c"
 	{
 		VideoRow* _tmp0_ = NULL;
-#line 513 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 531 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = self->priv->backing_row;
-#line 513 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 531 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 5175 "VideoSupport.c"
+#line 5219 "VideoSupport.c"
 		{
 			gboolean committed = FALSE;
 			VideoTable* _tmp1_ = NULL;
@@ -5186,70 +5230,70 @@ static gboolean video_real_set_event_id (MediaSource* base, EventID* event_id) {
 			gboolean _tmp6_ = FALSE;
 			gboolean _tmp7_ = FALSE;
 			gboolean _tmp8_ = FALSE;
-#line 514 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 532 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp1_ = video_table_get_instance ();
-#line 514 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 532 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp2_ = _tmp1_;
-#line 514 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 532 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp3_ = self->priv->backing_row;
-#line 514 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 532 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp4_ = _tmp3_->video_id;
-#line 514 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 532 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp5_ = *event_id;
-#line 514 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 532 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp6_ = video_table_set_event (_tmp2_, &_tmp4_, &_tmp5_);
-#line 514 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 532 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp7_ = _tmp6_;
-#line 514 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 532 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_database_table_unref0 (_tmp2_);
-#line 514 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 532 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			committed = _tmp7_;
-#line 516 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 534 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp8_ = committed;
-#line 516 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 534 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (_tmp8_) {
-#line 5208 "VideoSupport.c"
+#line 5252 "VideoSupport.c"
 				VideoRow* _tmp9_ = NULL;
 				EventID _tmp10_ = {0};
-#line 517 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 535 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp9_ = self->priv->backing_row;
-#line 517 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 535 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp10_ = *event_id;
-#line 517 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 535 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp9_->event_id = _tmp10_;
-#line 5217 "VideoSupport.c"
+#line 5261 "VideoSupport.c"
 			}
-#line 519 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 537 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			result = committed;
-#line 5221 "VideoSupport.c"
+#line 5265 "VideoSupport.c"
 			{
 				VideoRow* _tmp11_ = NULL;
-#line 513 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 531 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp11_ = self->priv->backing_row;
-#line 513 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 531 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 5228 "VideoSupport.c"
+#line 5272 "VideoSupport.c"
 			}
-#line 519 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 537 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return result;
-#line 5232 "VideoSupport.c"
+#line 5276 "VideoSupport.c"
 		}
-		__finally491:
+		__finally504:
 		{
 			VideoRow* _tmp12_ = NULL;
-#line 513 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 531 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp12_ = self->priv->backing_row;
-#line 513 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 531 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 5241 "VideoSupport.c"
+#line 5285 "VideoSupport.c"
 		}
-#line 513 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 531 "/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 513 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 531 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_clear_error (&_inner_error_);
-#line 513 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 531 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return FALSE;
-#line 5249 "VideoSupport.c"
+#line 5293 "VideoSupport.c"
 	}
 }
 
@@ -5264,44 +5308,44 @@ gboolean video_is_duplicate (GFile* file, const gchar* full_md5) {
 	const gchar* _tmp6_ = NULL;
 	gboolean _tmp7_ = FALSE;
 	gboolean _tmp8_ = FALSE;
-#line 523 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 541 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail ((file == NULL) || G_IS_FILE (file), FALSE);
-#line 524 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 542 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp1_ = file;
-#line 524 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 542 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp1_ != NULL) {
-#line 524 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 542 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = TRUE;
-#line 5272 "VideoSupport.c"
+#line 5316 "VideoSupport.c"
 	} else {
 		const gchar* _tmp2_ = NULL;
-#line 524 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 542 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp2_ = full_md5;
-#line 524 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 542 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = _tmp2_ != NULL;
-#line 5279 "VideoSupport.c"
+#line 5323 "VideoSupport.c"
 	}
-#line 524 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 542 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_vala_assert (_tmp0_, "file != null || full_md5 != null");
-#line 526 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 544 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp3_ = video_table_get_instance ();
-#line 526 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 544 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp4_ = _tmp3_;
-#line 526 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 544 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp5_ = file;
-#line 526 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 544 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp6_ = full_md5;
-#line 526 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 544 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp7_ = video_table_has_duplicate (_tmp4_, _tmp5_, _tmp6_);
-#line 526 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 544 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp8_ = _tmp7_;
-#line 526 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 544 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_database_table_unref0 (_tmp4_);
-#line 526 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 544 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = _tmp8_;
-#line 526 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 544 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 5301 "VideoSupport.c"
+#line 5345 "VideoSupport.c"
 }
 
 
@@ -5312,13 +5356,13 @@ ImportResult video_import_create (VideoImportParams* params, Video** video) {
 	VideoRow* _tmp9_ = NULL;
 	Video* _tmp10_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 532 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 550 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (IS_VIDEO_IMPORT_PARAMS (params), 0);
-#line 533 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 551 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (_vala_video);
-#line 533 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 551 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_vala_video = NULL;
-#line 5318 "VideoSupport.c"
+#line 5362 "VideoSupport.c"
 	{
 		VideoID _tmp0_ = {0};
 		VideoTable* _tmp1_ = NULL;
@@ -5328,188 +5372,188 @@ ImportResult video_import_create (VideoImportParams* params, Video** video) {
 		VideoID _tmp5_ = {0};
 		VideoID _tmp6_ = {0};
 		gboolean _tmp7_ = FALSE;
-#line 537 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 555 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp1_ = video_table_get_instance ();
-#line 537 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 555 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp2_ = _tmp1_;
-#line 537 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 555 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp3_ = params;
-#line 537 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 555 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp4_ = _tmp3_->row;
-#line 537 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 555 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		video_table_add (_tmp2_, _tmp4_, &_tmp5_, &_inner_error_);
-#line 537 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 555 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp6_ = _tmp5_;
-#line 537 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 555 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_database_table_unref0 (_tmp2_);
-#line 537 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 555 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = _tmp6_;
-#line 537 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 555 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 537 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 555 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
-#line 5348 "VideoSupport.c"
-				goto __catch492_database_error;
+#line 5392 "VideoSupport.c"
+				goto __catch505_database_error;
 			}
-#line 537 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 555 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 537 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 555 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_clear_error (&_inner_error_);
-#line 537 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 555 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return 0;
-#line 5357 "VideoSupport.c"
+#line 5401 "VideoSupport.c"
 		}
-#line 537 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 555 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp7_ = video_id_is_invalid (&_tmp0_);
-#line 537 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 555 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (_tmp7_) {
-#line 538 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 556 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			result = IMPORT_RESULT_DATABASE_ERROR;
-#line 538 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 556 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (video) {
-#line 538 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 556 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				*video = _vala_video;
-#line 5369 "VideoSupport.c"
+#line 5413 "VideoSupport.c"
 			} else {
-#line 538 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 556 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_object_unref0 (_vala_video);
-#line 5373 "VideoSupport.c"
+#line 5417 "VideoSupport.c"
 			}
-#line 538 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 556 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return result;
-#line 5377 "VideoSupport.c"
+#line 5421 "VideoSupport.c"
 		}
 	}
-	goto __finally492;
-	__catch492_database_error:
+	goto __finally505;
+	__catch505_database_error:
 	{
 		GError* err = NULL;
-#line 536 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 554 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		err = _inner_error_;
-#line 536 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 554 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_inner_error_ = NULL;
-#line 540 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 558 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		result = IMPORT_RESULT_DATABASE_ERROR;
-#line 540 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 558 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_error_free0 (err);
-#line 540 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 558 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (video) {
-#line 540 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 558 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			*video = _vala_video;
-#line 5396 "VideoSupport.c"
+#line 5440 "VideoSupport.c"
 		} else {
-#line 540 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 558 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_object_unref0 (_vala_video);
-#line 5400 "VideoSupport.c"
+#line 5444 "VideoSupport.c"
 		}
-#line 540 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 558 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return result;
-#line 5404 "VideoSupport.c"
+#line 5448 "VideoSupport.c"
 	}
-	__finally492:
-#line 536 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	__finally505:
+#line 554 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 536 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 554 "/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 536 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 554 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_clear_error (&_inner_error_);
-#line 536 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 554 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return 0;
-#line 5415 "VideoSupport.c"
+#line 5459 "VideoSupport.c"
 	}
-#line 544 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 562 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp8_ = params;
-#line 544 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 562 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp9_ = _tmp8_->row;
-#line 544 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 562 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp10_ = video_new (_tmp9_);
-#line 544 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 562 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (_vala_video);
-#line 544 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 562 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_vala_video = _tmp10_;
-#line 546 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 564 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = IMPORT_RESULT_SUCCESS;
-#line 546 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 564 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (video) {
-#line 546 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 564 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		*video = _vala_video;
-#line 5433 "VideoSupport.c"
+#line 5477 "VideoSupport.c"
 	} else {
-#line 546 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 564 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (_vala_video);
-#line 5437 "VideoSupport.c"
+#line 5481 "VideoSupport.c"
 	}
-#line 546 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 564 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 5441 "VideoSupport.c"
+#line 5485 "VideoSupport.c"
 }
 
 
 void video_import_failed (Video* video) {
 	GError * _inner_error_ = NULL;
-#line 549 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 567 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail (IS_VIDEO (video));
-#line 5449 "VideoSupport.c"
+#line 5493 "VideoSupport.c"
 	{
 		VideoTable* _tmp0_ = NULL;
 		VideoTable* _tmp1_ = NULL;
 		Video* _tmp2_ = NULL;
 		VideoID _tmp3_ = {0};
-#line 551 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 569 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = video_table_get_instance ();
-#line 551 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 569 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp1_ = _tmp0_;
-#line 551 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 569 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp2_ = video;
-#line 551 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 569 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		video_get_video_id (_tmp2_, &_tmp3_);
-#line 551 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 569 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		video_table_remove (_tmp1_, &_tmp3_, &_inner_error_);
-#line 551 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 569 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_database_table_unref0 (_tmp1_);
-#line 551 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 569 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 551 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 569 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
-#line 5471 "VideoSupport.c"
-				goto __catch493_database_error;
+#line 5515 "VideoSupport.c"
+				goto __catch506_database_error;
 			}
-#line 551 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 569 "/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 551 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 569 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_clear_error (&_inner_error_);
-#line 551 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 569 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return;
-#line 5480 "VideoSupport.c"
+#line 5524 "VideoSupport.c"
 		}
 	}
-	goto __finally493;
-	__catch493_database_error:
+	goto __finally506;
+	__catch506_database_error:
 	{
 		GError* err = NULL;
 		GError* _tmp4_ = NULL;
-#line 550 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 568 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		err = _inner_error_;
-#line 550 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 568 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_inner_error_ = NULL;
-#line 553 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 571 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp4_ = err;
-#line 553 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 571 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		app_window_database_error (_tmp4_);
-#line 550 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 568 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_error_free0 (err);
-#line 5498 "VideoSupport.c"
+#line 5542 "VideoSupport.c"
 	}
-	__finally493:
-#line 550 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	__finally506:
+#line 568 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 550 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 568 "/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 550 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 568 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_clear_error (&_inner_error_);
-#line 550 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 568 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return;
-#line 5509 "VideoSupport.c"
+#line 5553 "VideoSupport.c"
 	}
 }
 
@@ -5524,24 +5568,24 @@ static BackingFileState** video_real_get_backing_files_state (MediaSource* base,
 	BackingFileState** _tmp13_ = NULL;
 	gint _tmp13__length1 = 0;
 	GError * _inner_error_ = NULL;
-#line 557 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 575 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 558 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 576 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = g_new0 (BackingFileState*, 1 + 1);
-#line 558 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 576 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	backing = _tmp0_;
-#line 558 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 576 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	backing_length1 = 1;
-#line 558 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 576 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_backing_size_ = backing_length1;
-#line 5534 "VideoSupport.c"
+#line 5578 "VideoSupport.c"
 	{
 		VideoRow* _tmp1_ = NULL;
-#line 559 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 577 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp1_ = self->priv->backing_row;
-#line 559 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 577 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 5541 "VideoSupport.c"
+#line 5585 "VideoSupport.c"
 		{
 			VideoRow* _tmp2_ = NULL;
 			const gchar* _tmp3_ = NULL;
@@ -5553,69 +5597,69 @@ static BackingFileState** video_real_get_backing_files_state (MediaSource* base,
 			const gchar* _tmp9_ = NULL;
 			BackingFileState* _tmp10_ = NULL;
 			BackingFileState* _tmp11_ = NULL;
-#line 560 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 578 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp2_ = self->priv->backing_row;
-#line 560 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 578 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp3_ = _tmp2_->filepath;
-#line 560 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 578 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp4_ = self->priv->backing_row;
-#line 560 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 578 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp5_ = _tmp4_->filesize;
-#line 560 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 578 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp6_ = self->priv->backing_row;
-#line 560 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 578 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp7_ = _tmp6_->timestamp;
-#line 560 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 578 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp8_ = self->priv->backing_row;
-#line 560 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 578 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp9_ = _tmp8_->md5;
-#line 560 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 578 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp10_ = backing_file_state_new (_tmp3_, _tmp5_, _tmp7_, _tmp9_);
-#line 560 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 578 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_backing_file_state_unref0 (backing[0]);
-#line 560 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 578 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			backing[0] = _tmp10_;
-#line 560 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 578 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp11_ = backing[0];
-#line 5577 "VideoSupport.c"
+#line 5621 "VideoSupport.c"
 		}
-		__finally494:
+		__finally507:
 		{
 			VideoRow* _tmp12_ = NULL;
-#line 559 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 577 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp12_ = self->priv->backing_row;
-#line 559 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 577 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 5586 "VideoSupport.c"
+#line 5630 "VideoSupport.c"
 		}
-#line 559 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 577 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 559 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 577 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			backing = (_vala_array_free (backing, backing_length1, (GDestroyNotify) backing_file_state_unref), NULL);
-#line 559 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 577 "/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 559 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 577 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_clear_error (&_inner_error_);
-#line 559 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 577 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return NULL;
-#line 5598 "VideoSupport.c"
+#line 5642 "VideoSupport.c"
 		}
 	}
-#line 564 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 582 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp13_ = backing;
-#line 564 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 582 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp13__length1 = backing_length1;
-#line 564 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 582 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (result_length1) {
-#line 564 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 582 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		*result_length1 = _tmp13__length1;
-#line 5609 "VideoSupport.c"
+#line 5653 "VideoSupport.c"
 	}
-#line 564 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 582 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = _tmp13_;
-#line 564 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 582 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 5615 "VideoSupport.c"
+#line 5659 "VideoSupport.c"
 }
 
 
@@ -5627,33 +5671,33 @@ static GdkPixbuf* video_real_get_thumbnail (ThumbnailSource* base, gint scale, G
 	GdkPixbuf* _tmp2_ = NULL;
 	GdkPixbuf* _tmp3_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 567 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 585 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 568 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 586 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp1_ = scale;
-#line 568 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 586 "/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 568 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 586 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = _tmp2_;
-#line 568 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 586 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 568 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 586 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_propagate_error (error, _inner_error_);
-#line 568 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 586 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return NULL;
-#line 5641 "VideoSupport.c"
+#line 5685 "VideoSupport.c"
 	}
-#line 568 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 586 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp3_ = _tmp0_;
-#line 568 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 586 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = NULL;
-#line 568 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 586 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = _tmp3_;
-#line 568 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 586 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (_tmp0_);
-#line 568 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 586 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 5653 "VideoSupport.c"
+#line 5697 "VideoSupport.c"
 }
 
 
@@ -5661,57 +5705,57 @@ static gchar* video_real_get_master_md5 (MediaSource* base) {
 	Video * self;
 	gchar* result = NULL;
 	GError * _inner_error_ = NULL;
-#line 571 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 589 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 5663 "VideoSupport.c"
+#line 5707 "VideoSupport.c"
 	{
 		VideoRow* _tmp0_ = NULL;
-#line 572 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 590 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = self->priv->backing_row;
-#line 572 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 590 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 5670 "VideoSupport.c"
+#line 5714 "VideoSupport.c"
 		{
 			VideoRow* _tmp1_ = NULL;
 			const gchar* _tmp2_ = NULL;
 			gchar* _tmp3_ = NULL;
-#line 573 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 591 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp1_ = self->priv->backing_row;
-#line 573 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 591 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp2_ = _tmp1_->md5;
-#line 573 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 591 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp3_ = g_strdup (_tmp2_);
-#line 573 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 591 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			result = _tmp3_;
-#line 5683 "VideoSupport.c"
+#line 5727 "VideoSupport.c"
 			{
 				VideoRow* _tmp4_ = NULL;
-#line 572 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 590 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp4_ = self->priv->backing_row;
-#line 572 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 590 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 5690 "VideoSupport.c"
+#line 5734 "VideoSupport.c"
 			}
-#line 573 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 591 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return result;
-#line 5694 "VideoSupport.c"
+#line 5738 "VideoSupport.c"
 		}
-		__finally495:
+		__finally508:
 		{
 			VideoRow* _tmp5_ = NULL;
-#line 572 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 590 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp5_ = self->priv->backing_row;
-#line 572 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 590 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 5703 "VideoSupport.c"
+#line 5747 "VideoSupport.c"
 		}
-#line 572 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 590 "/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 572 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 590 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_clear_error (&_inner_error_);
-#line 572 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 590 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return NULL;
-#line 5711 "VideoSupport.c"
+#line 5755 "VideoSupport.c"
 	}
 }
 
@@ -5723,31 +5767,31 @@ static GdkPixbuf* video_real_get_preview_pixbuf (MediaSource* base, Scaling* sca
 	GdkPixbuf* _tmp0_ = NULL;
 	GdkPixbuf* _tmp1_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 577 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 595 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 577 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 595 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (scaling != NULL, NULL);
-#line 578 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 596 "/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 578 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 596 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	pixbuf = _tmp0_;
-#line 578 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 596 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 578 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 596 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_propagate_error (error, _inner_error_);
-#line 578 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 596 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return NULL;
-#line 5737 "VideoSupport.c"
+#line 5781 "VideoSupport.c"
 	}
-#line 580 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 598 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp1_ = scaling_perform_on_pixbuf (scaling, pixbuf, GDK_INTERP_NEAREST, TRUE);
-#line 580 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 598 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = _tmp1_;
-#line 580 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 598 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (pixbuf);
-#line 580 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 598 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 5747 "VideoSupport.c"
+#line 5791 "VideoSupport.c"
 }
 
 
@@ -5764,69 +5808,69 @@ static GdkPixbuf* video_real_create_thumbnail (ThumbnailSource* base, gint scale
 	GdkPixbuf* _tmp5_ = NULL;
 	GdkPixbuf* _tmp6_ = NULL;
 	GdkPixbuf* _tmp7_ = NULL;
-#line 583 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 601 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 584 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 602 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = media_source_get_file (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource));
-#line 584 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 602 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp1_ = _tmp0_;
-#line 584 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 602 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp2_ = video_reader_new (_tmp1_);
-#line 584 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 602 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp3_ = _tmp2_;
-#line 584 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 602 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (_tmp1_);
-#line 584 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 602 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	reader = _tmp3_;
-#line 585 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 603 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp4_ = reader;
-#line 585 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 603 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp5_ = video_reader_read_preview_frame (_tmp4_);
-#line 585 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 603 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	frame = _tmp5_;
-#line 587 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 605 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp7_ = frame;
-#line 587 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 605 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp7_ != NULL) {
-#line 5788 "VideoSupport.c"
+#line 5832 "VideoSupport.c"
 		GdkPixbuf* _tmp8_ = NULL;
 		GdkPixbuf* _tmp9_ = NULL;
-#line 587 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 605 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp8_ = frame;
-#line 587 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 605 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp9_ = _g_object_ref0 (_tmp8_);
-#line 587 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 605 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (_tmp6_);
-#line 587 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 605 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp6_ = _tmp9_;
-#line 5799 "VideoSupport.c"
+#line 5843 "VideoSupport.c"
 	} else {
 		GdkPixbuf* _tmp10_ = NULL;
 		GdkPixbuf* _tmp11_ = NULL;
 		GdkPixbuf* _tmp12_ = NULL;
-#line 587 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 605 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp10_ = resources_get_noninterpretable_badge_pixbuf ();
-#line 587 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 605 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp11_ = _tmp10_;
-#line 587 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 605 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp12_ = gdk_pixbuf_copy (_tmp11_);
-#line 587 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 605 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (_tmp6_);
-#line 587 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 605 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp6_ = _tmp12_;
-#line 587 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 605 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (_tmp11_);
-#line 5816 "VideoSupport.c"
+#line 5860 "VideoSupport.c"
 	}
-#line 587 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 605 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = _tmp6_;
-#line 587 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 605 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (frame);
-#line 587 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 605 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_video_reader_unref0 (reader);
-#line 587 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 605 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 5826 "VideoSupport.c"
+#line 5870 "VideoSupport.c"
 }
 
 
@@ -5834,15 +5878,15 @@ static gchar* video_real_get_typename (DataSource* base) {
 	Video * self;
 	gchar* result = NULL;
 	gchar* _tmp0_ = NULL;
-#line 590 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 608 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 591 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 609 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = g_strdup (VIDEO_TYPENAME);
-#line 591 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 609 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = _tmp0_;
-#line 591 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 609 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 5842 "VideoSupport.c"
+#line 5886 "VideoSupport.c"
 }
 
 
@@ -5851,71 +5895,71 @@ static gint64 video_real_get_instance_id (DataSource* base) {
 	gint64 result = 0LL;
 	VideoID _tmp0_ = {0};
 	gint64 _tmp1_ = 0LL;
-#line 594 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 612 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 595 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 613 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video_get_video_id (self, &_tmp0_);
-#line 595 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 613 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp1_ = _tmp0_.id;
-#line 595 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 613 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = _tmp1_;
-#line 595 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 613 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 5861 "VideoSupport.c"
+#line 5905 "VideoSupport.c"
 }
 
 
 static void video_real_get_import_id (MediaSource* base, ImportID* result) {
 	Video * self;
 	GError * _inner_error_ = NULL;
-#line 598 "/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 5870 "VideoSupport.c"
+#line 5914 "VideoSupport.c"
 	{
 		VideoRow* _tmp0_ = NULL;
-#line 599 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 617 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = self->priv->backing_row;
-#line 599 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 617 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 5877 "VideoSupport.c"
+#line 5921 "VideoSupport.c"
 		{
 			VideoRow* _tmp1_ = NULL;
 			ImportID _tmp2_ = {0};
-#line 600 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 618 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp1_ = self->priv->backing_row;
-#line 600 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 618 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp2_ = _tmp1_->import_id;
-#line 600 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 618 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			*result = _tmp2_;
-#line 5887 "VideoSupport.c"
+#line 5931 "VideoSupport.c"
 			{
 				VideoRow* _tmp3_ = NULL;
-#line 599 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 617 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp3_ = self->priv->backing_row;
-#line 599 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 617 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 5894 "VideoSupport.c"
+#line 5938 "VideoSupport.c"
 			}
-#line 600 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 618 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return;
-#line 5898 "VideoSupport.c"
+#line 5942 "VideoSupport.c"
 		}
-		__finally496:
+		__finally509:
 		{
 			VideoRow* _tmp4_ = NULL;
-#line 599 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 617 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp4_ = self->priv->backing_row;
-#line 599 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 617 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 5907 "VideoSupport.c"
+#line 5951 "VideoSupport.c"
 		}
-#line 599 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 617 "/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 599 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 617 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_clear_error (&_inner_error_);
-#line 599 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 617 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return;
-#line 5915 "VideoSupport.c"
+#line 5959 "VideoSupport.c"
 	}
 }
 
@@ -5924,15 +5968,15 @@ static PhotoFileFormat video_real_get_preferred_thumbnail_format (ThumbnailSourc
 	Video * self;
 	PhotoFileFormat result = 0;
 	PhotoFileFormat _tmp0_ = 0;
-#line 604 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 622 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 605 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 623 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = photo_file_format_get_system_default_format ();
-#line 605 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 623 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = _tmp0_;
-#line 605 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 623 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 5932 "VideoSupport.c"
+#line 5976 "VideoSupport.c"
 }
 
 
@@ -5940,57 +5984,57 @@ static gchar* video_real_get_title (MediaSource* base) {
 	Video * self;
 	gchar* result = NULL;
 	GError * _inner_error_ = NULL;
-#line 608 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 626 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 5942 "VideoSupport.c"
+#line 5986 "VideoSupport.c"
 	{
 		VideoRow* _tmp0_ = NULL;
-#line 609 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 627 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = self->priv->backing_row;
-#line 609 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 627 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 5949 "VideoSupport.c"
+#line 5993 "VideoSupport.c"
 		{
 			VideoRow* _tmp1_ = NULL;
 			const gchar* _tmp2_ = NULL;
 			gchar* _tmp3_ = NULL;
-#line 610 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 628 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp1_ = self->priv->backing_row;
-#line 610 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 628 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp2_ = _tmp1_->title;
-#line 610 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 628 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp3_ = g_strdup (_tmp2_);
-#line 610 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 628 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			result = _tmp3_;
-#line 5962 "VideoSupport.c"
+#line 6006 "VideoSupport.c"
 			{
 				VideoRow* _tmp4_ = NULL;
-#line 609 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 627 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp4_ = self->priv->backing_row;
-#line 609 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 627 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 5969 "VideoSupport.c"
+#line 6013 "VideoSupport.c"
 			}
-#line 610 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 628 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return result;
-#line 5973 "VideoSupport.c"
+#line 6017 "VideoSupport.c"
 		}
-		__finally497:
+		__finally510:
 		{
 			VideoRow* _tmp5_ = NULL;
-#line 609 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 627 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp5_ = self->priv->backing_row;
-#line 609 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 627 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 5982 "VideoSupport.c"
+#line 6026 "VideoSupport.c"
 		}
-#line 609 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 627 "/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 609 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 627 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_clear_error (&_inner_error_);
-#line 609 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 627 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return NULL;
-#line 5990 "VideoSupport.c"
+#line 6034 "VideoSupport.c"
 	}
 }
 
@@ -6003,22 +6047,22 @@ static void video_real_set_title (MediaSource* base, const gchar* title) {
 	Alteration* _tmp20_ = NULL;
 	Alteration* _tmp21_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 614 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 632 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 615 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 633 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = title;
-#line 615 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 633 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp1_ = media_source_prep_title (_tmp0_);
-#line 615 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 633 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	new_title = _tmp1_;
-#line 6011 "VideoSupport.c"
+#line 6055 "VideoSupport.c"
 	{
 		VideoRow* _tmp2_ = NULL;
-#line 617 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 635 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp2_ = self->priv->backing_row;
-#line 617 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 635 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 6018 "VideoSupport.c"
+#line 6062 "VideoSupport.c"
 		{
 			VideoRow* _tmp3_ = NULL;
 			const gchar* _tmp4_ = NULL;
@@ -6026,28 +6070,28 @@ static void video_real_set_title (MediaSource* base, const gchar* title) {
 			VideoRow* _tmp16_ = NULL;
 			const gchar* _tmp17_ = NULL;
 			gchar* _tmp18_ = NULL;
-#line 618 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 636 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp3_ = self->priv->backing_row;
-#line 618 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 636 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp4_ = _tmp3_->title;
-#line 618 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 636 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp5_ = new_title;
-#line 618 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 636 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (g_strcmp0 (_tmp4_, _tmp5_) == 0) {
-#line 6034 "VideoSupport.c"
+#line 6078 "VideoSupport.c"
 				{
 					VideoRow* _tmp6_ = NULL;
-#line 617 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 635 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					_tmp6_ = self->priv->backing_row;
-#line 617 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 635 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 6041 "VideoSupport.c"
+#line 6085 "VideoSupport.c"
 				}
-#line 619 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 637 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_free0 (new_title);
-#line 619 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 637 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				return;
-#line 6047 "VideoSupport.c"
+#line 6091 "VideoSupport.c"
 			}
 			{
 				VideoTable* _tmp7_ = NULL;
@@ -6055,143 +6099,143 @@ static void video_real_set_title (MediaSource* base, const gchar* title) {
 				VideoRow* _tmp9_ = NULL;
 				VideoID _tmp10_ = {0};
 				const gchar* _tmp11_ = NULL;
-#line 622 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 640 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp7_ = video_table_get_instance ();
-#line 622 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 640 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp8_ = _tmp7_;
-#line 622 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 640 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp9_ = self->priv->backing_row;
-#line 622 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 640 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp10_ = _tmp9_->video_id;
-#line 622 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 640 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp11_ = new_title;
-#line 622 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 640 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				video_table_set_title (_tmp8_, &_tmp10_, _tmp11_, &_inner_error_);
-#line 622 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 640 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_database_table_unref0 (_tmp8_);
-#line 622 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 640 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 622 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 640 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					if (_inner_error_->domain == DATABASE_ERROR) {
-#line 6073 "VideoSupport.c"
-						goto __catch499_database_error;
+#line 6117 "VideoSupport.c"
+						goto __catch512_database_error;
 					}
 					{
 						VideoRow* _tmp12_ = NULL;
-#line 617 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 635 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 						_tmp12_ = self->priv->backing_row;
-#line 617 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 635 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 						g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 6082 "VideoSupport.c"
+#line 6126 "VideoSupport.c"
 					}
-#line 622 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 640 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					_g_free0 (new_title);
-#line 622 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 640 "/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 622 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 640 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					g_clear_error (&_inner_error_);
-#line 622 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 640 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					return;
-#line 6092 "VideoSupport.c"
+#line 6136 "VideoSupport.c"
 				}
 			}
-			goto __finally499;
-			__catch499_database_error:
+			goto __finally512;
+			__catch512_database_error:
 			{
 				GError* e = NULL;
 				GError* _tmp13_ = NULL;
-#line 621 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 639 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				e = _inner_error_;
-#line 621 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 639 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_inner_error_ = NULL;
-#line 624 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 642 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp13_ = e;
-#line 624 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 642 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				app_window_database_error (_tmp13_);
-#line 625 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 643 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_error_free0 (e);
-#line 6110 "VideoSupport.c"
+#line 6154 "VideoSupport.c"
 				{
 					VideoRow* _tmp14_ = NULL;
-#line 617 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 635 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					_tmp14_ = self->priv->backing_row;
-#line 617 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 635 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 6117 "VideoSupport.c"
+#line 6161 "VideoSupport.c"
 				}
-#line 625 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 643 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_free0 (new_title);
-#line 625 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 643 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				return;
-#line 6123 "VideoSupport.c"
+#line 6167 "VideoSupport.c"
 			}
-			__finally499:
-#line 621 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+			__finally512:
+#line 639 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 6128 "VideoSupport.c"
+#line 6172 "VideoSupport.c"
 				{
 					VideoRow* _tmp15_ = NULL;
-#line 617 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 635 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					_tmp15_ = self->priv->backing_row;
-#line 617 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 635 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 6135 "VideoSupport.c"
+#line 6179 "VideoSupport.c"
 				}
-#line 621 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 639 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_free0 (new_title);
-#line 621 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 639 "/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 621 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 639 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_clear_error (&_inner_error_);
-#line 621 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 639 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				return;
-#line 6145 "VideoSupport.c"
+#line 6189 "VideoSupport.c"
 			}
-#line 629 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 647 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp16_ = self->priv->backing_row;
-#line 629 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 647 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp17_ = new_title;
-#line 629 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 647 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp18_ = g_strdup (_tmp17_);
-#line 629 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 647 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_free0 (_tmp16_->title);
-#line 629 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 647 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp16_->title = _tmp18_;
-#line 6157 "VideoSupport.c"
+#line 6201 "VideoSupport.c"
 		}
-		__finally498:
+		__finally511:
 		{
 			VideoRow* _tmp19_ = NULL;
-#line 617 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 635 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp19_ = self->priv->backing_row;
-#line 617 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 635 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 6166 "VideoSupport.c"
+#line 6210 "VideoSupport.c"
 		}
-#line 617 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 635 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 617 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 635 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_free0 (new_title);
-#line 617 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 635 "/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 617 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 635 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_clear_error (&_inner_error_);
-#line 617 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 635 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return;
-#line 6178 "VideoSupport.c"
+#line 6222 "VideoSupport.c"
 		}
 	}
-#line 632 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 650 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp20_ = alteration_new ("metadata", "name");
-#line 632 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 650 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp21_ = _tmp20_;
-#line 632 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 650 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp21_);
-#line 632 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 650 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_alteration_unref0 (_tmp21_);
-#line 614 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 632 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_free0 (new_title);
-#line 6191 "VideoSupport.c"
+#line 6235 "VideoSupport.c"
 }
 
 
@@ -6199,57 +6243,57 @@ static gchar* video_real_get_comment (MediaSource* base) {
 	Video * self;
 	gchar* result = NULL;
 	GError * _inner_error_ = NULL;
-#line 635 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 653 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 6201 "VideoSupport.c"
+#line 6245 "VideoSupport.c"
 	{
 		VideoRow* _tmp0_ = NULL;
-#line 636 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 654 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = self->priv->backing_row;
-#line 636 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 654 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 6208 "VideoSupport.c"
+#line 6252 "VideoSupport.c"
 		{
 			VideoRow* _tmp1_ = NULL;
 			const gchar* _tmp2_ = NULL;
 			gchar* _tmp3_ = NULL;
-#line 637 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 655 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp1_ = self->priv->backing_row;
-#line 637 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 655 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp2_ = _tmp1_->comment;
-#line 637 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 655 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp3_ = g_strdup (_tmp2_);
-#line 637 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 655 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			result = _tmp3_;
-#line 6221 "VideoSupport.c"
+#line 6265 "VideoSupport.c"
 			{
 				VideoRow* _tmp4_ = NULL;
-#line 636 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 654 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp4_ = self->priv->backing_row;
-#line 636 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 654 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 6228 "VideoSupport.c"
+#line 6272 "VideoSupport.c"
 			}
-#line 637 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 655 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return result;
-#line 6232 "VideoSupport.c"
+#line 6276 "VideoSupport.c"
 		}
-		__finally500:
+		__finally513:
 		{
 			VideoRow* _tmp5_ = NULL;
-#line 636 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 654 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp5_ = self->priv->backing_row;
-#line 636 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 654 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 6241 "VideoSupport.c"
+#line 6285 "VideoSupport.c"
 		}
-#line 636 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 654 "/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 636 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 654 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_clear_error (&_inner_error_);
-#line 636 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 654 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return NULL;
-#line 6249 "VideoSupport.c"
+#line 6293 "VideoSupport.c"
 	}
 }
 
@@ -6263,22 +6307,22 @@ static gboolean video_real_set_comment (MediaSource* base, const gchar* comment)
 	Alteration* _tmp20_ = NULL;
 	Alteration* _tmp21_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 641 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 659 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 642 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 660 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = comment;
-#line 642 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 660 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp1_ = media_source_prep_title (_tmp0_);
-#line 642 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 660 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	new_comment = _tmp1_;
-#line 6271 "VideoSupport.c"
+#line 6315 "VideoSupport.c"
 	{
 		VideoRow* _tmp2_ = NULL;
-#line 644 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 662 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp2_ = self->priv->backing_row;
-#line 644 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 662 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 6278 "VideoSupport.c"
+#line 6322 "VideoSupport.c"
 		{
 			VideoRow* _tmp3_ = NULL;
 			const gchar* _tmp4_ = NULL;
@@ -6286,30 +6330,30 @@ static gboolean video_real_set_comment (MediaSource* base, const gchar* comment)
 			VideoRow* _tmp16_ = NULL;
 			const gchar* _tmp17_ = NULL;
 			gchar* _tmp18_ = NULL;
-#line 645 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 663 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp3_ = self->priv->backing_row;
-#line 645 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 663 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp4_ = _tmp3_->comment;
-#line 645 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 663 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp5_ = new_comment;
-#line 645 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 663 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (g_strcmp0 (_tmp4_, _tmp5_) == 0) {
-#line 646 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 664 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				result = TRUE;
-#line 6296 "VideoSupport.c"
+#line 6340 "VideoSupport.c"
 				{
 					VideoRow* _tmp6_ = NULL;
-#line 644 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 662 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					_tmp6_ = self->priv->backing_row;
-#line 644 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 662 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 6303 "VideoSupport.c"
+#line 6347 "VideoSupport.c"
 				}
-#line 646 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 664 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_free0 (new_comment);
-#line 646 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 664 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				return result;
-#line 6309 "VideoSupport.c"
+#line 6353 "VideoSupport.c"
 			}
 			{
 				VideoTable* _tmp7_ = NULL;
@@ -6317,149 +6361,149 @@ static gboolean video_real_set_comment (MediaSource* base, const gchar* comment)
 				VideoRow* _tmp9_ = NULL;
 				VideoID _tmp10_ = {0};
 				const gchar* _tmp11_ = NULL;
-#line 649 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 667 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp7_ = video_table_get_instance ();
-#line 649 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 667 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp8_ = _tmp7_;
-#line 649 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 667 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp9_ = self->priv->backing_row;
-#line 649 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 667 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp10_ = _tmp9_->video_id;
-#line 649 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 667 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp11_ = new_comment;
-#line 649 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 667 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				video_table_set_comment (_tmp8_, &_tmp10_, _tmp11_, &_inner_error_);
-#line 649 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 667 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_database_table_unref0 (_tmp8_);
-#line 649 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 667 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 649 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 667 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					if (_inner_error_->domain == DATABASE_ERROR) {
-#line 6335 "VideoSupport.c"
-						goto __catch502_database_error;
+#line 6379 "VideoSupport.c"
+						goto __catch515_database_error;
 					}
 					{
 						VideoRow* _tmp12_ = NULL;
-#line 644 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 662 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 						_tmp12_ = self->priv->backing_row;
-#line 644 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 662 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 						g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 6344 "VideoSupport.c"
+#line 6388 "VideoSupport.c"
 					}
-#line 649 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 667 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					_g_free0 (new_comment);
-#line 649 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 667 "/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 649 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 667 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					g_clear_error (&_inner_error_);
-#line 649 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 667 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					return FALSE;
-#line 6354 "VideoSupport.c"
+#line 6398 "VideoSupport.c"
 				}
 			}
-			goto __finally502;
-			__catch502_database_error:
+			goto __finally515;
+			__catch515_database_error:
 			{
 				GError* e = NULL;
 				GError* _tmp13_ = NULL;
-#line 648 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 666 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				e = _inner_error_;
-#line 648 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 666 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_inner_error_ = NULL;
-#line 651 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 669 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp13_ = e;
-#line 651 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 669 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				app_window_database_error (_tmp13_);
-#line 652 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 670 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				result = FALSE;
-#line 652 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 670 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_error_free0 (e);
-#line 6374 "VideoSupport.c"
+#line 6418 "VideoSupport.c"
 				{
 					VideoRow* _tmp14_ = NULL;
-#line 644 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 662 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					_tmp14_ = self->priv->backing_row;
-#line 644 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 662 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 6381 "VideoSupport.c"
+#line 6425 "VideoSupport.c"
 				}
-#line 652 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 670 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_free0 (new_comment);
-#line 652 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 670 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				return result;
-#line 6387 "VideoSupport.c"
+#line 6431 "VideoSupport.c"
 			}
-			__finally502:
-#line 648 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+			__finally515:
+#line 666 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 6392 "VideoSupport.c"
+#line 6436 "VideoSupport.c"
 				{
 					VideoRow* _tmp15_ = NULL;
-#line 644 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 662 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					_tmp15_ = self->priv->backing_row;
-#line 644 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 662 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 6399 "VideoSupport.c"
+#line 6443 "VideoSupport.c"
 				}
-#line 648 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 666 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_free0 (new_comment);
-#line 648 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 666 "/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 648 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 666 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_clear_error (&_inner_error_);
-#line 648 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 666 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				return FALSE;
-#line 6409 "VideoSupport.c"
+#line 6453 "VideoSupport.c"
 			}
-#line 656 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 674 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp16_ = self->priv->backing_row;
-#line 656 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 674 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp17_ = new_comment;
-#line 656 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 674 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp18_ = g_strdup (_tmp17_);
-#line 656 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 674 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_free0 (_tmp16_->comment);
-#line 656 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 674 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp16_->comment = _tmp18_;
-#line 6421 "VideoSupport.c"
+#line 6465 "VideoSupport.c"
 		}
-		__finally501:
+		__finally514:
 		{
 			VideoRow* _tmp19_ = NULL;
-#line 644 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 662 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp19_ = self->priv->backing_row;
-#line 644 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 662 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 6430 "VideoSupport.c"
+#line 6474 "VideoSupport.c"
 		}
-#line 644 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 662 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 644 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 662 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_free0 (new_comment);
-#line 644 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 662 "/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 644 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 662 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_clear_error (&_inner_error_);
-#line 644 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 662 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return FALSE;
-#line 6442 "VideoSupport.c"
+#line 6486 "VideoSupport.c"
 		}
 	}
-#line 659 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 677 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp20_ = alteration_new ("metadata", "comment");
-#line 659 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 677 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp21_ = _tmp20_;
-#line 659 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 677 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp21_);
-#line 659 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 677 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_alteration_unref0 (_tmp21_);
-#line 661 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 679 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = TRUE;
-#line 661 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 679 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_free0 (new_comment);
-#line 661 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 679 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 6459 "VideoSupport.c"
+#line 6503 "VideoSupport.c"
 }
 
 
@@ -6467,54 +6511,54 @@ static Rating video_real_get_rating (MediaSource* base) {
 	Video * self;
 	Rating result = 0;
 	GError * _inner_error_ = NULL;
-#line 665 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 683 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 6469 "VideoSupport.c"
+#line 6513 "VideoSupport.c"
 	{
 		VideoRow* _tmp0_ = NULL;
-#line 666 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 684 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = self->priv->backing_row;
-#line 666 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 684 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 6476 "VideoSupport.c"
+#line 6520 "VideoSupport.c"
 		{
 			VideoRow* _tmp1_ = NULL;
 			Rating _tmp2_ = 0;
-#line 667 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 685 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp1_ = self->priv->backing_row;
-#line 667 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 685 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp2_ = _tmp1_->rating;
-#line 667 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 685 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			result = _tmp2_;
-#line 6486 "VideoSupport.c"
+#line 6530 "VideoSupport.c"
 			{
 				VideoRow* _tmp3_ = NULL;
-#line 666 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 684 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp3_ = self->priv->backing_row;
-#line 666 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 684 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 6493 "VideoSupport.c"
+#line 6537 "VideoSupport.c"
 			}
-#line 667 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 685 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return result;
-#line 6497 "VideoSupport.c"
+#line 6541 "VideoSupport.c"
 		}
-		__finally503:
+		__finally516:
 		{
 			VideoRow* _tmp4_ = NULL;
-#line 666 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 684 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp4_ = self->priv->backing_row;
-#line 666 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 684 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 6506 "VideoSupport.c"
+#line 6550 "VideoSupport.c"
 		}
-#line 666 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 684 "/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 666 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 684 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_clear_error (&_inner_error_);
-#line 666 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 684 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return 0;
-#line 6514 "VideoSupport.c"
+#line 6558 "VideoSupport.c"
 	}
 }
 
@@ -6524,234 +6568,234 @@ static void video_real_set_rating (MediaSource* base, Rating rating) {
 	Alteration* _tmp19_ = NULL;
 	Alteration* _tmp20_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 671 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 689 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 6526 "VideoSupport.c"
+#line 6570 "VideoSupport.c"
 	{
 		VideoRow* _tmp0_ = NULL;
-#line 672 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 690 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = self->priv->backing_row;
-#line 672 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 690 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 6533 "VideoSupport.c"
+#line 6577 "VideoSupport.c"
 		{
 			gboolean _tmp1_ = FALSE;
 			Rating _tmp2_ = 0;
 			gboolean _tmp3_ = FALSE;
 			VideoRow* _tmp16_ = NULL;
 			Rating _tmp17_ = 0;
-#line 673 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 691 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp2_ = rating;
-#line 673 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 691 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp3_ = rating_is_valid (_tmp2_);
-#line 673 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 691 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (!_tmp3_) {
-#line 673 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 691 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp1_ = TRUE;
-#line 6548 "VideoSupport.c"
+#line 6592 "VideoSupport.c"
 			} else {
 				Rating _tmp4_ = 0;
 				VideoRow* _tmp5_ = NULL;
 				Rating _tmp6_ = 0;
-#line 673 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 691 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp4_ = rating;
-#line 673 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 691 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp5_ = self->priv->backing_row;
-#line 673 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 691 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp6_ = _tmp5_->rating;
-#line 673 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 691 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp1_ = _tmp4_ == _tmp6_;
-#line 6561 "VideoSupport.c"
+#line 6605 "VideoSupport.c"
 			}
-#line 673 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 691 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (_tmp1_) {
-#line 6565 "VideoSupport.c"
+#line 6609 "VideoSupport.c"
 				{
 					VideoRow* _tmp7_ = NULL;
-#line 672 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 690 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					_tmp7_ = self->priv->backing_row;
-#line 672 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 690 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 6572 "VideoSupport.c"
+#line 6616 "VideoSupport.c"
 				}
-#line 674 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 692 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				return;
-#line 6576 "VideoSupport.c"
+#line 6620 "VideoSupport.c"
 			}
 			{
 				VideoTable* _tmp8_ = NULL;
 				VideoTable* _tmp9_ = NULL;
 				VideoID _tmp10_ = {0};
 				Rating _tmp11_ = 0;
-#line 677 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 695 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp8_ = video_table_get_instance ();
-#line 677 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 695 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp9_ = _tmp8_;
-#line 677 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 695 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				video_get_video_id (self, &_tmp10_);
-#line 677 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 695 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp11_ = rating;
-#line 677 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 695 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				video_table_set_rating (_tmp9_, &_tmp10_, _tmp11_, &_inner_error_);
-#line 677 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 695 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_database_table_unref0 (_tmp9_);
-#line 677 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 695 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 677 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 695 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					if (_inner_error_->domain == DATABASE_ERROR) {
-#line 6599 "VideoSupport.c"
-						goto __catch505_database_error;
+#line 6643 "VideoSupport.c"
+						goto __catch518_database_error;
 					}
 					{
 						VideoRow* _tmp12_ = NULL;
-#line 672 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 690 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 						_tmp12_ = self->priv->backing_row;
-#line 672 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 690 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 						g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 6608 "VideoSupport.c"
+#line 6652 "VideoSupport.c"
 					}
-#line 677 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 695 "/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 677 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 695 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					g_clear_error (&_inner_error_);
-#line 677 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 695 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					return;
-#line 6616 "VideoSupport.c"
+#line 6660 "VideoSupport.c"
 				}
 			}
-			goto __finally505;
-			__catch505_database_error:
+			goto __finally518;
+			__catch518_database_error:
 			{
 				GError* e = NULL;
 				GError* _tmp13_ = NULL;
-#line 676 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 694 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				e = _inner_error_;
-#line 676 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 694 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_inner_error_ = NULL;
-#line 679 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 697 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp13_ = e;
-#line 679 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 697 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				app_window_database_error (_tmp13_);
-#line 680 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 698 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_error_free0 (e);
-#line 6634 "VideoSupport.c"
+#line 6678 "VideoSupport.c"
 				{
 					VideoRow* _tmp14_ = NULL;
-#line 672 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 690 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					_tmp14_ = self->priv->backing_row;
-#line 672 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 690 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 6641 "VideoSupport.c"
+#line 6685 "VideoSupport.c"
 				}
-#line 680 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 698 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				return;
-#line 6645 "VideoSupport.c"
+#line 6689 "VideoSupport.c"
 			}
-			__finally505:
-#line 676 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+			__finally518:
+#line 694 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 6650 "VideoSupport.c"
+#line 6694 "VideoSupport.c"
 				{
 					VideoRow* _tmp15_ = NULL;
-#line 672 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 690 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					_tmp15_ = self->priv->backing_row;
-#line 672 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 690 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 6657 "VideoSupport.c"
+#line 6701 "VideoSupport.c"
 				}
-#line 676 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 694 "/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 676 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 694 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_clear_error (&_inner_error_);
-#line 676 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 694 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				return;
-#line 6665 "VideoSupport.c"
+#line 6709 "VideoSupport.c"
 			}
-#line 684 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 702 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp16_ = self->priv->backing_row;
-#line 684 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 702 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp17_ = rating;
-#line 684 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 702 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp16_->rating = _tmp17_;
-#line 6673 "VideoSupport.c"
+#line 6717 "VideoSupport.c"
 		}
-		__finally504:
+		__finally517:
 		{
 			VideoRow* _tmp18_ = NULL;
-#line 672 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 690 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp18_ = self->priv->backing_row;
-#line 672 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 690 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 6682 "VideoSupport.c"
+#line 6726 "VideoSupport.c"
 		}
-#line 672 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 690 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 672 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 690 "/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 672 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 690 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_clear_error (&_inner_error_);
-#line 672 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 690 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return;
-#line 6692 "VideoSupport.c"
+#line 6736 "VideoSupport.c"
 		}
 	}
-#line 687 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 705 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp19_ = alteration_new ("metadata", "rating");
-#line 687 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 705 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp20_ = _tmp19_;
-#line 687 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 705 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp20_);
-#line 687 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 705 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_alteration_unref0 (_tmp20_);
-#line 6703 "VideoSupport.c"
+#line 6747 "VideoSupport.c"
 }
 
 
 static void video_real_increase_rating (MediaSource* base) {
 	Video * self;
 	GError * _inner_error_ = NULL;
-#line 690 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 708 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 6712 "VideoSupport.c"
+#line 6756 "VideoSupport.c"
 	{
 		VideoRow* _tmp0_ = NULL;
-#line 691 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 709 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = self->priv->backing_row;
-#line 691 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 709 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 6719 "VideoSupport.c"
+#line 6763 "VideoSupport.c"
 		{
 			VideoRow* _tmp1_ = NULL;
 			Rating _tmp2_ = 0;
 			Rating _tmp3_ = 0;
-#line 692 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 710 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp1_ = self->priv->backing_row;
-#line 692 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 710 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp2_ = _tmp1_->rating;
-#line 692 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 710 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp3_ = rating_increase (_tmp2_);
-#line 692 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 710 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			media_source_set_rating (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), _tmp3_);
-#line 6732 "VideoSupport.c"
+#line 6776 "VideoSupport.c"
 		}
-		__finally506:
+		__finally519:
 		{
 			VideoRow* _tmp4_ = NULL;
-#line 691 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 709 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp4_ = self->priv->backing_row;
-#line 691 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 709 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 6741 "VideoSupport.c"
+#line 6785 "VideoSupport.c"
 		}
-#line 691 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 709 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 691 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 709 "/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 691 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 709 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_clear_error (&_inner_error_);
-#line 691 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 709 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return;
-#line 6751 "VideoSupport.c"
+#line 6795 "VideoSupport.c"
 		}
 	}
 }
@@ -6760,48 +6804,48 @@ static void video_real_increase_rating (MediaSource* base) {
 static void video_real_decrease_rating (MediaSource* base) {
 	Video * self;
 	GError * _inner_error_ = NULL;
-#line 696 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 714 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 6762 "VideoSupport.c"
+#line 6806 "VideoSupport.c"
 	{
 		VideoRow* _tmp0_ = NULL;
-#line 697 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 715 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = self->priv->backing_row;
-#line 697 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 715 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 6769 "VideoSupport.c"
+#line 6813 "VideoSupport.c"
 		{
 			VideoRow* _tmp1_ = NULL;
 			Rating _tmp2_ = 0;
 			Rating _tmp3_ = 0;
-#line 698 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 716 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp1_ = self->priv->backing_row;
-#line 698 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 716 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp2_ = _tmp1_->rating;
-#line 698 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 716 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp3_ = rating_decrease (_tmp2_);
-#line 698 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 716 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			media_source_set_rating (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), _tmp3_);
-#line 6782 "VideoSupport.c"
+#line 6826 "VideoSupport.c"
 		}
-		__finally507:
+		__finally520:
 		{
 			VideoRow* _tmp4_ = NULL;
-#line 697 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 715 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp4_ = self->priv->backing_row;
-#line 697 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 715 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 6791 "VideoSupport.c"
+#line 6835 "VideoSupport.c"
 		}
-#line 697 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 715 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 697 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 715 "/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 697 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 715 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_clear_error (&_inner_error_);
-#line 697 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 715 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return;
-#line 6801 "VideoSupport.c"
+#line 6845 "VideoSupport.c"
 		}
 	}
 }
@@ -6811,15 +6855,15 @@ static gboolean video_real_is_trashed (MediaSource* base) {
 	Video * self;
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
-#line 702 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 720 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 703 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 721 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = video_is_flag_set (self, VIDEO_FLAG_TRASH);
-#line 703 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 721 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = _tmp0_;
-#line 703 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 721 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 6819 "VideoSupport.c"
+#line 6863 "VideoSupport.c"
 }
 
 
@@ -6827,25 +6871,25 @@ static gboolean video_real_is_offline (Monitorable* base) {
 	Video * self;
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
-#line 706 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 724 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 707 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 725 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = video_is_flag_set (self, VIDEO_FLAG_OFFLINE);
-#line 707 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 725 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = _tmp0_;
-#line 707 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 725 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 6835 "VideoSupport.c"
+#line 6879 "VideoSupport.c"
 }
 
 
 static void video_real_mark_offline (Monitorable* base) {
 	Video * self;
-#line 710 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 728 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 711 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 729 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video_add_flags (self, VIDEO_FLAG_OFFLINE, NULL);
-#line 6845 "VideoSupport.c"
+#line 6889 "VideoSupport.c"
 }
 
 
@@ -6853,61 +6897,61 @@ static void video_real_mark_online (Monitorable* base) {
 	Video * self;
 	gboolean _tmp0_ = FALSE;
 	gboolean _tmp1_ = FALSE;
-#line 714 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 732 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 715 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 733 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video_remove_flags (self, VIDEO_FLAG_OFFLINE, NULL);
-#line 717 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 735 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp1_ = video_get_is_interpretable (self);
-#line 717 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 735 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (!_tmp1_) {
-#line 6861 "VideoSupport.c"
+#line 6905 "VideoSupport.c"
 		gboolean _tmp2_ = FALSE;
-#line 717 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 735 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp2_ = video_has_interpreter_state_changed ();
-#line 717 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 735 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = _tmp2_;
-#line 6867 "VideoSupport.c"
+#line 6911 "VideoSupport.c"
 	} else {
-#line 717 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 735 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = FALSE;
-#line 6871 "VideoSupport.c"
+#line 6915 "VideoSupport.c"
 	}
-#line 717 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 735 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp0_) {
-#line 6875 "VideoSupport.c"
+#line 6919 "VideoSupport.c"
 		VideoInterpretableResults* _tmp3_ = NULL;
 		VideoInterpretableResults* _tmp4_ = NULL;
-#line 718 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 736 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp3_ = video_check_is_interpretable (self);
-#line 718 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 736 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp4_ = _tmp3_;
-#line 718 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 736 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		video_interpretable_results_foreground_finish (_tmp4_);
-#line 718 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 736 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_video_interpretable_results_unref0 (_tmp4_);
-#line 6886 "VideoSupport.c"
+#line 6930 "VideoSupport.c"
 	}
 }
 
 
 static void video_real_trash (MediaSource* base) {
 	Video * self;
-#line 721 "/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 722 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 740 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video_add_flags (self, VIDEO_FLAG_TRASH, NULL);
-#line 6897 "VideoSupport.c"
+#line 6941 "VideoSupport.c"
 }
 
 
 static void video_real_untrash (MediaSource* base) {
 	Video * self;
-#line 725 "/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 726 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 744 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video_remove_flags (self, VIDEO_FLAG_TRASH, NULL);
-#line 6907 "VideoSupport.c"
+#line 6951 "VideoSupport.c"
 }
 
 
@@ -6915,15 +6959,15 @@ static gboolean video_real_is_flagged (Flaggable* base) {
 	Video * self;
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
-#line 729 "/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 730 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 748 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = video_is_flag_set (self, VIDEO_FLAG_FLAGGED);
-#line 730 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 748 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = _tmp0_;
-#line 730 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 748 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 6923 "VideoSupport.c"
+#line 6967 "VideoSupport.c"
 }
 
 
@@ -6931,17 +6975,17 @@ static void video_real_mark_flagged (Flaggable* base) {
 	Video * self;
 	Alteration* _tmp0_ = NULL;
 	Alteration* _tmp1_ = NULL;
-#line 733 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 751 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 734 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 752 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = alteration_new ("metadata", "flagged");
-#line 734 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 752 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp1_ = _tmp0_;
-#line 734 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 752 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video_add_flags (self, VIDEO_FLAG_FLAGGED, _tmp1_);
-#line 734 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 752 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_alteration_unref0 (_tmp1_);
-#line 6941 "VideoSupport.c"
+#line 6985 "VideoSupport.c"
 }
 
 
@@ -6949,71 +6993,71 @@ static void video_real_mark_unflagged (Flaggable* base) {
 	Video * self;
 	Alteration* _tmp0_ = NULL;
 	Alteration* _tmp1_ = NULL;
-#line 737 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 755 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 738 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 756 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = alteration_new ("metadata", "flagged");
-#line 738 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 756 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp1_ = _tmp0_;
-#line 738 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 756 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video_remove_flags (self, VIDEO_FLAG_FLAGGED, _tmp1_);
-#line 738 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 756 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_alteration_unref0 (_tmp1_);
-#line 6959 "VideoSupport.c"
+#line 7003 "VideoSupport.c"
 }
 
 
 static void video_real_get_event_id (MediaSource* base, EventID* result) {
 	Video * self;
 	GError * _inner_error_ = NULL;
-#line 741 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 759 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 6968 "VideoSupport.c"
+#line 7012 "VideoSupport.c"
 	{
 		VideoRow* _tmp0_ = NULL;
-#line 742 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 760 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = self->priv->backing_row;
-#line 742 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 760 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 6975 "VideoSupport.c"
+#line 7019 "VideoSupport.c"
 		{
 			VideoRow* _tmp1_ = NULL;
 			EventID _tmp2_ = {0};
-#line 743 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 761 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp1_ = self->priv->backing_row;
-#line 743 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 761 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp2_ = _tmp1_->event_id;
-#line 743 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 761 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			*result = _tmp2_;
-#line 6985 "VideoSupport.c"
+#line 7029 "VideoSupport.c"
 			{
 				VideoRow* _tmp3_ = NULL;
-#line 742 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 760 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp3_ = self->priv->backing_row;
-#line 742 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 760 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 6992 "VideoSupport.c"
+#line 7036 "VideoSupport.c"
 			}
-#line 743 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 761 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return;
-#line 6996 "VideoSupport.c"
+#line 7040 "VideoSupport.c"
 		}
-		__finally508:
+		__finally521:
 		{
 			VideoRow* _tmp4_ = NULL;
-#line 742 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 760 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp4_ = self->priv->backing_row;
-#line 742 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 760 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 7005 "VideoSupport.c"
+#line 7049 "VideoSupport.c"
 		}
-#line 742 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 760 "/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 742 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 760 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_clear_error (&_inner_error_);
-#line 742 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 760 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return;
-#line 7013 "VideoSupport.c"
+#line 7057 "VideoSupport.c"
 	}
 }
 
@@ -7022,16 +7066,16 @@ static gchar* video_real_to_string (DataObject* base) {
 	Video * self;
 	gchar* result = NULL;
 	GError * _inner_error_ = NULL;
-#line 747 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 765 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 7024 "VideoSupport.c"
+#line 7068 "VideoSupport.c"
 	{
 		VideoRow* _tmp0_ = NULL;
-#line 748 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 766 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = self->priv->backing_row;
-#line 748 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 766 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 7031 "VideoSupport.c"
+#line 7075 "VideoSupport.c"
 		{
 			VideoRow* _tmp1_ = NULL;
 			VideoID _tmp2_ = {0};
@@ -7042,111 +7086,111 @@ static gchar* video_real_to_string (DataObject* base) {
 			const gchar* _tmp7_ = NULL;
 			gchar* _tmp8_ = NULL;
 			gchar* _tmp9_ = NULL;
-#line 749 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 767 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp1_ = self->priv->backing_row;
-#line 749 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 767 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp2_ = _tmp1_->video_id;
-#line 749 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 767 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp3_ = _tmp2_.id;
-#line 749 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 767 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp4_ = g_strdup_printf ("%" G_GINT64_FORMAT, _tmp3_);
-#line 749 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 767 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp5_ = _tmp4_;
-#line 749 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 767 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp6_ = self->priv->backing_row;
-#line 749 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 767 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp7_ = _tmp6_->filepath;
-#line 749 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 767 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp8_ = g_strdup_printf ("[%s] %s", _tmp5_, _tmp7_);
-#line 749 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 767 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp9_ = _tmp8_;
-#line 749 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 767 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_free0 (_tmp5_);
-#line 749 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 767 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			result = _tmp9_;
-#line 7064 "VideoSupport.c"
+#line 7108 "VideoSupport.c"
 			{
 				VideoRow* _tmp10_ = NULL;
-#line 748 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 766 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp10_ = self->priv->backing_row;
-#line 748 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 766 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 7071 "VideoSupport.c"
+#line 7115 "VideoSupport.c"
 			}
-#line 749 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 767 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return result;
-#line 7075 "VideoSupport.c"
+#line 7119 "VideoSupport.c"
 		}
-		__finally509:
+		__finally522:
 		{
 			VideoRow* _tmp11_ = NULL;
-#line 748 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 766 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp11_ = self->priv->backing_row;
-#line 748 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 766 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 7084 "VideoSupport.c"
+#line 7128 "VideoSupport.c"
 		}
-#line 748 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 766 "/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 748 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 766 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_clear_error (&_inner_error_);
-#line 748 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 766 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return NULL;
-#line 7092 "VideoSupport.c"
+#line 7136 "VideoSupport.c"
 	}
 }
 
 
 void video_get_video_id (Video* self, VideoID* result) {
 	GError * _inner_error_ = NULL;
-#line 753 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 771 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail (IS_VIDEO (self));
-#line 7101 "VideoSupport.c"
+#line 7145 "VideoSupport.c"
 	{
 		VideoRow* _tmp0_ = NULL;
-#line 754 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 772 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = self->priv->backing_row;
-#line 754 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 772 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 7108 "VideoSupport.c"
+#line 7152 "VideoSupport.c"
 		{
 			VideoRow* _tmp1_ = NULL;
 			VideoID _tmp2_ = {0};
-#line 755 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 773 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp1_ = self->priv->backing_row;
-#line 755 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 773 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp2_ = _tmp1_->video_id;
-#line 755 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 773 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			*result = _tmp2_;
-#line 7118 "VideoSupport.c"
+#line 7162 "VideoSupport.c"
 			{
 				VideoRow* _tmp3_ = NULL;
-#line 754 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 772 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp3_ = self->priv->backing_row;
-#line 754 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 772 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 7125 "VideoSupport.c"
+#line 7169 "VideoSupport.c"
 			}
-#line 755 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 773 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return;
-#line 7129 "VideoSupport.c"
+#line 7173 "VideoSupport.c"
 		}
-		__finally510:
+		__finally523:
 		{
 			VideoRow* _tmp4_ = NULL;
-#line 754 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 772 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp4_ = self->priv->backing_row;
-#line 754 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 772 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 7138 "VideoSupport.c"
+#line 7182 "VideoSupport.c"
 		}
-#line 754 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 772 "/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 754 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 772 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_clear_error (&_inner_error_);
-#line 754 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 772 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return;
-#line 7146 "VideoSupport.c"
+#line 7190 "VideoSupport.c"
 	}
 }
 
@@ -7155,54 +7199,54 @@ static time_t video_real_get_exposure_time (Dateable* base) {
 	Video * self;
 	time_t result = 0;
 	GError * _inner_error_ = NULL;
-#line 759 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 777 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 7157 "VideoSupport.c"
+#line 7201 "VideoSupport.c"
 	{
 		VideoRow* _tmp0_ = NULL;
-#line 760 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 778 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = self->priv->backing_row;
-#line 760 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 778 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 7164 "VideoSupport.c"
+#line 7208 "VideoSupport.c"
 		{
 			VideoRow* _tmp1_ = NULL;
 			time_t _tmp2_ = 0;
-#line 761 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 779 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp1_ = self->priv->backing_row;
-#line 761 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 779 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp2_ = _tmp1_->exposure_time;
-#line 761 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 779 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			result = _tmp2_;
-#line 7174 "VideoSupport.c"
+#line 7218 "VideoSupport.c"
 			{
 				VideoRow* _tmp3_ = NULL;
-#line 760 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 778 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp3_ = self->priv->backing_row;
-#line 760 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 778 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 7181 "VideoSupport.c"
+#line 7225 "VideoSupport.c"
 			}
-#line 761 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 779 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return result;
-#line 7185 "VideoSupport.c"
+#line 7229 "VideoSupport.c"
 		}
-		__finally511:
+		__finally524:
 		{
 			VideoRow* _tmp4_ = NULL;
-#line 760 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 778 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp4_ = self->priv->backing_row;
-#line 760 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 778 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 7194 "VideoSupport.c"
+#line 7238 "VideoSupport.c"
 		}
-#line 760 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 778 "/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 760 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 778 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_clear_error (&_inner_error_);
-#line 760 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 778 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return 0;
-#line 7202 "VideoSupport.c"
+#line 7246 "VideoSupport.c"
 	}
 }
 
@@ -7212,16 +7256,16 @@ static void video_real_set_exposure_time (Dateable* base, time_t time) {
 	Alteration* _tmp12_ = NULL;
 	Alteration* _tmp13_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 765 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 783 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 7214 "VideoSupport.c"
+#line 7258 "VideoSupport.c"
 	{
 		VideoRow* _tmp0_ = NULL;
-#line 766 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 784 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = self->priv->backing_row;
-#line 766 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 784 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 7221 "VideoSupport.c"
+#line 7265 "VideoSupport.c"
 		{
 			VideoRow* _tmp9_ = NULL;
 			time_t _tmp10_ = 0;
@@ -7231,165 +7275,165 @@ static void video_real_set_exposure_time (Dateable* base, time_t time) {
 				VideoRow* _tmp3_ = NULL;
 				VideoID _tmp4_ = {0};
 				time_t _tmp5_ = 0;
-#line 768 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 786 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp1_ = video_table_get_instance ();
-#line 768 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 786 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp2_ = _tmp1_;
-#line 768 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 786 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp3_ = self->priv->backing_row;
-#line 768 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 786 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp4_ = _tmp3_->video_id;
-#line 768 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 786 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp5_ = time;
-#line 768 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 786 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				video_table_set_exposure_time (_tmp2_, &_tmp4_, _tmp5_, &_inner_error_);
-#line 768 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 786 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_database_table_unref0 (_tmp2_);
-#line 768 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 786 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 7247 "VideoSupport.c"
-					goto __catch513_g_error;
+#line 7291 "VideoSupport.c"
+					goto __catch526_g_error;
 				}
 			}
-			goto __finally513;
-			__catch513_g_error:
+			goto __finally526;
+			__catch526_g_error:
 			{
 				GError* e = NULL;
 				GError* _tmp6_ = NULL;
 				const gchar* _tmp7_ = NULL;
-#line 767 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 785 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				e = _inner_error_;
-#line 767 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 785 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_inner_error_ = NULL;
-#line 770 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 788 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp6_ = e;
-#line 770 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 788 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp7_ = _tmp6_->message;
-#line 770 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				g_debug ("VideoSupport.vala:770: Warning - %s", _tmp7_);
-#line 767 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 788 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+				g_debug ("VideoSupport.vala:788: Warning - %s", _tmp7_);
+#line 785 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_error_free0 (e);
-#line 7269 "VideoSupport.c"
+#line 7313 "VideoSupport.c"
 			}
-			__finally513:
-#line 767 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+			__finally526:
+#line 785 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 7274 "VideoSupport.c"
+#line 7318 "VideoSupport.c"
 				{
 					VideoRow* _tmp8_ = NULL;
-#line 766 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 784 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					_tmp8_ = self->priv->backing_row;
-#line 766 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 784 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 7281 "VideoSupport.c"
+#line 7325 "VideoSupport.c"
 				}
-#line 767 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 785 "/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 767 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 785 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_clear_error (&_inner_error_);
-#line 767 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 785 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				return;
-#line 7289 "VideoSupport.c"
+#line 7333 "VideoSupport.c"
 			}
-#line 772 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 790 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp9_ = self->priv->backing_row;
-#line 772 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 790 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp10_ = time;
-#line 772 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 790 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp9_->exposure_time = _tmp10_;
-#line 7297 "VideoSupport.c"
+#line 7341 "VideoSupport.c"
 		}
-		__finally512:
+		__finally525:
 		{
 			VideoRow* _tmp11_ = NULL;
-#line 766 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 784 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp11_ = self->priv->backing_row;
-#line 766 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 784 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 7306 "VideoSupport.c"
+#line 7350 "VideoSupport.c"
 		}
-#line 766 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 784 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 766 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 784 "/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 766 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 784 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_clear_error (&_inner_error_);
-#line 766 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 784 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return;
-#line 7316 "VideoSupport.c"
+#line 7360 "VideoSupport.c"
 		}
 	}
-#line 775 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 793 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp12_ = alteration_new ("metadata", "exposure-time");
-#line 775 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 793 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp13_ = _tmp12_;
-#line 775 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 793 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp13_);
-#line 775 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 793 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_alteration_unref0 (_tmp13_);
-#line 7327 "VideoSupport.c"
+#line 7371 "VideoSupport.c"
 }
 
 
 void video_get_frame_dimensions (Video* self, Dimensions* result) {
 	GError * _inner_error_ = NULL;
-#line 778 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 796 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail (IS_VIDEO (self));
-#line 7335 "VideoSupport.c"
+#line 7379 "VideoSupport.c"
 	{
 		VideoRow* _tmp0_ = NULL;
-#line 779 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 797 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = self->priv->backing_row;
-#line 779 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 797 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 7342 "VideoSupport.c"
+#line 7386 "VideoSupport.c"
 		{
 			VideoRow* _tmp1_ = NULL;
 			gint _tmp2_ = 0;
 			VideoRow* _tmp3_ = NULL;
 			gint _tmp4_ = 0;
 			Dimensions _tmp5_ = {0};
-#line 780 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 798 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp1_ = self->priv->backing_row;
-#line 780 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 798 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp2_ = _tmp1_->width;
-#line 780 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 798 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp3_ = self->priv->backing_row;
-#line 780 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 798 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp4_ = _tmp3_->height;
-#line 780 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 798 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			dimensions_init (&_tmp5_, _tmp2_, _tmp4_);
-#line 780 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 798 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			*result = _tmp5_;
-#line 7361 "VideoSupport.c"
+#line 7405 "VideoSupport.c"
 			{
 				VideoRow* _tmp6_ = NULL;
-#line 779 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 797 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp6_ = self->priv->backing_row;
-#line 779 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 797 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 7368 "VideoSupport.c"
+#line 7412 "VideoSupport.c"
 			}
-#line 780 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 798 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return;
-#line 7372 "VideoSupport.c"
+#line 7416 "VideoSupport.c"
 		}
-		__finally514:
+		__finally527:
 		{
 			VideoRow* _tmp7_ = NULL;
-#line 779 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 797 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp7_ = self->priv->backing_row;
-#line 779 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 797 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 7381 "VideoSupport.c"
+#line 7425 "VideoSupport.c"
 		}
-#line 779 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 797 "/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 779 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 797 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_clear_error (&_inner_error_);
-#line 779 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 797 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return;
-#line 7389 "VideoSupport.c"
+#line 7433 "VideoSupport.c"
 	}
 }
 
@@ -7397,15 +7441,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 784 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 802 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 785 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 803 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video_get_frame_dimensions (self, &_tmp0_);
-#line 785 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 803 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	*result = _tmp0_;
-#line 785 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 803 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return;
-#line 7405 "VideoSupport.c"
+#line 7449 "VideoSupport.c"
 }
 
 
@@ -7413,15 +7457,15 @@ static guint64 video_real_get_filesize (MediaSource* base) {
 	Video * self;
 	guint64 result = 0ULL;
 	guint64 _tmp0_ = 0ULL;
-#line 788 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 806 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 789 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 807 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = media_source_get_master_filesize (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource));
-#line 789 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 807 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = _tmp0_;
-#line 789 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 807 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 7421 "VideoSupport.c"
+#line 7465 "VideoSupport.c"
 }
 
 
@@ -7429,54 +7473,54 @@ static guint64 video_real_get_master_filesize (MediaSource* base) {
 	Video * self;
 	guint64 result = 0ULL;
 	GError * _inner_error_ = NULL;
-#line 792 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 810 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 7431 "VideoSupport.c"
+#line 7475 "VideoSupport.c"
 	{
 		VideoRow* _tmp0_ = NULL;
-#line 793 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 811 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = self->priv->backing_row;
-#line 793 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 811 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 7438 "VideoSupport.c"
+#line 7482 "VideoSupport.c"
 		{
 			VideoRow* _tmp1_ = NULL;
 			gint64 _tmp2_ = 0LL;
-#line 794 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 812 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp1_ = self->priv->backing_row;
-#line 794 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 812 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp2_ = _tmp1_->filesize;
-#line 794 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 812 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			result = (guint64) _tmp2_;
-#line 7448 "VideoSupport.c"
+#line 7492 "VideoSupport.c"
 			{
 				VideoRow* _tmp3_ = NULL;
-#line 793 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 811 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp3_ = self->priv->backing_row;
-#line 793 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 811 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 7455 "VideoSupport.c"
+#line 7499 "VideoSupport.c"
 			}
-#line 794 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 812 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return result;
-#line 7459 "VideoSupport.c"
+#line 7503 "VideoSupport.c"
 		}
-		__finally515:
+		__finally528:
 		{
 			VideoRow* _tmp4_ = NULL;
-#line 793 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 811 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp4_ = self->priv->backing_row;
-#line 793 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 811 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 7468 "VideoSupport.c"
+#line 7512 "VideoSupport.c"
 		}
-#line 793 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 811 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 793 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 811 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_clear_error (&_inner_error_);
-#line 793 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 811 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return 0ULL;
-#line 7476 "VideoSupport.c"
+#line 7520 "VideoSupport.c"
 	}
 }
 
@@ -7485,54 +7529,54 @@ static time_t video_real_get_timestamp (MediaSource* base) {
 	Video * self;
 	time_t result = 0;
 	GError * _inner_error_ = NULL;
-#line 798 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 816 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 7487 "VideoSupport.c"
+#line 7531 "VideoSupport.c"
 	{
 		VideoRow* _tmp0_ = NULL;
-#line 799 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 817 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = self->priv->backing_row;
-#line 799 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 817 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 7494 "VideoSupport.c"
+#line 7538 "VideoSupport.c"
 		{
 			VideoRow* _tmp1_ = NULL;
 			time_t _tmp2_ = 0;
-#line 800 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 818 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp1_ = self->priv->backing_row;
-#line 800 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 818 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp2_ = _tmp1_->timestamp;
-#line 800 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 818 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			result = _tmp2_;
-#line 7504 "VideoSupport.c"
+#line 7548 "VideoSupport.c"
 			{
 				VideoRow* _tmp3_ = NULL;
-#line 799 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 817 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp3_ = self->priv->backing_row;
-#line 799 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 817 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 7511 "VideoSupport.c"
+#line 7555 "VideoSupport.c"
 			}
-#line 800 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 818 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return result;
-#line 7515 "VideoSupport.c"
+#line 7559 "VideoSupport.c"
 		}
-		__finally516:
+		__finally529:
 		{
 			VideoRow* _tmp4_ = NULL;
-#line 799 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 817 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp4_ = self->priv->backing_row;
-#line 799 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 817 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 7524 "VideoSupport.c"
+#line 7568 "VideoSupport.c"
 		}
-#line 799 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 817 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 799 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 817 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_clear_error (&_inner_error_);
-#line 799 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 817 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return 0;
-#line 7532 "VideoSupport.c"
+#line 7576 "VideoSupport.c"
 	}
 }
 
@@ -7545,25 +7589,25 @@ static void video_real_set_master_timestamp (Monitorable* base, GFileInfo* info)
 	Alteration* _tmp19_ = NULL;
 	Alteration* _tmp20_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 804 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 822 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 804 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 822 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail (G_IS_FILE_INFO (info));
-#line 805 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 823 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = info;
-#line 805 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 823 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_file_info_get_modification_time (_tmp0_, &_tmp1_);
-#line 805 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 823 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	time_val = _tmp1_;
-#line 7555 "VideoSupport.c"
+#line 7599 "VideoSupport.c"
 	{
 		{
 			VideoRow* _tmp2_ = NULL;
-#line 808 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 826 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp2_ = self->priv->backing_row;
-#line 808 "/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 7563 "VideoSupport.c"
+#line 7607 "VideoSupport.c"
 			{
 				VideoRow* _tmp3_ = NULL;
 				time_t _tmp4_ = 0;
@@ -7578,182 +7622,182 @@ static void video_real_set_master_timestamp (Monitorable* base, GFileInfo* info)
 				VideoRow* _tmp14_ = NULL;
 				GTimeVal _tmp15_ = {0};
 				glong _tmp16_ = 0L;
-#line 809 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 827 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp3_ = self->priv->backing_row;
-#line 809 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 827 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp4_ = _tmp3_->timestamp;
-#line 809 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 827 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp5_ = time_val;
-#line 809 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 827 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp6_ = _tmp5_.tv_sec;
-#line 809 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 827 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				if (_tmp4_ == ((time_t) _tmp6_)) {
-#line 7588 "VideoSupport.c"
+#line 7632 "VideoSupport.c"
 					{
 						VideoRow* _tmp7_ = NULL;
-#line 808 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 826 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 						_tmp7_ = self->priv->backing_row;
-#line 808 "/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 7595 "VideoSupport.c"
+#line 7639 "VideoSupport.c"
 					}
-#line 810 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 828 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					return;
-#line 7599 "VideoSupport.c"
+#line 7643 "VideoSupport.c"
 				}
-#line 812 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 830 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp8_ = video_table_get_instance ();
-#line 812 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 830 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp9_ = _tmp8_;
-#line 812 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 830 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp10_ = self->priv->backing_row;
-#line 812 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 830 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp11_ = _tmp10_->video_id;
-#line 812 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 830 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp12_ = time_val;
-#line 812 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 830 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp13_ = _tmp12_.tv_sec;
-#line 812 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 830 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				video_table_set_timestamp (_tmp9_, &_tmp11_, (time_t) _tmp13_, &_inner_error_);
-#line 812 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 830 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_database_table_unref0 (_tmp9_);
-#line 812 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 830 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 7619 "VideoSupport.c"
-					goto __finally518;
+#line 7663 "VideoSupport.c"
+					goto __finally531;
 				}
-#line 813 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 831 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp14_ = self->priv->backing_row;
-#line 813 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 831 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp15_ = time_val;
-#line 813 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 831 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp16_ = _tmp15_.tv_sec;
-#line 813 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 831 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp14_->timestamp = (time_t) _tmp16_;
-#line 7630 "VideoSupport.c"
+#line 7674 "VideoSupport.c"
 			}
-			__finally518:
+			__finally531:
 			{
 				VideoRow* _tmp17_ = NULL;
-#line 808 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 826 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp17_ = self->priv->backing_row;
-#line 808 "/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 7639 "VideoSupport.c"
+#line 7683 "VideoSupport.c"
 			}
-#line 808 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 826 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 808 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 826 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				if (_inner_error_->domain == DATABASE_ERROR) {
-#line 7645 "VideoSupport.c"
-					goto __catch517_database_error;
+#line 7689 "VideoSupport.c"
+					goto __catch530_database_error;
 				}
-#line 808 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 826 "/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 808 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 826 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_clear_error (&_inner_error_);
-#line 808 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 826 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				return;
-#line 7654 "VideoSupport.c"
+#line 7698 "VideoSupport.c"
 			}
 		}
 	}
-	goto __finally517;
-	__catch517_database_error:
+	goto __finally530;
+	__catch530_database_error:
 	{
 		GError* err = NULL;
 		GError* _tmp18_ = NULL;
-#line 807 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 825 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		err = _inner_error_;
-#line 807 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 825 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_inner_error_ = NULL;
-#line 816 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 834 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp18_ = err;
-#line 816 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 834 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		app_window_database_error (_tmp18_);
-#line 818 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 836 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_error_free0 (err);
-#line 818 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 836 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return;
-#line 7675 "VideoSupport.c"
+#line 7719 "VideoSupport.c"
 	}
-	__finally517:
-#line 807 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	__finally530:
+#line 825 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 807 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 825 "/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 807 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 825 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_clear_error (&_inner_error_);
-#line 807 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 825 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return;
-#line 7686 "VideoSupport.c"
+#line 7730 "VideoSupport.c"
 	}
-#line 821 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 839 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp19_ = alteration_new ("metadata", "master-timestamp");
-#line 821 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 839 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp20_ = _tmp19_;
-#line 821 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 839 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp20_);
-#line 821 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 839 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_alteration_unref0 (_tmp20_);
-#line 7696 "VideoSupport.c"
+#line 7740 "VideoSupport.c"
 }
 
 
 gchar* video_get_filename (Video* self) {
 	gchar* result = NULL;
 	GError * _inner_error_ = NULL;
-#line 824 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 842 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (IS_VIDEO (self), NULL);
-#line 7705 "VideoSupport.c"
+#line 7749 "VideoSupport.c"
 	{
 		VideoRow* _tmp0_ = NULL;
-#line 825 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 843 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = self->priv->backing_row;
-#line 825 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 843 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 7712 "VideoSupport.c"
+#line 7756 "VideoSupport.c"
 		{
 			VideoRow* _tmp1_ = NULL;
 			const gchar* _tmp2_ = NULL;
 			gchar* _tmp3_ = NULL;
-#line 826 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 844 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp1_ = self->priv->backing_row;
-#line 826 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 844 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp2_ = _tmp1_->filepath;
-#line 826 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 844 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp3_ = g_strdup (_tmp2_);
-#line 826 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 844 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			result = _tmp3_;
-#line 7725 "VideoSupport.c"
+#line 7769 "VideoSupport.c"
 			{
 				VideoRow* _tmp4_ = NULL;
-#line 825 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 843 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp4_ = self->priv->backing_row;
-#line 825 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 843 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 7732 "VideoSupport.c"
+#line 7776 "VideoSupport.c"
 			}
-#line 826 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 844 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return result;
-#line 7736 "VideoSupport.c"
+#line 7780 "VideoSupport.c"
 		}
-		__finally519:
+		__finally532:
 		{
 			VideoRow* _tmp5_ = NULL;
-#line 825 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 843 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp5_ = self->priv->backing_row;
-#line 825 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 843 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 7745 "VideoSupport.c"
+#line 7789 "VideoSupport.c"
 		}
-#line 825 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 843 "/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 825 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 843 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_clear_error (&_inner_error_);
-#line 825 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 843 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return NULL;
-#line 7753 "VideoSupport.c"
+#line 7797 "VideoSupport.c"
 	}
 }
 
@@ -7765,23 +7809,23 @@ static GFile* video_real_get_file (MediaSource* base) {
 	gchar* _tmp1_ = NULL;
 	GFile* _tmp2_ = NULL;
 	GFile* _tmp3_ = NULL;
-#line 830 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 848 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 831 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 849 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = video_get_filename (self);
-#line 831 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 849 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp1_ = _tmp0_;
-#line 831 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 849 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp2_ = g_file_new_for_path (_tmp1_);
-#line 831 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 849 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp3_ = _tmp2_;
-#line 831 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 849 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_free0 (_tmp1_);
-#line 831 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 849 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = _tmp3_;
-#line 831 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 849 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 7781 "VideoSupport.c"
+#line 7825 "VideoSupport.c"
 }
 
 
@@ -7789,15 +7833,15 @@ static GFile* video_real_get_master_file (MediaSource* base) {
 	Video * self;
 	GFile* result = NULL;
 	GFile* _tmp0_ = NULL;
-#line 834 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 852 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 835 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 853 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = media_source_get_file (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource));
-#line 835 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 853 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = _tmp0_;
-#line 835 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 853 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 7797 "VideoSupport.c"
+#line 7841 "VideoSupport.c"
 }
 
 
@@ -7809,93 +7853,93 @@ void video_export (Video* self, GFile* dest_file, GError** error) {
 	GFile* _tmp3_ = NULL;
 	GFile* _tmp4_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 838 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 856 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail (IS_VIDEO (self));
-#line 838 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 856 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail (G_IS_FILE (dest_file));
-#line 839 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 857 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = video_get_filename (self);
-#line 839 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 857 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp1_ = _tmp0_;
-#line 839 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 857 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp2_ = g_file_new_for_path (_tmp1_);
-#line 839 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 857 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp3_ = _tmp2_;
-#line 839 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 857 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_free0 (_tmp1_);
-#line 839 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 857 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	source_file = _tmp3_;
-#line 840 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 858 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp4_ = dest_file;
-#line 840 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 858 "/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 840 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 858 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 840 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 858 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_propagate_error (error, _inner_error_);
-#line 840 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 858 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (source_file);
-#line 840 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 858 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return;
-#line 7837 "VideoSupport.c"
+#line 7881 "VideoSupport.c"
 	}
-#line 838 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 856 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (source_file);
-#line 7841 "VideoSupport.c"
+#line 7885 "VideoSupport.c"
 }
 
 
 gdouble video_get_clip_duration (Video* self) {
 	gdouble result = 0.0;
 	GError * _inner_error_ = NULL;
-#line 844 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 862 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (IS_VIDEO (self), 0.0);
-#line 7850 "VideoSupport.c"
+#line 7894 "VideoSupport.c"
 	{
 		VideoRow* _tmp0_ = NULL;
-#line 845 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 863 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = self->priv->backing_row;
-#line 845 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 863 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 7857 "VideoSupport.c"
+#line 7901 "VideoSupport.c"
 		{
 			VideoRow* _tmp1_ = NULL;
 			gdouble _tmp2_ = 0.0;
-#line 846 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 864 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp1_ = self->priv->backing_row;
-#line 846 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 864 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp2_ = _tmp1_->clip_duration;
-#line 846 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 864 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			result = _tmp2_;
-#line 7867 "VideoSupport.c"
+#line 7911 "VideoSupport.c"
 			{
 				VideoRow* _tmp3_ = NULL;
-#line 845 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 863 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp3_ = self->priv->backing_row;
-#line 845 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 863 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 7874 "VideoSupport.c"
+#line 7918 "VideoSupport.c"
 			}
-#line 846 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 864 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return result;
-#line 7878 "VideoSupport.c"
+#line 7922 "VideoSupport.c"
 		}
-		__finally520:
+		__finally533:
 		{
 			VideoRow* _tmp4_ = NULL;
-#line 845 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 863 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp4_ = self->priv->backing_row;
-#line 845 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 863 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 7887 "VideoSupport.c"
+#line 7931 "VideoSupport.c"
 		}
-#line 845 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 863 "/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 845 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 863 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_clear_error (&_inner_error_);
-#line 845 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 863 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return 0.0;
-#line 7895 "VideoSupport.c"
+#line 7939 "VideoSupport.c"
 	}
 }
 
@@ -7903,123 +7947,123 @@ gdouble video_get_clip_duration (Video* self) {
 gboolean video_get_is_interpretable (Video* self) {
 	gboolean result = FALSE;
 	GError * _inner_error_ = NULL;
-#line 850 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 868 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (IS_VIDEO (self), FALSE);
-#line 7905 "VideoSupport.c"
+#line 7949 "VideoSupport.c"
 	{
 		VideoRow* _tmp0_ = NULL;
-#line 851 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 869 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = self->priv->backing_row;
-#line 851 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 869 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 7912 "VideoSupport.c"
+#line 7956 "VideoSupport.c"
 		{
 			VideoRow* _tmp1_ = NULL;
 			gboolean _tmp2_ = FALSE;
-#line 852 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 870 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp1_ = self->priv->backing_row;
-#line 852 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 870 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp2_ = _tmp1_->is_interpretable;
-#line 852 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 870 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			result = _tmp2_;
-#line 7922 "VideoSupport.c"
+#line 7966 "VideoSupport.c"
 			{
 				VideoRow* _tmp3_ = NULL;
-#line 851 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 869 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp3_ = self->priv->backing_row;
-#line 851 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 869 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 7929 "VideoSupport.c"
+#line 7973 "VideoSupport.c"
 			}
-#line 852 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 870 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return result;
-#line 7933 "VideoSupport.c"
+#line 7977 "VideoSupport.c"
 		}
-		__finally521:
+		__finally534:
 		{
 			VideoRow* _tmp4_ = NULL;
-#line 851 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 869 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp4_ = self->priv->backing_row;
-#line 851 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 869 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 7942 "VideoSupport.c"
+#line 7986 "VideoSupport.c"
 		}
-#line 851 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 869 "/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 851 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 869 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_clear_error (&_inner_error_);
-#line 851 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 869 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return FALSE;
-#line 7950 "VideoSupport.c"
+#line 7994 "VideoSupport.c"
 	}
 }
 
 
 static void video_set_is_interpretable (Video* self, gboolean is_interpretable) {
 	GError * _inner_error_ = NULL;
-#line 856 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 874 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail (IS_VIDEO (self));
-#line 7959 "VideoSupport.c"
+#line 8003 "VideoSupport.c"
 	{
 		VideoRow* _tmp0_ = NULL;
-#line 857 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 875 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = self->priv->backing_row;
-#line 857 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 875 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 7966 "VideoSupport.c"
+#line 8010 "VideoSupport.c"
 		{
 			VideoRow* _tmp1_ = NULL;
 			gboolean _tmp2_ = FALSE;
 			gboolean _tmp3_ = FALSE;
 			VideoRow* _tmp5_ = NULL;
 			gboolean _tmp6_ = FALSE;
-#line 858 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 876 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp1_ = self->priv->backing_row;
-#line 858 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 876 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp2_ = _tmp1_->is_interpretable;
-#line 858 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 876 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp3_ = is_interpretable;
-#line 858 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 876 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (_tmp2_ == _tmp3_) {
-#line 7981 "VideoSupport.c"
+#line 8025 "VideoSupport.c"
 				{
 					VideoRow* _tmp4_ = NULL;
-#line 857 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 875 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					_tmp4_ = self->priv->backing_row;
-#line 857 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 875 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 7988 "VideoSupport.c"
+#line 8032 "VideoSupport.c"
 				}
-#line 859 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 877 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				return;
-#line 7992 "VideoSupport.c"
+#line 8036 "VideoSupport.c"
 			}
-#line 861 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 879 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp5_ = self->priv->backing_row;
-#line 861 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 879 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp6_ = is_interpretable;
-#line 861 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 879 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp5_->is_interpretable = _tmp6_;
-#line 8000 "VideoSupport.c"
+#line 8044 "VideoSupport.c"
 		}
-		__finally522:
+		__finally535:
 		{
 			VideoRow* _tmp7_ = NULL;
-#line 857 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 875 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp7_ = self->priv->backing_row;
-#line 857 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 875 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 8009 "VideoSupport.c"
+#line 8053 "VideoSupport.c"
 		}
-#line 857 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 875 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 857 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 875 "/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 857 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 875 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_clear_error (&_inner_error_);
-#line 857 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 875 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return;
-#line 8019 "VideoSupport.c"
+#line 8063 "VideoSupport.c"
 		}
 	}
 	{
@@ -8027,61 +8071,61 @@ static void video_set_is_interpretable (Video* self, gboolean is_interpretable)
 		VideoTable* _tmp9_ = NULL;
 		VideoID _tmp10_ = {0};
 		gboolean _tmp11_ = FALSE;
-#line 865 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 883 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp8_ = video_table_get_instance ();
-#line 865 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 883 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp9_ = _tmp8_;
-#line 865 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 883 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		video_get_video_id (self, &_tmp10_);
-#line 865 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 883 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp11_ = is_interpretable;
-#line 865 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 883 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		video_table_update_is_interpretable (_tmp9_, &_tmp10_, _tmp11_, &_inner_error_);
-#line 865 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 883 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_database_table_unref0 (_tmp9_);
-#line 865 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 883 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 865 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 883 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
-#line 8043 "VideoSupport.c"
-				goto __catch523_database_error;
+#line 8087 "VideoSupport.c"
+				goto __catch536_database_error;
 			}
-#line 865 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 883 "/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 865 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 883 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_clear_error (&_inner_error_);
-#line 865 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 883 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return;
-#line 8052 "VideoSupport.c"
+#line 8096 "VideoSupport.c"
 		}
 	}
-	goto __finally523;
-	__catch523_database_error:
+	goto __finally536;
+	__catch536_database_error:
 	{
 		GError* e = NULL;
 		GError* _tmp12_ = NULL;
-#line 864 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 882 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		e = _inner_error_;
-#line 864 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 882 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_inner_error_ = NULL;
-#line 867 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 885 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp12_ = e;
-#line 867 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 885 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		app_window_database_error (_tmp12_);
-#line 864 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 882 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_error_free0 (e);
-#line 8070 "VideoSupport.c"
+#line 8114 "VideoSupport.c"
 	}
-	__finally523:
-#line 864 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	__finally536:
+#line 882 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 864 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 882 "/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 864 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 882 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_clear_error (&_inner_error_);
-#line 864 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 882 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return;
-#line 8081 "VideoSupport.c"
+#line 8125 "VideoSupport.c"
 	}
 }
 
@@ -8108,235 +8152,235 @@ VideoInterpretableResults* video_check_is_interpretable (Video* self) {
 	GdkPixbuf* _tmp27_ = NULL;
 	GdkPixbuf* _tmp28_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 874 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 892 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (IS_VIDEO (self), NULL);
-#line 875 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 893 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = video_interpretable_results_new (self);
-#line 875 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 893 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	results = _tmp0_;
-#line 877 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 895 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	clip_duration = -1.0;
-#line 878 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 896 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	preview_frame = NULL;
-#line 880 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 898 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp1_ = media_source_get_file (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource));
-#line 880 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 898 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp2_ = _tmp1_;
-#line 880 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 898 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp3_ = video_reader_new (_tmp2_);
-#line 880 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 898 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp4_ = _tmp3_;
-#line 880 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 898 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (_tmp2_);
-#line 880 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 898 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	backing_file_reader = _tmp4_;
-#line 8130 "VideoSupport.c"
+#line 8174 "VideoSupport.c"
 	{
 		gdouble _tmp5_ = 0.0;
 		VideoReader* _tmp6_ = NULL;
 		gdouble _tmp7_ = 0.0;
 		VideoReader* _tmp8_ = NULL;
 		GdkPixbuf* _tmp9_ = NULL;
-#line 882 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 900 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp6_ = backing_file_reader;
-#line 882 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 900 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp7_ = video_reader_read_clip_duration (_tmp6_, &_inner_error_);
-#line 882 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 900 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp5_ = _tmp7_;
-#line 882 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 900 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 882 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 900 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (_inner_error_->domain == VIDEO_ERROR) {
-#line 8147 "VideoSupport.c"
-				goto __catch524_video_error;
+#line 8191 "VideoSupport.c"
+				goto __catch537_video_error;
 			}
-#line 882 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 900 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_video_reader_unref0 (backing_file_reader);
-#line 882 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 900 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_object_unref0 (preview_frame);
-#line 882 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 900 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_video_interpretable_results_unref0 (results);
-#line 882 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 900 "/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 900 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_clear_error (&_inner_error_);
-#line 882 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 900 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return NULL;
-#line 8162 "VideoSupport.c"
+#line 8206 "VideoSupport.c"
 		}
-#line 882 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 900 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		clip_duration = _tmp5_;
-#line 883 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 901 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp8_ = backing_file_reader;
-#line 883 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 901 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp9_ = video_reader_read_preview_frame (_tmp8_);
-#line 883 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 901 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (preview_frame);
-#line 883 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 901 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		preview_frame = _tmp9_;
-#line 8174 "VideoSupport.c"
+#line 8218 "VideoSupport.c"
 	}
-	goto __finally524;
-	__catch524_video_error:
+	goto __finally537;
+	__catch537_video_error:
 	{
 		GError* e = NULL;
 		VideoInterpretableResults* _tmp10_ = NULL;
 		gboolean _tmp11_ = FALSE;
 		VideoInterpretableResults* _tmp12_ = NULL;
-#line 881 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 899 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		e = _inner_error_;
-#line 881 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 899 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_inner_error_ = NULL;
-#line 887 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 905 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp10_ = results;
-#line 887 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 905 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp11_ = video_get_is_interpretable (self);
-#line 887 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 905 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp10_->update_interpretable = _tmp11_;
-#line 888 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 906 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp12_ = results;
-#line 888 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 906 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp12_->is_interpretable = FALSE;
-#line 890 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 908 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		result = results;
-#line 890 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 908 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_error_free0 (e);
-#line 890 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 908 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_video_reader_unref0 (backing_file_reader);
-#line 890 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 908 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (preview_frame);
-#line 890 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 908 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return result;
-#line 8207 "VideoSupport.c"
+#line 8251 "VideoSupport.c"
 	}
-	__finally524:
-#line 881 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	__finally537:
+#line 899 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 881 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 899 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_video_reader_unref0 (backing_file_reader);
-#line 881 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 899 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (preview_frame);
-#line 881 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 899 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_video_interpretable_results_unref0 (results);
-#line 881 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 899 "/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 899 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_clear_error (&_inner_error_);
-#line 881 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 899 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return NULL;
-#line 8224 "VideoSupport.c"
+#line 8268 "VideoSupport.c"
 	}
-#line 894 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 912 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp13_ = video_get_is_interpretable (self);
-#line 894 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 912 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp13_) {
-#line 8230 "VideoSupport.c"
+#line 8274 "VideoSupport.c"
 		VideoInterpretableResults* _tmp14_ = NULL;
 		VideoInterpretableResults* _tmp15_ = NULL;
-#line 895 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 913 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp14_ = results;
-#line 895 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 913 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp14_->update_interpretable = FALSE;
-#line 896 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 914 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp15_ = results;
-#line 896 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 914 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp15_->is_interpretable = TRUE;
-#line 898 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 916 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		result = results;
-#line 898 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 916 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_video_reader_unref0 (backing_file_reader);
-#line 898 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 916 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (preview_frame);
-#line 898 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 916 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return result;
-#line 8249 "VideoSupport.c"
+#line 8293 "VideoSupport.c"
 	}
-#line 901 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 919 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp16_ = media_source_get_file (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource));
-#line 901 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 919 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp17_ = _tmp16_;
-#line 901 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 919 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp18_ = g_file_get_basename (_tmp17_);
-#line 901 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 919 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp19_ = _tmp18_;
-#line 901 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	g_debug ("VideoSupport.vala:901: video %s has become interpretable", _tmp19_);
-#line 901 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 919 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	g_debug ("VideoSupport.vala:919: video %s has become interpretable", _tmp19_);
+#line 919 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_free0 (_tmp19_);
-#line 901 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 919 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (_tmp17_);
-#line 8265 "VideoSupport.c"
+#line 8309 "VideoSupport.c"
 	{
 		VideoRow* _tmp20_ = NULL;
-#line 904 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 922 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp20_ = self->priv->backing_row;
-#line 904 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 922 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 8272 "VideoSupport.c"
+#line 8316 "VideoSupport.c"
 		{
 			VideoRow* _tmp21_ = NULL;
 			gdouble _tmp22_ = 0.0;
-#line 905 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 923 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp21_ = self->priv->backing_row;
-#line 905 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 923 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp22_ = clip_duration;
-#line 905 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 923 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp21_->clip_duration = _tmp22_;
-#line 8282 "VideoSupport.c"
+#line 8326 "VideoSupport.c"
 		}
-		__finally525:
+		__finally538:
 		{
 			VideoRow* _tmp23_ = NULL;
-#line 904 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 922 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp23_ = self->priv->backing_row;
-#line 904 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 922 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 8291 "VideoSupport.c"
+#line 8335 "VideoSupport.c"
 		}
-#line 904 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 922 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 904 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 922 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_video_reader_unref0 (backing_file_reader);
-#line 904 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 922 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_object_unref0 (preview_frame);
-#line 904 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 922 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_video_interpretable_results_unref0 (results);
-#line 904 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 922 "/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 904 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 922 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_clear_error (&_inner_error_);
-#line 904 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 922 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return NULL;
-#line 8307 "VideoSupport.c"
+#line 8351 "VideoSupport.c"
 		}
 	}
-#line 908 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 926 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp24_ = results;
-#line 908 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 926 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp24_->update_interpretable = TRUE;
-#line 909 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 927 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp25_ = results;
-#line 909 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 927 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp25_->is_interpretable = TRUE;
-#line 910 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 928 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp26_ = results;
-#line 910 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 928 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp27_ = preview_frame;
-#line 910 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 928 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp28_ = _g_object_ref0 (_tmp27_);
-#line 910 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 928 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (_tmp26_->new_thumbnail);
-#line 910 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 928 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp26_->new_thumbnail = _tmp28_;
-#line 912 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 930 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = results;
-#line 912 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 930 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_video_reader_unref0 (backing_file_reader);
-#line 912 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 930 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (preview_frame);
-#line 912 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 930 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 8336 "VideoSupport.c"
+#line 8380 "VideoSupport.c"
 }
 
 
@@ -8345,81 +8389,81 @@ static void video_real_destroy (DataSource* base) {
 	VideoID video_id = {0};
 	VideoID _tmp0_ = {0};
 	GError * _inner_error_ = NULL;
-#line 915 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 933 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 916 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 934 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video_get_video_id (self, &_tmp0_);
-#line 916 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 934 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video_id = _tmp0_;
-#line 918 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 936 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	thumbnail_cache_remove (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_THUMBNAIL_SOURCE, ThumbnailSource));
-#line 8353 "VideoSupport.c"
+#line 8397 "VideoSupport.c"
 	{
 		VideoTable* _tmp1_ = NULL;
 		VideoTable* _tmp2_ = NULL;
 		VideoID _tmp3_ = {0};
-#line 921 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 939 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp1_ = video_table_get_instance ();
-#line 921 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 939 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp2_ = _tmp1_;
-#line 921 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 939 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp3_ = video_id;
-#line 921 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 939 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		video_table_remove (_tmp2_, &_tmp3_, &_inner_error_);
-#line 921 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 939 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_database_table_unref0 (_tmp2_);
-#line 921 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 939 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 921 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 939 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
-#line 8372 "VideoSupport.c"
-				goto __catch526_database_error;
+#line 8416 "VideoSupport.c"
+				goto __catch539_database_error;
 			}
-#line 921 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 939 "/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 921 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 939 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_clear_error (&_inner_error_);
-#line 921 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 939 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return;
-#line 8381 "VideoSupport.c"
+#line 8425 "VideoSupport.c"
 		}
 	}
-	goto __finally526;
-	__catch526_database_error:
+	goto __finally539;
+	__catch539_database_error:
 	{
 		GError* err = NULL;
 		gchar* _tmp4_ = NULL;
 		gchar* _tmp5_ = NULL;
-#line 920 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 938 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		err = _inner_error_;
-#line 920 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 938 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_inner_error_ = NULL;
-#line 923 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 941 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp4_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject));
-#line 923 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 941 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp5_ = _tmp4_;
-#line 923 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		g_error ("VideoSupport.vala:923: failed to remove video %s from video table", _tmp5_);
-#line 923 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 941 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+		g_error ("VideoSupport.vala:941: failed to remove video %s from video table", _tmp5_);
+#line 941 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_free0 (_tmp5_);
-#line 920 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 938 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_error_free0 (err);
-#line 8404 "VideoSupport.c"
+#line 8448 "VideoSupport.c"
 	}
-	__finally526:
-#line 920 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	__finally539:
+#line 938 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 920 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 938 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 920 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 938 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_clear_error (&_inner_error_);
-#line 920 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 938 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return;
-#line 8415 "VideoSupport.c"
+#line 8459 "VideoSupport.c"
 	}
-#line 926 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 944 "/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 8419 "VideoSupport.c"
+#line 8463 "VideoSupport.c"
 }
 
 
@@ -8432,39 +8476,39 @@ static gboolean video_real_internal_delete_backing (DataSource* base, GError** e
 	gboolean _tmp2_ = FALSE;
 	gboolean _tmp3_ = FALSE;
 	GError * _inner_error_ = NULL;
-#line 929 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 947 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 930 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 948 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = media_source_delete_original_file (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource));
-#line 930 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 948 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	ret = _tmp0_;
-#line 933 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 951 "/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 933 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 951 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp2_ = _tmp3_;
-#line 933 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 951 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 933 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 951 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_propagate_error (error, _inner_error_);
-#line 933 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 951 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return FALSE;
-#line 8448 "VideoSupport.c"
+#line 8492 "VideoSupport.c"
 	}
-#line 933 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 951 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp2_) {
-#line 933 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 951 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp1_ = ret;
-#line 8454 "VideoSupport.c"
+#line 8498 "VideoSupport.c"
 	} else {
-#line 933 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 951 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp1_ = FALSE;
-#line 8458 "VideoSupport.c"
+#line 8502 "VideoSupport.c"
 	}
-#line 933 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 951 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = _tmp1_;
-#line 933 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 951 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 8464 "VideoSupport.c"
+#line 8508 "VideoSupport.c"
 }
 
 
@@ -8473,41 +8517,41 @@ static void video_notify_flags_altered (Video* self, Alteration* additional_alte
 	Alteration* _tmp0_ = NULL;
 	Alteration* _tmp1_ = NULL;
 	Alteration* _tmp5_ = NULL;
-#line 936 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 954 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail (IS_VIDEO (self));
-#line 936 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 954 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail ((additional_alteration == NULL) || IS_ALTERATION (additional_alteration));
-#line 937 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 955 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = alteration_new ("metadata", "flags");
-#line 937 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 955 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	alteration = _tmp0_;
-#line 938 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 956 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp1_ = additional_alteration;
-#line 938 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 956 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp1_ != NULL) {
-#line 8485 "VideoSupport.c"
+#line 8529 "VideoSupport.c"
 		Alteration* _tmp2_ = NULL;
 		Alteration* _tmp3_ = NULL;
 		Alteration* _tmp4_ = NULL;
-#line 939 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 957 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp2_ = alteration;
-#line 939 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 957 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp3_ = additional_alteration;
-#line 939 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 957 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp4_ = alteration_compress (_tmp2_, _tmp3_);
-#line 939 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 957 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_alteration_unref0 (alteration);
-#line 939 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 957 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		alteration = _tmp4_;
-#line 8499 "VideoSupport.c"
+#line 8543 "VideoSupport.c"
 	}
-#line 941 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 959 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp5_ = alteration;
-#line 941 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 959 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp5_);
-#line 936 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 954 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_alteration_unref0 (alteration);
-#line 8507 "VideoSupport.c"
+#line 8551 "VideoSupport.c"
 }
 
 
@@ -8516,18 +8560,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 944 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 962 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (IS_VIDEO (self), 0ULL);
-#line 944 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 962 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail ((additional_alteration == NULL) || IS_ALTERATION (additional_alteration), 0ULL);
-#line 8520 "VideoSupport.c"
+#line 8564 "VideoSupport.c"
 	{
 		VideoRow* _tmp0_ = NULL;
-#line 946 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 964 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = self->priv->backing_row;
-#line 946 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 964 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 8527 "VideoSupport.c"
+#line 8571 "VideoSupport.c"
 		{
 			VideoRow* _tmp1_ = NULL;
 			guint64 _tmp2_ = 0ULL;
@@ -8538,180 +8582,180 @@ guint64 video_add_flags (Video* self, guint64 flags_to_add, Alteration* addition
 			guint64 _tmp7_ = 0ULL;
 			VideoRow* _tmp21_ = NULL;
 			guint64 _tmp22_ = 0ULL;
-#line 947 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 965 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp1_ = self->priv->backing_row;
-#line 947 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 965 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp2_ = _tmp1_->flags;
-#line 947 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 965 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp3_ = flags_to_add;
-#line 947 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 965 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp4_ = media_source_internal_add_flags (_tmp2_, _tmp3_);
-#line 947 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 965 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			new_flags = _tmp4_;
-#line 948 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 966 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp5_ = self->priv->backing_row;
-#line 948 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 966 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp6_ = _tmp5_->flags;
-#line 948 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 966 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp7_ = new_flags;
-#line 948 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 966 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (_tmp6_ == _tmp7_) {
-#line 8556 "VideoSupport.c"
+#line 8600 "VideoSupport.c"
 				VideoRow* _tmp8_ = NULL;
 				guint64 _tmp9_ = 0ULL;
-#line 949 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 967 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp8_ = self->priv->backing_row;
-#line 949 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 967 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp9_ = _tmp8_->flags;
-#line 949 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 967 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				result = _tmp9_;
-#line 8565 "VideoSupport.c"
+#line 8609 "VideoSupport.c"
 				{
 					VideoRow* _tmp10_ = NULL;
-#line 946 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 964 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					_tmp10_ = self->priv->backing_row;
-#line 946 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 964 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 8572 "VideoSupport.c"
+#line 8616 "VideoSupport.c"
 				}
-#line 949 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 967 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				return result;
-#line 8576 "VideoSupport.c"
+#line 8620 "VideoSupport.c"
 			}
 			{
 				VideoTable* _tmp11_ = NULL;
 				VideoTable* _tmp12_ = NULL;
 				VideoID _tmp13_ = {0};
 				guint64 _tmp14_ = 0ULL;
-#line 952 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 970 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp11_ = video_table_get_instance ();
-#line 952 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 970 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp12_ = _tmp11_;
-#line 952 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 970 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				video_get_video_id (self, &_tmp13_);
-#line 952 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 970 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp14_ = new_flags;
-#line 952 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 970 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				video_table_set_flags (_tmp12_, &_tmp13_, _tmp14_, &_inner_error_);
-#line 952 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 970 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_database_table_unref0 (_tmp12_);
-#line 952 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 970 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 952 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 970 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					if (_inner_error_->domain == DATABASE_ERROR) {
-#line 8599 "VideoSupport.c"
-						goto __catch528_database_error;
+#line 8643 "VideoSupport.c"
+						goto __catch541_database_error;
 					}
 					{
 						VideoRow* _tmp15_ = NULL;
-#line 946 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 964 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 						_tmp15_ = self->priv->backing_row;
-#line 946 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 964 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 						g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 8608 "VideoSupport.c"
+#line 8652 "VideoSupport.c"
 					}
-#line 952 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 970 "/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 952 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 970 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					g_clear_error (&_inner_error_);
-#line 952 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 970 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					return 0ULL;
-#line 8616 "VideoSupport.c"
+#line 8660 "VideoSupport.c"
 				}
 			}
-			goto __finally528;
-			__catch528_database_error:
+			goto __finally541;
+			__catch541_database_error:
 			{
 				GError* e = NULL;
 				GError* _tmp16_ = NULL;
 				VideoRow* _tmp17_ = NULL;
 				guint64 _tmp18_ = 0ULL;
-#line 951 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 969 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				e = _inner_error_;
-#line 951 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 969 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_inner_error_ = NULL;
-#line 954 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 972 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp16_ = e;
-#line 954 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 972 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				app_window_database_error (_tmp16_);
-#line 955 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 973 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp17_ = self->priv->backing_row;
-#line 955 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 973 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp18_ = _tmp17_->flags;
-#line 955 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 973 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				result = _tmp18_;
-#line 955 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 973 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_error_free0 (e);
-#line 8642 "VideoSupport.c"
+#line 8686 "VideoSupport.c"
 				{
 					VideoRow* _tmp19_ = NULL;
-#line 946 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 964 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					_tmp19_ = self->priv->backing_row;
-#line 946 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 964 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 8649 "VideoSupport.c"
+#line 8693 "VideoSupport.c"
 				}
-#line 955 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 973 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				return result;
-#line 8653 "VideoSupport.c"
+#line 8697 "VideoSupport.c"
 			}
-			__finally528:
-#line 951 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+			__finally541:
+#line 969 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 8658 "VideoSupport.c"
+#line 8702 "VideoSupport.c"
 				{
 					VideoRow* _tmp20_ = NULL;
-#line 946 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 964 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					_tmp20_ = self->priv->backing_row;
-#line 946 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 964 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 8665 "VideoSupport.c"
+#line 8709 "VideoSupport.c"
 				}
-#line 951 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 969 "/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 951 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 969 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_clear_error (&_inner_error_);
-#line 951 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 969 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				return 0ULL;
-#line 8673 "VideoSupport.c"
+#line 8717 "VideoSupport.c"
 			}
-#line 958 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 976 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp21_ = self->priv->backing_row;
-#line 958 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 976 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp22_ = new_flags;
-#line 958 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 976 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp21_->flags = _tmp22_;
-#line 8681 "VideoSupport.c"
+#line 8725 "VideoSupport.c"
 		}
-		__finally527:
+		__finally540:
 		{
 			VideoRow* _tmp23_ = NULL;
-#line 946 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 964 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp23_ = self->priv->backing_row;
-#line 946 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 964 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 8690 "VideoSupport.c"
+#line 8734 "VideoSupport.c"
 		}
-#line 946 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 964 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 946 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 964 "/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 946 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 964 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_clear_error (&_inner_error_);
-#line 946 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 964 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return 0ULL;
-#line 8700 "VideoSupport.c"
+#line 8744 "VideoSupport.c"
 		}
 	}
-#line 961 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 979 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp24_ = additional_alteration;
-#line 961 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 979 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video_notify_flags_altered (self, _tmp24_);
-#line 963 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 981 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = new_flags;
-#line 963 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 981 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 8711 "VideoSupport.c"
+#line 8755 "VideoSupport.c"
 }
 
 
@@ -8720,18 +8764,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 966 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 984 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (IS_VIDEO (self), 0ULL);
-#line 966 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 984 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail ((additional_alteration == NULL) || IS_ALTERATION (additional_alteration), 0ULL);
-#line 8724 "VideoSupport.c"
+#line 8768 "VideoSupport.c"
 	{
 		VideoRow* _tmp0_ = NULL;
-#line 968 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 986 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = self->priv->backing_row;
-#line 968 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 986 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 8731 "VideoSupport.c"
+#line 8775 "VideoSupport.c"
 		{
 			VideoRow* _tmp1_ = NULL;
 			guint64 _tmp2_ = 0ULL;
@@ -8742,240 +8786,240 @@ guint64 video_remove_flags (Video* self, guint64 flags_to_remove, Alteration* ad
 			guint64 _tmp7_ = 0ULL;
 			VideoRow* _tmp21_ = NULL;
 			guint64 _tmp22_ = 0ULL;
-#line 969 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 987 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp1_ = self->priv->backing_row;
-#line 969 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 987 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp2_ = _tmp1_->flags;
-#line 969 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 987 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp3_ = flags_to_remove;
-#line 969 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 987 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp4_ = media_source_internal_remove_flags (_tmp2_, _tmp3_);
-#line 969 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 987 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			new_flags = _tmp4_;
-#line 970 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 988 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp5_ = self->priv->backing_row;
-#line 970 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 988 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp6_ = _tmp5_->flags;
-#line 970 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 988 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp7_ = new_flags;
-#line 970 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 988 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (_tmp6_ == _tmp7_) {
-#line 8760 "VideoSupport.c"
+#line 8804 "VideoSupport.c"
 				VideoRow* _tmp8_ = NULL;
 				guint64 _tmp9_ = 0ULL;
-#line 971 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 989 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp8_ = self->priv->backing_row;
-#line 971 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 989 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp9_ = _tmp8_->flags;
-#line 971 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 989 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				result = _tmp9_;
-#line 8769 "VideoSupport.c"
+#line 8813 "VideoSupport.c"
 				{
 					VideoRow* _tmp10_ = NULL;
-#line 968 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 986 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					_tmp10_ = self->priv->backing_row;
-#line 968 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 986 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 8776 "VideoSupport.c"
+#line 8820 "VideoSupport.c"
 				}
-#line 971 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 989 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				return result;
-#line 8780 "VideoSupport.c"
+#line 8824 "VideoSupport.c"
 			}
 			{
 				VideoTable* _tmp11_ = NULL;
 				VideoTable* _tmp12_ = NULL;
 				VideoID _tmp13_ = {0};
 				guint64 _tmp14_ = 0ULL;
-#line 974 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 992 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp11_ = video_table_get_instance ();
-#line 974 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 992 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp12_ = _tmp11_;
-#line 974 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 992 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				video_get_video_id (self, &_tmp13_);
-#line 974 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 992 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp14_ = new_flags;
-#line 974 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 992 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				video_table_set_flags (_tmp12_, &_tmp13_, _tmp14_, &_inner_error_);
-#line 974 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 992 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_database_table_unref0 (_tmp12_);
-#line 974 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 992 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 974 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 992 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					if (_inner_error_->domain == DATABASE_ERROR) {
-#line 8803 "VideoSupport.c"
-						goto __catch530_database_error;
+#line 8847 "VideoSupport.c"
+						goto __catch543_database_error;
 					}
 					{
 						VideoRow* _tmp15_ = NULL;
-#line 968 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 986 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 						_tmp15_ = self->priv->backing_row;
-#line 968 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 986 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 						g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 8812 "VideoSupport.c"
+#line 8856 "VideoSupport.c"
 					}
-#line 974 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 992 "/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 974 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 992 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					g_clear_error (&_inner_error_);
-#line 974 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 992 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					return 0ULL;
-#line 8820 "VideoSupport.c"
+#line 8864 "VideoSupport.c"
 				}
 			}
-			goto __finally530;
-			__catch530_database_error:
+			goto __finally543;
+			__catch543_database_error:
 			{
 				GError* e = NULL;
 				GError* _tmp16_ = NULL;
 				VideoRow* _tmp17_ = NULL;
 				guint64 _tmp18_ = 0ULL;
-#line 973 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 991 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				e = _inner_error_;
-#line 973 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 991 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_inner_error_ = NULL;
-#line 976 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 994 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp16_ = e;
-#line 976 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 994 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				app_window_database_error (_tmp16_);
-#line 977 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 995 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp17_ = self->priv->backing_row;
-#line 977 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 995 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp18_ = _tmp17_->flags;
-#line 977 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 995 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				result = _tmp18_;
-#line 977 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 995 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_error_free0 (e);
-#line 8846 "VideoSupport.c"
+#line 8890 "VideoSupport.c"
 				{
 					VideoRow* _tmp19_ = NULL;
-#line 968 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 986 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					_tmp19_ = self->priv->backing_row;
-#line 968 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 986 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 8853 "VideoSupport.c"
+#line 8897 "VideoSupport.c"
 				}
-#line 977 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 995 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				return result;
-#line 8857 "VideoSupport.c"
+#line 8901 "VideoSupport.c"
 			}
-			__finally530:
-#line 973 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+			__finally543:
+#line 991 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 8862 "VideoSupport.c"
+#line 8906 "VideoSupport.c"
 				{
 					VideoRow* _tmp20_ = NULL;
-#line 968 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 986 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					_tmp20_ = self->priv->backing_row;
-#line 968 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 986 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 8869 "VideoSupport.c"
+#line 8913 "VideoSupport.c"
 				}
-#line 973 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 991 "/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 973 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 991 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_clear_error (&_inner_error_);
-#line 973 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 991 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				return 0ULL;
-#line 8877 "VideoSupport.c"
+#line 8921 "VideoSupport.c"
 			}
-#line 980 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 998 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp21_ = self->priv->backing_row;
-#line 980 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 998 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp22_ = new_flags;
-#line 980 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 998 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp21_->flags = _tmp22_;
-#line 8885 "VideoSupport.c"
+#line 8929 "VideoSupport.c"
 		}
-		__finally529:
+		__finally542:
 		{
 			VideoRow* _tmp23_ = NULL;
-#line 968 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 986 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp23_ = self->priv->backing_row;
-#line 968 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 986 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 8894 "VideoSupport.c"
+#line 8938 "VideoSupport.c"
 		}
-#line 968 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 986 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 968 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 986 "/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 968 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 986 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_clear_error (&_inner_error_);
-#line 968 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 986 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return 0ULL;
-#line 8904 "VideoSupport.c"
+#line 8948 "VideoSupport.c"
 		}
 	}
-#line 983 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1001 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp24_ = additional_alteration;
-#line 983 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1001 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video_notify_flags_altered (self, _tmp24_);
-#line 985 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1003 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = new_flags;
-#line 985 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1003 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 8915 "VideoSupport.c"
+#line 8959 "VideoSupport.c"
 }
 
 
 gboolean video_is_flag_set (Video* self, guint64 flag) {
 	gboolean result = FALSE;
 	GError * _inner_error_ = NULL;
-#line 988 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1006 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (IS_VIDEO (self), FALSE);
-#line 8924 "VideoSupport.c"
+#line 8968 "VideoSupport.c"
 	{
 		VideoRow* _tmp0_ = NULL;
-#line 989 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1007 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = self->priv->backing_row;
-#line 989 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1007 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 8931 "VideoSupport.c"
+#line 8975 "VideoSupport.c"
 		{
 			VideoRow* _tmp1_ = NULL;
 			guint64 _tmp2_ = 0ULL;
 			guint64 _tmp3_ = 0ULL;
 			gboolean _tmp4_ = FALSE;
-#line 990 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1008 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp1_ = self->priv->backing_row;
-#line 990 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1008 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp2_ = _tmp1_->flags;
-#line 990 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1008 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp3_ = flag;
-#line 990 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1008 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp4_ = media_source_internal_is_flag_set (_tmp2_, _tmp3_);
-#line 990 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1008 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			result = _tmp4_;
-#line 8947 "VideoSupport.c"
+#line 8991 "VideoSupport.c"
 			{
 				VideoRow* _tmp5_ = NULL;
-#line 989 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1007 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp5_ = self->priv->backing_row;
-#line 989 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1007 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 8954 "VideoSupport.c"
+#line 8998 "VideoSupport.c"
 			}
-#line 990 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1008 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return result;
-#line 8958 "VideoSupport.c"
+#line 9002 "VideoSupport.c"
 		}
-		__finally531:
+		__finally544:
 		{
 			VideoRow* _tmp6_ = NULL;
-#line 989 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1007 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp6_ = self->priv->backing_row;
-#line 989 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1007 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 8967 "VideoSupport.c"
+#line 9011 "VideoSupport.c"
 		}
-#line 989 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1007 "/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 989 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1007 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_clear_error (&_inner_error_);
-#line 989 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1007 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return FALSE;
-#line 8975 "VideoSupport.c"
+#line 9019 "VideoSupport.c"
 	}
 }
 
@@ -8994,27 +9038,27 @@ static void video_real_set_master_file (Monitorable* base, GFile* file) {
 	Alteration* _tmp25_ = NULL;
 	Alteration* _tmp26_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 994 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1012 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 994 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1012 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail (G_IS_FILE (file));
-#line 995 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1013 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = file;
-#line 995 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1013 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp1_ = g_file_get_path (_tmp0_);
-#line 995 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1013 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	new_filepath = _tmp1_;
-#line 996 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1014 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	old_filepath = NULL;
-#line 9006 "VideoSupport.c"
+#line 9050 "VideoSupport.c"
 	{
 		{
 			VideoRow* _tmp2_ = NULL;
-#line 998 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1016 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp2_ = self->priv->backing_row;
-#line 998 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1016 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 9014 "VideoSupport.c"
+#line 9058 "VideoSupport.c"
 			{
 				VideoRow* _tmp3_ = NULL;
 				const gchar* _tmp4_ = NULL;
@@ -9030,169 +9074,169 @@ static void video_real_set_master_file (Monitorable* base, GFile* file) {
 				VideoRow* _tmp15_ = NULL;
 				const gchar* _tmp16_ = NULL;
 				gchar* _tmp17_ = NULL;
-#line 999 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1017 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp3_ = self->priv->backing_row;
-#line 999 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1017 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp4_ = _tmp3_->filepath;
-#line 999 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1017 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp5_ = new_filepath;
-#line 999 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1017 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				if (g_strcmp0 (_tmp4_, _tmp5_) == 0) {
-#line 9038 "VideoSupport.c"
+#line 9082 "VideoSupport.c"
 					{
 						VideoRow* _tmp6_ = NULL;
-#line 998 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1016 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 						_tmp6_ = self->priv->backing_row;
-#line 998 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1016 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 						g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 9045 "VideoSupport.c"
+#line 9089 "VideoSupport.c"
 					}
-#line 1000 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1018 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					_g_free0 (old_filepath);
-#line 1000 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1018 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					_g_free0 (new_filepath);
-#line 1000 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1018 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					return;
-#line 9053 "VideoSupport.c"
+#line 9097 "VideoSupport.c"
 				}
-#line 1002 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1020 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp7_ = self->priv->backing_row;
-#line 1002 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1020 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp8_ = _tmp7_->filepath;
-#line 1002 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1020 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp9_ = g_strdup (_tmp8_);
-#line 1002 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1020 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_free0 (old_filepath);
-#line 1002 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1020 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				old_filepath = _tmp9_;
-#line 1004 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1022 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp10_ = video_table_get_instance ();
-#line 1004 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1022 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp11_ = _tmp10_;
-#line 1004 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1022 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp12_ = self->priv->backing_row;
-#line 1004 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1022 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp13_ = _tmp12_->video_id;
-#line 1004 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1022 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp14_ = new_filepath;
-#line 1004 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1022 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				video_table_set_filepath (_tmp11_, &_tmp13_, _tmp14_, &_inner_error_);
-#line 1004 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1022 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_database_table_unref0 (_tmp11_);
-#line 1004 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1022 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 9081 "VideoSupport.c"
-					goto __finally533;
+#line 9125 "VideoSupport.c"
+					goto __finally546;
 				}
-#line 1005 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1023 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp15_ = self->priv->backing_row;
-#line 1005 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1023 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp16_ = new_filepath;
-#line 1005 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1023 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp17_ = g_strdup (_tmp16_);
-#line 1005 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1023 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_free0 (_tmp15_->filepath);
-#line 1005 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1023 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp15_->filepath = _tmp17_;
-#line 9094 "VideoSupport.c"
+#line 9138 "VideoSupport.c"
 			}
-			__finally533:
+			__finally546:
 			{
 				VideoRow* _tmp18_ = NULL;
-#line 998 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1016 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp18_ = self->priv->backing_row;
-#line 998 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1016 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 9103 "VideoSupport.c"
+#line 9147 "VideoSupport.c"
 			}
-#line 998 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1016 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 998 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1016 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				if (_inner_error_->domain == DATABASE_ERROR) {
-#line 9109 "VideoSupport.c"
-					goto __catch532_database_error;
+#line 9153 "VideoSupport.c"
+					goto __catch545_database_error;
 				}
-#line 998 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1016 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_free0 (old_filepath);
-#line 998 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1016 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_free0 (new_filepath);
-#line 998 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1016 "/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 998 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1016 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_clear_error (&_inner_error_);
-#line 998 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1016 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				return;
-#line 9122 "VideoSupport.c"
+#line 9166 "VideoSupport.c"
 			}
 		}
 	}
-	goto __finally532;
-	__catch532_database_error:
+	goto __finally545;
+	__catch545_database_error:
 	{
 		GError* err = NULL;
 		GError* _tmp19_ = NULL;
-#line 997 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1015 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		err = _inner_error_;
-#line 997 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1015 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_inner_error_ = NULL;
-#line 1008 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1026 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp19_ = err;
-#line 1008 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1026 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		app_window_database_error (_tmp19_);
-#line 1010 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1028 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_error_free0 (err);
-#line 1010 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1028 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_free0 (old_filepath);
-#line 1010 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1028 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_free0 (new_filepath);
-#line 1010 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1028 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return;
-#line 9147 "VideoSupport.c"
+#line 9191 "VideoSupport.c"
 	}
-	__finally532:
-#line 997 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	__finally545:
+#line 1015 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 997 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1015 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_free0 (old_filepath);
-#line 997 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1015 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_free0 (new_filepath);
-#line 997 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1015 "/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 997 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1015 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_clear_error (&_inner_error_);
-#line 997 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1015 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return;
-#line 9162 "VideoSupport.c"
+#line 9206 "VideoSupport.c"
 	}
-#line 1013 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1031 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp20_ = old_filepath;
-#line 1013 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1031 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_vala_assert (_tmp20_ != NULL, "old_filepath != null");
-#line 1014 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1032 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp21_ = old_filepath;
-#line 1014 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1032 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp22_ = g_file_new_for_path (_tmp21_);
-#line 1014 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1032 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp23_ = _tmp22_;
-#line 1014 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1032 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp24_ = file;
-#line 1014 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1032 "/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 1014 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1032 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (_tmp23_);
-#line 1016 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1034 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp25_ = alteration_new_from_list ("backing:master,metadata:name");
-#line 1016 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1034 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp26_ = _tmp25_;
-#line 1016 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1034 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp26_);
-#line 1016 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1034 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_alteration_unref0 (_tmp26_);
-#line 994 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1012 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_free0 (old_filepath);
-#line 994 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1012 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_free0 (new_filepath);
-#line 9192 "VideoSupport.c"
+#line 9236 "VideoSupport.c"
 }
 
 
@@ -9207,45 +9251,45 @@ VideoMetadata* video_read_metadata (Video* self, GError** error) {
 	VideoMetadata* _tmp6_ = NULL;
 	VideoMetadata* _tmp7_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 1019 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1037 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (IS_VIDEO (self), NULL);
-#line 1020 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1038 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp1_ = media_source_get_file (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource));
-#line 1020 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1038 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp2_ = _tmp1_;
-#line 1020 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1038 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp3_ = video_reader_new (_tmp2_);
-#line 1020 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1038 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp4_ = _tmp3_;
-#line 1020 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1038 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp5_ = video_reader_read_metadata (_tmp4_, &_inner_error_);
-#line 1020 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1038 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp6_ = _tmp5_;
-#line 1020 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1038 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_video_reader_unref0 (_tmp4_);
-#line 1020 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1038 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (_tmp2_);
-#line 1020 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1038 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = _tmp6_;
-#line 1020 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1038 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1020 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1038 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_propagate_error (error, _inner_error_);
-#line 1020 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1038 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return NULL;
-#line 9233 "VideoSupport.c"
+#line 9277 "VideoSupport.c"
 	}
-#line 1020 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1038 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp7_ = _tmp0_;
-#line 1020 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1038 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = NULL;
-#line 1020 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1038 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = _tmp7_;
-#line 1020 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1038 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_media_metadata_unref0 (_tmp0_);
-#line 1020 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1038 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 9245 "VideoSupport.c"
+#line 9289 "VideoSupport.c"
 }
 
 
@@ -9267,14 +9311,14 @@ VideoInterpretableResults* video_interpretable_results_construct (GType object_t
 	self->video = _tmp1_;
 #line 320 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return self;
-#line 9267 "VideoSupport.c"
+#line 9311 "VideoSupport.c"
 }
 
 
 VideoInterpretableResults* video_interpretable_results_new (Video* video) {
 #line 320 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return video_interpretable_results_construct (VIDEO_TYPE_INTERPRETABLE_RESULTS, video);
-#line 9274 "VideoSupport.c"
+#line 9318 "VideoSupport.c"
 }
 
 
@@ -9288,7 +9332,7 @@ void video_interpretable_results_foreground_finish (VideoInterpretableResults* s
 	_tmp0_ = self->update_interpretable;
 #line 325 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp0_) {
-#line 9288 "VideoSupport.c"
+#line 9332 "VideoSupport.c"
 		Video* _tmp1_ = NULL;
 		gboolean _tmp2_ = FALSE;
 #line 326 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -9297,13 +9341,13 @@ void video_interpretable_results_foreground_finish (VideoInterpretableResults* s
 		_tmp2_ = self->is_interpretable;
 #line 326 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		video_set_is_interpretable (_tmp1_, _tmp2_);
-#line 9297 "VideoSupport.c"
+#line 9341 "VideoSupport.c"
 	}
 #line 328 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp3_ = self->new_thumbnail;
 #line 328 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp3_ != NULL) {
-#line 9303 "VideoSupport.c"
+#line 9347 "VideoSupport.c"
 		{
 			Video* _tmp4_ = NULL;
 			GdkPixbuf* _tmp5_ = NULL;
@@ -9318,8 +9362,8 @@ void video_interpretable_results_foreground_finish (VideoInterpretableResults* s
 			thumbnail_cache_replace (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_THUMBNAIL_SOURCE, ThumbnailSource), THUMBNAIL_CACHE_SIZE_BIG, _tmp5_, &_inner_error_);
 #line 330 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 9318 "VideoSupport.c"
-				goto __catch534_g_error;
+#line 9362 "VideoSupport.c"
+				goto __catch547_g_error;
 			}
 #line 331 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp6_ = self->video;
@@ -9329,17 +9373,17 @@ void video_interpretable_results_foreground_finish (VideoInterpretableResults* s
 			thumbnail_cache_replace (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_THUMBNAIL_SOURCE, ThumbnailSource), THUMBNAIL_CACHE_SIZE_MEDIUM, _tmp7_, &_inner_error_);
 #line 331 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 9329 "VideoSupport.c"
-				goto __catch534_g_error;
+#line 9373 "VideoSupport.c"
+				goto __catch547_g_error;
 			}
 #line 333 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp8_ = self->video;
 #line 333 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			thumbnail_source_notify_thumbnail_altered (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_THUMBNAIL_SOURCE, ThumbnailSource));
-#line 9336 "VideoSupport.c"
+#line 9380 "VideoSupport.c"
 		}
-		goto __finally534;
-		__catch534_g_error:
+		goto __finally547;
+		__catch547_g_error:
 		{
 			GError* err = NULL;
 			Video* _tmp9_ = NULL;
@@ -9367,9 +9411,9 @@ void video_interpretable_results_foreground_finish (VideoInterpretableResults* s
 			_g_free0 (_tmp11_);
 #line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_error_free0 (err);
-#line 9367 "VideoSupport.c"
+#line 9411 "VideoSupport.c"
 		}
-		__finally534:
+		__finally547:
 #line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -9378,7 +9422,7 @@ void video_interpretable_results_foreground_finish (VideoInterpretableResults* s
 			g_clear_error (&_inner_error_);
 #line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return;
-#line 9378 "VideoSupport.c"
+#line 9422 "VideoSupport.c"
 		}
 	}
 }
@@ -9387,7 +9431,7 @@ void video_interpretable_results_foreground_finish (VideoInterpretableResults* s
 static void video_value_interpretable_results_init (GValue* value) {
 #line 314 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	value->data[0].v_pointer = NULL;
-#line 9387 "VideoSupport.c"
+#line 9431 "VideoSupport.c"
 }
 
 
@@ -9396,7 +9440,7 @@ static void video_value_interpretable_results_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 314 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		video_interpretable_results_unref (value->data[0].v_pointer);
-#line 9396 "VideoSupport.c"
+#line 9440 "VideoSupport.c"
 	}
 }
 
@@ -9406,11 +9450,11 @@ static void video_value_interpretable_results_copy_value (const GValue* src_valu
 	if (src_value->data[0].v_pointer) {
 #line 314 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		dest_value->data[0].v_pointer = video_interpretable_results_ref (src_value->data[0].v_pointer);
-#line 9406 "VideoSupport.c"
+#line 9450 "VideoSupport.c"
 	} else {
 #line 314 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 9410 "VideoSupport.c"
+#line 9454 "VideoSupport.c"
 	}
 }
 
@@ -9418,37 +9462,37 @@ static void video_value_interpretable_results_copy_value (const GValue* src_valu
 static gpointer video_value_interpretable_results_peek_pointer (const GValue* value) {
 #line 314 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return value->data[0].v_pointer;
-#line 9418 "VideoSupport.c"
+#line 9462 "VideoSupport.c"
 }
 
 
 static gchar* video_value_interpretable_results_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 314 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (collect_values[0].v_pointer) {
-#line 9425 "VideoSupport.c"
+#line 9469 "VideoSupport.c"
 		VideoInterpretableResults* object;
 		object = collect_values[0].v_pointer;
 #line 314 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 314 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 9432 "VideoSupport.c"
+#line 9476 "VideoSupport.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 314 "/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 9436 "VideoSupport.c"
+#line 9480 "VideoSupport.c"
 		}
 #line 314 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		value->data[0].v_pointer = video_interpretable_results_ref (object);
-#line 9440 "VideoSupport.c"
+#line 9484 "VideoSupport.c"
 	} else {
 #line 314 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		value->data[0].v_pointer = NULL;
-#line 9444 "VideoSupport.c"
+#line 9488 "VideoSupport.c"
 	}
 #line 314 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return NULL;
-#line 9448 "VideoSupport.c"
+#line 9492 "VideoSupport.c"
 }
 
 
@@ -9459,25 +9503,25 @@ static gchar* video_value_interpretable_results_lcopy_value (const GValue* value
 	if (!object_p) {
 #line 314 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 9459 "VideoSupport.c"
+#line 9503 "VideoSupport.c"
 	}
 #line 314 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (!value->data[0].v_pointer) {
 #line 314 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		*object_p = NULL;
-#line 9465 "VideoSupport.c"
+#line 9509 "VideoSupport.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 314 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		*object_p = value->data[0].v_pointer;
-#line 9469 "VideoSupport.c"
+#line 9513 "VideoSupport.c"
 	} else {
 #line 314 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		*object_p = video_interpretable_results_ref (value->data[0].v_pointer);
-#line 9473 "VideoSupport.c"
+#line 9517 "VideoSupport.c"
 	}
 #line 314 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return NULL;
-#line 9477 "VideoSupport.c"
+#line 9521 "VideoSupport.c"
 }
 
 
@@ -9491,7 +9535,7 @@ GParamSpec* video_param_spec_interpretable_results (const gchar* name, const gch
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 314 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return G_PARAM_SPEC (spec);
-#line 9491 "VideoSupport.c"
+#line 9535 "VideoSupport.c"
 }
 
 
@@ -9500,7 +9544,7 @@ gpointer video_value_get_interpretable_results (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, VIDEO_TYPE_INTERPRETABLE_RESULTS), NULL);
 #line 314 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return value->data[0].v_pointer;
-#line 9500 "VideoSupport.c"
+#line 9544 "VideoSupport.c"
 }
 
 
@@ -9520,17 +9564,17 @@ void video_value_set_interpretable_results (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 314 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		video_interpretable_results_ref (value->data[0].v_pointer);
-#line 9520 "VideoSupport.c"
+#line 9564 "VideoSupport.c"
 	} else {
 #line 314 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		value->data[0].v_pointer = NULL;
-#line 9524 "VideoSupport.c"
+#line 9568 "VideoSupport.c"
 	}
 #line 314 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (old) {
 #line 314 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		video_interpretable_results_unref (old);
-#line 9530 "VideoSupport.c"
+#line 9574 "VideoSupport.c"
 	}
 }
 
@@ -9549,17 +9593,17 @@ void video_value_take_interpretable_results (GValue* value, gpointer v_object) {
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 314 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		value->data[0].v_pointer = v_object;
-#line 9549 "VideoSupport.c"
+#line 9593 "VideoSupport.c"
 	} else {
 #line 314 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		value->data[0].v_pointer = NULL;
-#line 9553 "VideoSupport.c"
+#line 9597 "VideoSupport.c"
 	}
 #line 314 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (old) {
 #line 314 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		video_interpretable_results_unref (old);
-#line 9559 "VideoSupport.c"
+#line 9603 "VideoSupport.c"
 	}
 }
 
@@ -9569,7 +9613,7 @@ static void video_interpretable_results_class_init (VideoInterpretableResultsCla
 	video_interpretable_results_parent_class = g_type_class_peek_parent (klass);
 #line 314 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	((VideoInterpretableResultsClass *) klass)->finalize = video_interpretable_results_finalize;
-#line 9569 "VideoSupport.c"
+#line 9613 "VideoSupport.c"
 }
 
 
@@ -9582,7 +9626,7 @@ static void video_interpretable_results_instance_init (VideoInterpretableResults
 	self->new_thumbnail = NULL;
 #line 314 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self->ref_count = 1;
-#line 9582 "VideoSupport.c"
+#line 9626 "VideoSupport.c"
 }
 
 
@@ -9596,7 +9640,7 @@ static void video_interpretable_results_finalize (VideoInterpretableResults* obj
 	_g_object_unref0 (self->video);
 #line 318 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (self->new_thumbnail);
-#line 9596 "VideoSupport.c"
+#line 9640 "VideoSupport.c"
 }
 
 
@@ -9621,7 +9665,7 @@ gpointer video_interpretable_results_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 314 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return instance;
-#line 9621 "VideoSupport.c"
+#line 9665 "VideoSupport.c"
 }
 
 
@@ -9634,7 +9678,7 @@ void video_interpretable_results_unref (gpointer instance) {
 		VIDEO_INTERPRETABLE_RESULTS_GET_CLASS (self)->finalize (self);
 #line 314 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 9634 "VideoSupport.c"
+#line 9678 "VideoSupport.c"
 	}
 }
 
@@ -9718,7 +9762,7 @@ static void video_class_init (VideoClass * klass) {
 	((DataSourceClass *) klass)->internal_delete_backing = video_real_internal_delete_backing;
 #line 307 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	G_OBJECT_CLASS (klass)->finalize = video_finalize;
-#line 9718 "VideoSupport.c"
+#line 9762 "VideoSupport.c"
 }
 
 
@@ -9731,7 +9775,7 @@ static void video_flaggable_interface_init (FlaggableIface * iface) {
 	iface->mark_flagged = (void (*)(Flaggable*)) video_real_mark_flagged;
 #line 307 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	iface->mark_unflagged = (void (*)(Flaggable*)) video_real_mark_unflagged;
-#line 9731 "VideoSupport.c"
+#line 9775 "VideoSupport.c"
 }
 
 
@@ -9748,7 +9792,7 @@ static void video_monitorable_interface_init (MonitorableIface * iface) {
 	iface->set_master_timestamp = (void (*)(Monitorable*, GFileInfo*)) video_real_set_master_timestamp;
 #line 307 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	iface->set_master_file = (void (*)(Monitorable*, GFile*)) video_real_set_master_file;
-#line 9748 "VideoSupport.c"
+#line 9792 "VideoSupport.c"
 }
 
 
@@ -9759,7 +9803,7 @@ static void video_dateable_interface_init (DateableIface * iface) {
 	iface->get_exposure_time = (time_t (*)(Dateable*)) video_real_get_exposure_time;
 #line 307 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	iface->set_exposure_time = (void (*)(Dateable*, time_t)) video_real_set_exposure_time;
-#line 9759 "VideoSupport.c"
+#line 9803 "VideoSupport.c"
 }
 
 
@@ -9768,7 +9812,7 @@ static void video_instance_init (Video * self) {
 	self->priv = VIDEO_GET_PRIVATE (self);
 #line 348 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_rec_mutex_init (&self->priv->__lock_backing_row);
-#line 9768 "VideoSupport.c"
+#line 9812 "VideoSupport.c"
 }
 
 
@@ -9782,7 +9826,7 @@ static void video_finalize (GObject* obj) {
 	_video_row_unref0 (self->priv->backing_row);
 #line 307 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	G_OBJECT_CLASS (video_parent_class)->finalize (obj);
-#line 9782 "VideoSupport.c"
+#line 9826 "VideoSupport.c"
 }
 
 
@@ -9819,44 +9863,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 1042 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1060 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 9821 "VideoSupport.c"
+#line 9865 "VideoSupport.c"
 }
 
 
 static guint64* _uint64_dup (guint64* self) {
 	guint64* dup;
-#line 1042 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1060 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	dup = g_new0 (guint64, 1);
-#line 1042 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1060 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	memcpy (dup, self, sizeof (guint64));
-#line 1042 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1060 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return dup;
-#line 9833 "VideoSupport.c"
+#line 9877 "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 1046 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1064 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 9842 "VideoSupport.c"
+#line 9886 "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 1048 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1066 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video_source_collection_on_trashcan_contents_altered ((VideoSourceCollection*) self, added, removed);
-#line 9849 "VideoSupport.c"
+#line 9893 "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 1049 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1067 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video_source_collection_on_offline_contents_altered ((VideoSourceCollection*) self, added, removed);
-#line 9856 "VideoSupport.c"
+#line 9900 "VideoSupport.c"
 }
 
 
@@ -9866,43 +9910,43 @@ VideoSourceCollection* video_source_collection_construct (GType object_type) {
 	MediaSourceHoldingTank* _tmp1_ = NULL;
 	MediaSourceHoldingTank* _tmp2_ = NULL;
 	MediaSourceHoldingTank* _tmp3_ = NULL;
-#line 1046 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1064 "/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 1048 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1066 "/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 1048 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1066 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp1_ = _tmp0_;
-#line 1048 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1066 "/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 1048 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1066 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_source_holding_tank_unref0 (_tmp1_);
-#line 1049 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1067 "/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 1049 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1067 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp3_ = _tmp2_;
-#line 1049 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1067 "/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 1049 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1067 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_source_holding_tank_unref0 (_tmp3_);
-#line 1045 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1063 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return self;
-#line 9886 "VideoSupport.c"
+#line 9930 "VideoSupport.c"
 }
 
 
 VideoSourceCollection* video_source_collection_new (void) {
-#line 1045 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1063 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return video_source_collection_construct (TYPE_VIDEO_SOURCE_COLLECTION);
-#line 9893 "VideoSupport.c"
+#line 9937 "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 1053 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1071 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 9902 "VideoSupport.c"
+#line 9946 "VideoSupport.c"
 }
 
 
@@ -9910,24 +9954,24 @@ static MediaSourceHoldingTank* video_source_collection_real_create_trashcan (Med
 	VideoSourceCollection * self;
 	MediaSourceHoldingTank* result = NULL;
 	MediaSourceHoldingTank* _tmp0_ = NULL;
-#line 1052 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1070 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO_SOURCE_COLLECTION, VideoSourceCollection);
-#line 1053 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1071 "/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 1053 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1071 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = _tmp0_;
-#line 1053 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1071 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 9918 "VideoSupport.c"
+#line 9962 "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 1057 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1075 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 9927 "VideoSupport.c"
+#line 9971 "VideoSupport.c"
 }
 
 
@@ -9935,15 +9979,15 @@ static MediaSourceHoldingTank* video_source_collection_real_create_offline_bin (
 	VideoSourceCollection * self;
 	MediaSourceHoldingTank* result = NULL;
 	MediaSourceHoldingTank* _tmp0_ = NULL;
-#line 1056 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1074 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO_SOURCE_COLLECTION, VideoSourceCollection);
-#line 1057 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1075 "/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 1057 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1075 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = _tmp0_;
-#line 1057 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1075 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 9943 "VideoSupport.c"
+#line 9987 "VideoSupport.c"
 }
 
 
@@ -9952,21 +9996,21 @@ static MediaMonitor* video_source_collection_real_create_media_monitor (MediaSou
 	MediaMonitor* result = NULL;
 	GCancellable* _tmp0_ = NULL;
 	VideoMonitor* _tmp1_ = NULL;
-#line 1060 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1078 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO_SOURCE_COLLECTION, VideoSourceCollection);
-#line 1060 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1078 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (IS_WORKERS (workers), NULL);
-#line 1060 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1078 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (G_IS_CANCELLABLE (cancellable), NULL);
-#line 1061 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1079 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = cancellable;
-#line 1061 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1079 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp1_ = video_monitor_new (_tmp0_);
-#line 1061 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1079 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_MEDIA_MONITOR, MediaMonitor);
-#line 1061 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1079 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 9966 "VideoSupport.c"
+#line 10010 "VideoSupport.c"
 }
 
 
@@ -9974,17 +10018,17 @@ static gboolean video_source_collection_real_holds_type_of_source (SourceCollect
 	VideoSourceCollection * self;
 	gboolean result = FALSE;
 	DataSource* _tmp0_ = NULL;
-#line 1064 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1082 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO_SOURCE_COLLECTION, VideoSourceCollection);
-#line 1064 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1082 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (IS_DATA_SOURCE (source), FALSE);
-#line 1065 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1083 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = source;
-#line 1065 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1083 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_VIDEO);
-#line 1065 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1083 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 9984 "VideoSupport.c"
+#line 10028 "VideoSupport.c"
 }
 
 
@@ -9992,15 +10036,15 @@ static gchar* video_source_collection_real_get_typename (MediaSourceCollection*
 	VideoSourceCollection * self;
 	gchar* result = NULL;
 	gchar* _tmp0_ = NULL;
-#line 1068 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1086 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO_SOURCE_COLLECTION, VideoSourceCollection);
-#line 1069 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1087 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = g_strdup (VIDEO_TYPENAME);
-#line 1069 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1087 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = _tmp0_;
-#line 1069 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1087 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 10000 "VideoSupport.c"
+#line 10044 "VideoSupport.c"
 }
 
 
@@ -10009,57 +10053,57 @@ static gboolean video_source_collection_real_is_file_recognized (MediaSourceColl
 	gboolean result = FALSE;
 	GFile* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
-#line 1072 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1090 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO_SOURCE_COLLECTION, VideoSourceCollection);
-#line 1072 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1090 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (G_IS_FILE (file), FALSE);
-#line 1073 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1091 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = file;
-#line 1073 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1091 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp1_ = video_reader_is_supported_video_file (_tmp0_);
-#line 1073 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1091 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = _tmp1_;
-#line 1073 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1091 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 10021 "VideoSupport.c"
+#line 10065 "VideoSupport.c"
 }
 
 
 static void video_source_collection_on_trashcan_contents_altered (VideoSourceCollection* self, GeeCollection* added, GeeCollection* removed) {
 	GeeCollection* _tmp0_ = NULL;
 	GeeCollection* _tmp1_ = NULL;
-#line 1076 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1094 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail (IS_VIDEO_SOURCE_COLLECTION (self));
-#line 1076 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1094 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail ((added == NULL) || GEE_IS_COLLECTION (added));
-#line 1076 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1094 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail ((removed == NULL) || GEE_IS_COLLECTION (removed));
-#line 1078 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1096 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = added;
-#line 1078 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1096 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp1_ = removed;
-#line 1078 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1096 "/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 10040 "VideoSupport.c"
+#line 10084 "VideoSupport.c"
 }
 
 
 static void video_source_collection_on_offline_contents_altered (VideoSourceCollection* self, GeeCollection* added, GeeCollection* removed) {
 	GeeCollection* _tmp0_ = NULL;
 	GeeCollection* _tmp1_ = NULL;
-#line 1082 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1100 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail (IS_VIDEO_SOURCE_COLLECTION (self));
-#line 1082 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1100 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail ((added == NULL) || GEE_IS_COLLECTION (added));
-#line 1082 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1100 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail ((removed == NULL) || GEE_IS_COLLECTION (removed));
-#line 1084 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1102 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = added;
-#line 1084 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1102 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp1_ = removed;
-#line 1084 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1102 "/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 10059 "VideoSupport.c"
+#line 10103 "VideoSupport.c"
 }
 
 
@@ -10069,19 +10113,19 @@ static MediaSource* video_source_collection_real_fetch_by_numeric_id (MediaSourc
 	gint64 _tmp0_ = 0LL;
 	VideoID _tmp1_ = {0};
 	Video* _tmp2_ = NULL;
-#line 1088 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1106 "/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 1107 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = numeric_id;
-#line 1089 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1107 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video_id_init (&_tmp1_, _tmp0_);
-#line 1089 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1107 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp2_ = video_source_collection_fetch (self, &_tmp1_);
-#line 1089 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1107 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_MEDIA_SOURCE, MediaSource);
-#line 1089 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1107 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 10081 "VideoSupport.c"
+#line 10125 "VideoSupport.c"
 }
 
 
@@ -10094,29 +10138,29 @@ gint64 video_source_collection_get_video_key (DataSource* source) {
 	VideoID _tmp2_ = {0};
 	VideoID _tmp3_ = {0};
 	gint64 _tmp4_ = 0LL;
-#line 1092 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1110 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (IS_DATA_SOURCE (source), 0LL);
-#line 1093 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1111 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = source;
-#line 1093 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1111 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_VIDEO, Video));
-#line 1093 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1111 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video = _tmp1_;
-#line 1094 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1112 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video_get_video_id (video, &_tmp2_);
-#line 1094 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1112 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video_id = _tmp2_;
-#line 1096 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1114 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp3_ = video_id;
-#line 1096 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1114 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp4_ = _tmp3_.id;
-#line 1096 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1114 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = _tmp4_;
-#line 1096 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1114 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (video);
-#line 1096 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1114 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 10116 "VideoSupport.c"
+#line 10160 "VideoSupport.c"
 }
 
 
@@ -10124,17 +10168,17 @@ gboolean video_source_collection_is_video_trashed (DataSource* source) {
 	gboolean result = FALSE;
 	DataSource* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
-#line 1099 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1117 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (IS_DATA_SOURCE (source), FALSE);
-#line 1100 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1118 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = source;
-#line 1100 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1118 "/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 1100 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1118 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = _tmp1_;
-#line 1100 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1118 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 10134 "VideoSupport.c"
+#line 10178 "VideoSupport.c"
 }
 
 
@@ -10142,17 +10186,17 @@ gboolean video_source_collection_is_video_offline (DataSource* source) {
 	gboolean result = FALSE;
 	DataSource* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
-#line 1103 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1121 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (IS_DATA_SOURCE (source), FALSE);
-#line 1104 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1122 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = source;
-#line 1104 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1122 "/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 1104 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1122 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = _tmp1_;
-#line 1104 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1122 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 10152 "VideoSupport.c"
+#line 10196 "VideoSupport.c"
 }
 
 
@@ -10161,21 +10205,21 @@ Video* video_source_collection_fetch (VideoSourceCollection* self, VideoID* vide
 	VideoID _tmp0_ = {0};
 	gint64 _tmp1_ = 0LL;
 	DataSource* _tmp2_ = NULL;
-#line 1107 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1125 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (IS_VIDEO_SOURCE_COLLECTION (self), NULL);
-#line 1107 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1125 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (video_id != NULL, NULL);
-#line 1108 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1126 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = *video_id;
-#line 1108 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1126 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp1_ = _tmp0_.id;
-#line 1108 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1126 "/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 1108 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1126 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_VIDEO, Video);
-#line 1108 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1126 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 10175 "VideoSupport.c"
+#line 10219 "VideoSupport.c"
 }
 
 
@@ -10187,27 +10231,27 @@ static GeeCollection* video_source_collection_real_get_event_source_ids (MediaSo
 	EventID _tmp2_ = {0};
 	GeeArrayList* _tmp3_ = NULL;
 	GeeCollection* _tmp4_ = NULL;
-#line 1111 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1129 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO_SOURCE_COLLECTION, VideoSourceCollection);
-#line 1111 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1129 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (event_id != NULL, NULL);
-#line 1112 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1130 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = video_table_get_instance ();
-#line 1112 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1130 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp1_ = _tmp0_;
-#line 1112 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1130 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp2_ = *event_id;
-#line 1112 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1130 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp3_ = video_table_get_event_source_ids (_tmp1_, &_tmp2_);
-#line 1112 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1130 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 1112 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1130 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_database_table_unref0 (_tmp1_);
-#line 1112 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1130 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = _tmp4_;
-#line 1112 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1130 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 10207 "VideoSupport.c"
+#line 10251 "VideoSupport.c"
 }
 
 
@@ -10228,113 +10272,113 @@ Video* video_source_collection_get_state_by_file (VideoSourceCollection* self, G
 	GFile* _tmp10_ = NULL;
 	MediaSource* _tmp11_ = NULL;
 	Video* _tmp12_ = NULL;
-#line 1115 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1133 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (IS_VIDEO_SOURCE_COLLECTION (self), NULL);
-#line 1115 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1133 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (G_IS_FILE (file), NULL);
-#line 1116 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1134 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = file;
-#line 1116 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1134 "/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 1116 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1134 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_VIDEO, Video);
-#line 1117 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1135 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp2_ = video;
-#line 1117 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1135 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp2_ != NULL) {
-#line 1118 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1136 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_vala_state = VIDEO_SOURCE_COLLECTION_STATE_ONLINE;
-#line 1120 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1138 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		result = video;
-#line 1120 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1138 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (state) {
-#line 1120 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1138 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			*state = _vala_state;
-#line 10250 "VideoSupport.c"
+#line 10294 "VideoSupport.c"
 		}
-#line 1120 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1138 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return result;
-#line 10254 "VideoSupport.c"
+#line 10298 "VideoSupport.c"
 	}
-#line 1123 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1141 "/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 1123 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1141 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp4_ = _tmp3_;
-#line 1123 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1141 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp5_ = file;
-#line 1123 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1141 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp6_ = media_source_holding_tank_fetch_by_master_file (_tmp4_, _tmp5_);
-#line 1123 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1141 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (video);
-#line 1123 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1141 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video = G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_VIDEO, Video);
-#line 1123 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1141 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_source_holding_tank_unref0 (_tmp4_);
-#line 1124 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1142 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp7_ = video;
-#line 1124 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1142 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp7_ != NULL) {
-#line 1125 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1143 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_vala_state = VIDEO_SOURCE_COLLECTION_STATE_TRASH;
-#line 1127 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1145 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		result = video;
-#line 1127 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1145 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (state) {
-#line 1127 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1145 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			*state = _vala_state;
-#line 10282 "VideoSupport.c"
+#line 10326 "VideoSupport.c"
 		}
-#line 1127 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1145 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return result;
-#line 10286 "VideoSupport.c"
+#line 10330 "VideoSupport.c"
 	}
-#line 1130 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1148 "/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 1130 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1148 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp9_ = _tmp8_;
-#line 1130 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1148 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp10_ = file;
-#line 1130 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1148 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp11_ = media_source_holding_tank_fetch_by_master_file (_tmp9_, _tmp10_);
-#line 1130 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1148 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (video);
-#line 1130 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1148 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video = G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_VIDEO, Video);
-#line 1130 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1148 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_source_holding_tank_unref0 (_tmp9_);
-#line 1131 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1149 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp12_ = video;
-#line 1131 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1149 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp12_ != NULL) {
-#line 1132 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1150 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_vala_state = VIDEO_SOURCE_COLLECTION_STATE_OFFLINE;
-#line 1134 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1152 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		result = video;
-#line 1134 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1152 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (state) {
-#line 1134 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1152 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			*state = _vala_state;
-#line 10314 "VideoSupport.c"
+#line 10358 "VideoSupport.c"
 		}
-#line 1134 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1152 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return result;
-#line 10318 "VideoSupport.c"
+#line 10362 "VideoSupport.c"
 	}
-#line 1137 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1155 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_vala_state = VIDEO_SOURCE_COLLECTION_STATE_UNKNOWN;
-#line 1139 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1157 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = NULL;
-#line 1139 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1157 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (video);
-#line 1139 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1157 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (state) {
-#line 1139 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1157 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		*state = _vala_state;
-#line 10330 "VideoSupport.c"
+#line 10374 "VideoSupport.c"
 	}
-#line 1139 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1157 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 10334 "VideoSupport.c"
+#line 10378 "VideoSupport.c"
 }
 
 
@@ -10348,83 +10392,83 @@ static void video_source_collection_compare_backing (VideoSourceCollection* self
 	GFileInfo* _tmp6_ = NULL;
 	GTimeVal _tmp7_ = {0};
 	glong _tmp8_ = 0L;
-#line 1142 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1160 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail (IS_VIDEO_SOURCE_COLLECTION (self));
-#line 1142 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1160 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail (IS_VIDEO (video));
-#line 1142 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1160 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail (G_IS_FILE_INFO (info));
-#line 1142 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1160 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail (GEE_IS_COLLECTION (matching_master));
-#line 1143 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1161 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = video;
-#line 1143 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1161 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp1_ = media_source_get_filesize (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 1143 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1161 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp2_ = info;
-#line 1143 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1161 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp3_ = g_file_info_get_size (_tmp2_);
-#line 1143 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1161 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp1_ != ((guint64) _tmp3_)) {
-#line 1144 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1162 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return;
-#line 10368 "VideoSupport.c"
+#line 10412 "VideoSupport.c"
 	}
-#line 1146 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1164 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp4_ = video;
-#line 1146 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1164 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp5_ = media_source_get_timestamp (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 1146 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1164 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp6_ = info;
-#line 1146 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1164 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_file_info_get_modification_time (_tmp6_, &_tmp7_);
-#line 1146 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1164 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp8_ = _tmp7_.tv_sec;
-#line 1146 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1164 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp5_ == ((time_t) _tmp8_)) {
-#line 10382 "VideoSupport.c"
+#line 10426 "VideoSupport.c"
 		GeeCollection* _tmp9_ = NULL;
 		Video* _tmp10_ = NULL;
-#line 1147 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1165 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp9_ = matching_master;
-#line 1147 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1165 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp10_ = video;
-#line 1147 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1165 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		gee_collection_add (_tmp9_, _tmp10_);
-#line 10391 "VideoSupport.c"
+#line 10435 "VideoSupport.c"
 	}
 }
 
 
 void video_source_collection_fetch_by_matching_backing (VideoSourceCollection* self, GFileInfo* info, GeeCollection* matching_master) {
-#line 1150 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1168 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail (IS_VIDEO_SOURCE_COLLECTION (self));
-#line 1150 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1168 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail (G_IS_FILE_INFO (info));
-#line 1150 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1168 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail (GEE_IS_COLLECTION (matching_master));
-#line 10403 "VideoSupport.c"
+#line 10447 "VideoSupport.c"
 	{
 		GeeIterator* _object_it = NULL;
 		GeeCollection* _tmp0_ = NULL;
 		GeeCollection* _tmp1_ = NULL;
 		GeeIterator* _tmp2_ = NULL;
 		GeeIterator* _tmp3_ = NULL;
-#line 1151 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1169 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = data_collection_get_all (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection));
-#line 1151 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1169 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp1_ = _tmp0_;
-#line 1151 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1169 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp2_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 1151 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1169 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp3_ = _tmp2_;
-#line 1151 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1169 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (_tmp1_);
-#line 1151 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1169 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_object_it = _tmp3_;
-#line 1151 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1169 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		while (TRUE) {
-#line 10424 "VideoSupport.c"
+#line 10468 "VideoSupport.c"
 			GeeIterator* _tmp4_ = NULL;
 			gboolean _tmp5_ = FALSE;
 			DataObject* object = NULL;
@@ -10433,37 +10477,37 @@ void video_source_collection_fetch_by_matching_backing (VideoSourceCollection* s
 			DataObject* _tmp8_ = NULL;
 			GFileInfo* _tmp9_ = NULL;
 			GeeCollection* _tmp10_ = NULL;
-#line 1151 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1169 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp4_ = _object_it;
-#line 1151 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1169 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp5_ = gee_iterator_next (_tmp4_);
-#line 1151 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1169 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (!_tmp5_) {
-#line 1151 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1169 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				break;
-#line 10441 "VideoSupport.c"
+#line 10485 "VideoSupport.c"
 			}
-#line 1151 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1169 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp6_ = _object_it;
-#line 1151 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1169 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp7_ = gee_iterator_get (_tmp6_);
-#line 1151 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1169 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			object = (DataObject*) _tmp7_;
-#line 1152 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1170 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp8_ = object;
-#line 1152 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1170 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp9_ = info;
-#line 1152 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1170 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp10_ = matching_master;
-#line 1152 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1170 "/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 1151 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1169 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_object_unref0 (object);
-#line 10459 "VideoSupport.c"
+#line 10503 "VideoSupport.c"
 		}
-#line 1151 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1169 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (_object_it);
-#line 10463 "VideoSupport.c"
+#line 10507 "VideoSupport.c"
 	}
 	{
 		GeeIterator* _media_it = NULL;
@@ -10471,21 +10515,21 @@ void video_source_collection_fetch_by_matching_backing (VideoSourceCollection* s
 		GeeCollection* _tmp12_ = NULL;
 		GeeIterator* _tmp13_ = NULL;
 		GeeIterator* _tmp14_ = NULL;
-#line 1154 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1172 "/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 1154 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1172 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp12_ = _tmp11_;
-#line 1154 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1172 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp13_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 1154 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1172 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp14_ = _tmp13_;
-#line 1154 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1172 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (_tmp12_);
-#line 1154 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1172 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_media_it = _tmp14_;
-#line 1154 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1172 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		while (TRUE) {
-#line 10485 "VideoSupport.c"
+#line 10529 "VideoSupport.c"
 			GeeIterator* _tmp15_ = NULL;
 			gboolean _tmp16_ = FALSE;
 			MediaSource* media = NULL;
@@ -10494,37 +10538,37 @@ void video_source_collection_fetch_by_matching_backing (VideoSourceCollection* s
 			MediaSource* _tmp19_ = NULL;
 			GFileInfo* _tmp20_ = NULL;
 			GeeCollection* _tmp21_ = NULL;
-#line 1154 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1172 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp15_ = _media_it;
-#line 1154 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1172 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp16_ = gee_iterator_next (_tmp15_);
-#line 1154 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1172 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (!_tmp16_) {
-#line 1154 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1172 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				break;
-#line 10502 "VideoSupport.c"
+#line 10546 "VideoSupport.c"
 			}
-#line 1154 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1172 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp17_ = _media_it;
-#line 1154 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1172 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp18_ = gee_iterator_get (_tmp17_);
-#line 1154 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1172 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			media = (MediaSource*) _tmp18_;
-#line 1155 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1173 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp19_ = media;
-#line 1155 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1173 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp20_ = info;
-#line 1155 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1173 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp21_ = matching_master;
-#line 1155 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1173 "/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 1154 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1172 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_object_unref0 (media);
-#line 10520 "VideoSupport.c"
+#line 10564 "VideoSupport.c"
 		}
-#line 1154 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1172 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (_media_it);
-#line 10524 "VideoSupport.c"
+#line 10568 "VideoSupport.c"
 	}
 }
 
@@ -10535,30 +10579,30 @@ static void video_source_collection_real_notify_contents_altered (DataCollection
 	GeeIterable* _tmp13_ = NULL;
 	GeeIterable* _tmp26_ = NULL;
 	GeeIterable* _tmp27_ = NULL;
-#line 1158 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1176 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO_SOURCE_COLLECTION, VideoSourceCollection);
-#line 1158 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1176 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail ((added == NULL) || GEE_IS_ITERABLE (added));
-#line 1158 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1176 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail ((removed == NULL) || GEE_IS_ITERABLE (removed));
-#line 1160 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1178 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = added;
-#line 1160 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1178 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp0_ != NULL) {
-#line 10545 "VideoSupport.c"
+#line 10589 "VideoSupport.c"
 		{
 			GeeIterator* _object_it = NULL;
 			GeeIterable* _tmp1_ = NULL;
 			GeeIterator* _tmp2_ = NULL;
-#line 1161 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1179 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp1_ = added;
-#line 1161 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1179 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp2_ = gee_iterable_iterator (_tmp1_);
-#line 1161 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1179 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_object_it = _tmp2_;
-#line 1161 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1179 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			while (TRUE) {
-#line 10558 "VideoSupport.c"
+#line 10602 "VideoSupport.c"
 				GeeIterator* _tmp3_ = NULL;
 				gboolean _tmp4_ = FALSE;
 				DataObject* object = NULL;
@@ -10571,67 +10615,67 @@ static void video_source_collection_real_notify_contents_altered (DataCollection
 				Video* _tmp10_ = NULL;
 				guint64 _tmp11_ = 0ULL;
 				Video* _tmp12_ = NULL;
-#line 1161 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1179 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp3_ = _object_it;
-#line 1161 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1179 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp4_ = gee_iterator_next (_tmp3_);
-#line 1161 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1179 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				if (!_tmp4_) {
-#line 1161 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1179 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					break;
-#line 10579 "VideoSupport.c"
+#line 10623 "VideoSupport.c"
 				}
-#line 1161 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1179 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp5_ = _object_it;
-#line 1161 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1179 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp6_ = gee_iterator_get (_tmp5_);
-#line 1161 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1179 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				object = (DataObject*) _tmp6_;
-#line 1162 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1180 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp7_ = object;
-#line 1162 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1180 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp8_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_VIDEO, Video));
-#line 1162 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1180 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				video = _tmp8_;
-#line 1164 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1182 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp9_ = self->priv->filesize_to_video;
-#line 1164 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1182 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp10_ = video;
-#line 1164 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1182 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp11_ = media_source_get_master_filesize (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 1164 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1182 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp12_ = video;
-#line 1164 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1182 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				gee_multi_map_set (_tmp9_, &_tmp11_, _tmp12_);
-#line 1161 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1179 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_object_unref0 (video);
-#line 1161 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1179 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_object_unref0 (object);
-#line 10607 "VideoSupport.c"
+#line 10651 "VideoSupport.c"
 			}
-#line 1161 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1179 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_object_unref0 (_object_it);
-#line 10611 "VideoSupport.c"
+#line 10655 "VideoSupport.c"
 		}
 	}
-#line 1168 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1186 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp13_ = removed;
-#line 1168 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1186 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp13_ != NULL) {
-#line 10618 "VideoSupport.c"
+#line 10662 "VideoSupport.c"
 		{
 			GeeIterator* _object_it = NULL;
 			GeeIterable* _tmp14_ = NULL;
 			GeeIterator* _tmp15_ = NULL;
-#line 1169 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1187 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp14_ = removed;
-#line 1169 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1187 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp15_ = gee_iterable_iterator (_tmp14_);
-#line 1169 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1187 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_object_it = _tmp15_;
-#line 1169 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1187 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			while (TRUE) {
-#line 10631 "VideoSupport.c"
+#line 10675 "VideoSupport.c"
 				GeeIterator* _tmp16_ = NULL;
 				gboolean _tmp17_ = FALSE;
 				DataObject* object = NULL;
@@ -10644,66 +10688,66 @@ static void video_source_collection_real_notify_contents_altered (DataCollection
 				Video* _tmp23_ = NULL;
 				guint64 _tmp24_ = 0ULL;
 				Video* _tmp25_ = NULL;
-#line 1169 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1187 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp16_ = _object_it;
-#line 1169 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1187 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp17_ = gee_iterator_next (_tmp16_);
-#line 1169 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1187 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				if (!_tmp17_) {
-#line 1169 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1187 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					break;
-#line 10652 "VideoSupport.c"
+#line 10696 "VideoSupport.c"
 				}
-#line 1169 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1187 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp18_ = _object_it;
-#line 1169 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1187 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp19_ = gee_iterator_get (_tmp18_);
-#line 1169 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1187 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				object = (DataObject*) _tmp19_;
-#line 1170 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1188 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp20_ = object;
-#line 1170 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1188 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp21_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, TYPE_VIDEO, Video));
-#line 1170 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1188 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				video = _tmp21_;
-#line 1172 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1190 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp22_ = self->priv->filesize_to_video;
-#line 1172 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1190 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp23_ = video;
-#line 1172 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1190 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp24_ = media_source_get_master_filesize (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 1172 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1190 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp25_ = video;
-#line 1172 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1190 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				gee_multi_map_remove (_tmp22_, &_tmp24_, _tmp25_);
-#line 1169 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1187 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_object_unref0 (video);
-#line 1169 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1187 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_object_unref0 (object);
-#line 10680 "VideoSupport.c"
+#line 10724 "VideoSupport.c"
 			}
-#line 1169 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1187 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_object_unref0 (_object_it);
-#line 10684 "VideoSupport.c"
+#line 10728 "VideoSupport.c"
 		}
 	}
-#line 1176 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1194 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp26_ = added;
-#line 1176 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1194 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp27_ = removed;
-#line 1176 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1194 "/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 10693 "VideoSupport.c"
+#line 10737 "VideoSupport.c"
 }
 
 
 void video_source_collection_get_basename_filesize_duplicate (VideoSourceCollection* self, const gchar* basename, guint64 filesize, VideoID* result) {
 	VideoID _tmp19_ = {0};
-#line 1179 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1197 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail (IS_VIDEO_SOURCE_COLLECTION (self));
-#line 1179 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1197 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail (basename != NULL);
-#line 10703 "VideoSupport.c"
+#line 10747 "VideoSupport.c"
 	{
 		GeeIterator* _video_it = NULL;
 		GeeMultiMap* _tmp0_ = NULL;
@@ -10712,25 +10756,25 @@ void video_source_collection_get_basename_filesize_duplicate (VideoSourceCollect
 		GeeCollection* _tmp3_ = NULL;
 		GeeIterator* _tmp4_ = NULL;
 		GeeIterator* _tmp5_ = NULL;
-#line 1180 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1198 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = self->priv->filesize_to_video;
-#line 1180 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1198 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp1_ = filesize;
-#line 1180 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1198 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp2_ = gee_multi_map_get (_tmp0_, &_tmp1_);
-#line 1180 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1198 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp3_ = _tmp2_;
-#line 1180 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1198 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp4_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 1180 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1198 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp5_ = _tmp4_;
-#line 1180 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1198 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (_tmp3_);
-#line 1180 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1198 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_video_it = _tmp5_;
-#line 1180 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1198 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		while (TRUE) {
-#line 10730 "VideoSupport.c"
+#line 10774 "VideoSupport.c"
 			GeeIterator* _tmp6_ = NULL;
 			gboolean _tmp7_ = FALSE;
 			Video* video = NULL;
@@ -10743,72 +10787,72 @@ void video_source_collection_get_basename_filesize_duplicate (VideoSourceCollect
 			const gchar* _tmp14_ = NULL;
 			gint _tmp15_ = 0;
 			gboolean _tmp16_ = FALSE;
-#line 1180 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1198 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp6_ = _video_it;
-#line 1180 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1198 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp7_ = gee_iterator_next (_tmp6_);
-#line 1180 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1198 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (!_tmp7_) {
-#line 1180 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1198 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				break;
-#line 10751 "VideoSupport.c"
+#line 10795 "VideoSupport.c"
 			}
-#line 1180 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1198 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp8_ = _video_it;
-#line 1180 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1198 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp9_ = gee_iterator_get (_tmp8_);
-#line 1180 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1198 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			video = (Video*) _tmp9_;
-#line 1181 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1199 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp10_ = video;
-#line 1181 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1199 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp11_ = media_source_get_master_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 1181 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1199 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp12_ = _tmp11_;
-#line 1181 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1199 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp13_ = g_file_get_basename (_tmp12_);
-#line 1181 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1199 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp14_ = basename;
-#line 1181 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1199 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp15_ = utf8_ci_compare (_tmp13_, _tmp14_);
-#line 1181 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1199 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp16_ = _tmp15_ == 0;
-#line 1181 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1199 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_object_unref0 (_tmp12_);
-#line 1181 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1199 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (_tmp16_) {
-#line 10777 "VideoSupport.c"
+#line 10821 "VideoSupport.c"
 				Video* _tmp17_ = NULL;
 				VideoID _tmp18_ = {0};
-#line 1182 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1200 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp17_ = video;
-#line 1182 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1200 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				video_get_video_id (_tmp17_, &_tmp18_);
-#line 1182 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1200 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				*result = _tmp18_;
-#line 1182 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1200 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_object_unref0 (video);
-#line 1182 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1200 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_object_unref0 (_video_it);
-#line 1182 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1200 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				return;
-#line 10792 "VideoSupport.c"
+#line 10836 "VideoSupport.c"
 			}
-#line 1180 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1198 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_object_unref0 (video);
-#line 10796 "VideoSupport.c"
+#line 10840 "VideoSupport.c"
 		}
-#line 1180 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1198 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (_video_it);
-#line 10800 "VideoSupport.c"
+#line 10844 "VideoSupport.c"
 	}
-#line 1185 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1203 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video_id_init (&_tmp19_, VIDEO_ID_INVALID);
-#line 1185 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1203 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	*result = _tmp19_;
-#line 1185 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1203 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return;
-#line 10808 "VideoSupport.c"
+#line 10852 "VideoSupport.c"
 }
 
 
@@ -10818,23 +10862,23 @@ gboolean video_source_collection_has_basename_filesize_duplicate (VideoSourceCol
 	guint64 _tmp1_ = 0ULL;
 	VideoID _tmp2_ = {0};
 	gboolean _tmp3_ = FALSE;
-#line 1189 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1207 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (IS_VIDEO_SOURCE_COLLECTION (self), FALSE);
-#line 1189 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1207 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (basename != NULL, FALSE);
-#line 1190 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1208 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = basename;
-#line 1190 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1208 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp1_ = filesize;
-#line 1190 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1208 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video_source_collection_get_basename_filesize_duplicate (self, _tmp0_, _tmp1_, &_tmp2_);
-#line 1190 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1208 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp3_ = video_id_is_valid (&_tmp2_);
-#line 1190 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1208 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = _tmp3_;
-#line 1190 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1208 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 10834 "VideoSupport.c"
+#line 10878 "VideoSupport.c"
 }
 
 
@@ -10843,88 +10887,88 @@ static TransactionController* video_source_collection_real_get_transaction_contr
 	VideoSourceCollection* self;
 	TransactionController* _tmp0_ = NULL;
 	TransactionController* _tmp2_ = NULL;
-#line 1033 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1051 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO_SOURCE_COLLECTION, VideoSourceCollection);
-#line 1034 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1052 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = self->priv->_transaction_controller;
-#line 1034 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1052 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp0_ == NULL) {
-#line 10849 "VideoSupport.c"
+#line 10893 "VideoSupport.c"
 		MediaSourceTransactionController* _tmp1_ = NULL;
-#line 1035 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1053 "/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 1035 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1053 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_transaction_controller_unref0 (self->priv->_transaction_controller);
-#line 1035 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1053 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		self->priv->_transaction_controller = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_TRANSACTION_CONTROLLER, TransactionController);
-#line 10857 "VideoSupport.c"
+#line 10901 "VideoSupport.c"
 	}
-#line 1037 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1055 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp2_ = self->priv->_transaction_controller;
-#line 1037 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1055 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = _tmp2_;
-#line 1037 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1055 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 10865 "VideoSupport.c"
+#line 10909 "VideoSupport.c"
 }
 
 
 static void video_source_collection_class_init (VideoSourceCollectionClass * klass) {
-#line 1024 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1042 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video_source_collection_parent_class = g_type_class_peek_parent (klass);
-#line 1024 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1042 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	((DataCollectionClass *) klass)->finalize = video_source_collection_finalize;
-#line 1024 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1042 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_type_class_add_private (klass, sizeof (VideoSourceCollectionPrivate));
-#line 1024 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1042 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	((MediaSourceCollectionClass *) klass)->create_trashcan = video_source_collection_real_create_trashcan;
-#line 1024 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1042 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	((MediaSourceCollectionClass *) klass)->create_offline_bin = video_source_collection_real_create_offline_bin;
-#line 1024 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1042 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	((MediaSourceCollectionClass *) klass)->create_media_monitor = video_source_collection_real_create_media_monitor;
-#line 1024 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1042 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	((SourceCollectionClass *) klass)->holds_type_of_source = video_source_collection_real_holds_type_of_source;
-#line 1024 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1042 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	((MediaSourceCollectionClass *) klass)->get_typename = video_source_collection_real_get_typename;
-#line 1024 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1042 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	((MediaSourceCollectionClass *) klass)->is_file_recognized = video_source_collection_real_is_file_recognized;
-#line 1024 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1042 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	((MediaSourceCollectionClass *) klass)->fetch_by_numeric_id = video_source_collection_real_fetch_by_numeric_id;
-#line 1024 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1042 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	((MediaSourceCollectionClass *) klass)->get_event_source_ids = video_source_collection_real_get_event_source_ids;
-#line 1024 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1042 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	((DataCollectionClass *) klass)->notify_contents_altered = video_source_collection_real_notify_contents_altered;
-#line 1024 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1042 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	MEDIA_SOURCE_COLLECTION_CLASS (klass)->get_transaction_controller = video_source_collection_real_get_transaction_controller;
-#line 10896 "VideoSupport.c"
+#line 10940 "VideoSupport.c"
 }
 
 
 static void video_source_collection_instance_init (VideoSourceCollection * self) {
 	GeeTreeMultiMap* _tmp0_ = NULL;
-#line 1024 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1042 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self->priv = VIDEO_SOURCE_COLLECTION_GET_PRIVATE (self);
-#line 1041 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1059 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self->priv->_transaction_controller = NULL;
-#line 1042 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1060 "/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 1042 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1060 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self->priv->filesize_to_video = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_MULTI_MAP, GeeMultiMap);
-#line 10910 "VideoSupport.c"
+#line 10954 "VideoSupport.c"
 }
 
 
 static void video_source_collection_finalize (DataCollection* obj) {
 	VideoSourceCollection * self;
-#line 1024 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1042 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_VIDEO_SOURCE_COLLECTION, VideoSourceCollection);
-#line 1041 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1059 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_transaction_controller_unref0 (self->priv->_transaction_controller);
-#line 1042 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1060 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (self->priv->filesize_to_video);
-#line 1024 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1042 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	DATA_COLLECTION_CLASS (video_source_collection_parent_class)->finalize (obj);
-#line 10924 "VideoSupport.c"
+#line 10968 "VideoSupport.c"
 }
 
 
diff --git a/src/VideoSupport.vala b/src/VideoSupport.vala
index 6543cf5..791a12a 100644
--- a/src/VideoSupport.vala
+++ b/src/VideoSupport.vala
@@ -368,12 +368,12 @@ public class Video : VideoSource, Flaggable, Monitorable, Dateable {
     
         // initialize GStreamer, but don't pass it our actual command line arguments -- we don't
         // want our end users to be able to parameterize the GStreamer configuration
-        string[] fake_args = new string[0];
-        unowned string[] fake_unowned_args = fake_args;
-        Gst.init(ref fake_unowned_args);
-        
+        unowned string[] args = null;
+        Gst.init(ref args);
+
+        var registry = Gst.Registry.@get ();
         int saved_state = Config.Facade.get_instance().get_video_interpreter_state_cookie();
-        current_state = (int) Gst.Registry.get().get_feature_list_cookie();
+        current_state = (int) registry.get_feature_list_cookie();
         if (saved_state == Config.Facade.NO_VIDEO_INTERPRETER_STATE) {
             message("interpreter state cookie not found; assuming all video thumbnails are out of date");
             interpreter_state_changed = true;
@@ -381,7 +381,25 @@ public class Video : VideoSource, Flaggable, Monitorable, Dateable {
             message("interpreter state has changed; video thumbnails may be out of date");
             interpreter_state_changed = true;
         }
-        
+
+        /* First do the cookie state handling, then update our local registry
+         * to not include vaapi stuff. This is basically to work-around
+         * concurrent access to VAAPI/X11 which it doesn't like, cf
+         * https://bugzilla.gnome.org/show_bug.cgi?id=762416
+         */
+
+        var feature = registry.find_feature ("vaapidecodebin",
+                                             typeof (Gst.ElementFactory));
+        if (feature != null) {
+            registry.remove_feature (feature);
+        }
+
+        feature = registry.find_feature ("vaapidecode",
+                                         typeof (Gst.ElementFactory));
+        if (feature != null) {
+            registry.remove_feature (feature);
+        }
+
         global = new VideoSourceCollection();
         
         Gee.ArrayList<VideoRow?> all = VideoTable.get_instance().get_all();
diff --git a/src/camera/CameraTable.c b/src/camera/CameraTable.c
index 3ed9f58..85f762a 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 __catch54_gphoto_error;
+				goto __catch55_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 __finally54;
-	__catch54_gphoto_error:
+	goto __finally55;
+	__catch55_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"
 	}
-	__finally54:
+	__finally55:
 #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 __catch55_gphoto_error;
+				goto __catch56_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 __finally55;
-	__catch55_gphoto_error:
+	goto __finally56;
+	__catch56_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"
 	}
-	__finally55:
+	__finally56:
 #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 __catch56_g_regex_error;
+				goto __catch57_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 __catch56_g_regex_error;
+				goto __catch57_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 __finally56;
-	__catch56_g_regex_error:
+	goto __finally57;
+	__catch57_g_regex_error:
 	{
 		GError* e = NULL;
 #line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -1812,7 +1812,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		_g_error_free0 (e);
 #line 1812 "CameraTable.c"
 	}
-	__finally56:
+	__finally57:
 #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 __catch57_gphoto_error;
+				goto __catch58_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 __finally57;
-	__catch57_gphoto_error:
+	goto __finally58;
+	__catch58_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"
 	}
-	__finally57:
+	__finally58:
 #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 38c3a97..31f61f4 100644
--- a/src/camera/GPhoto.c
+++ b/src/camera/GPhoto.c
@@ -1295,11 +1295,11 @@ PhotoMetadata* gp_get_fallback_metadata (Camera* camera, GPContext* context, con
 #line 140 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1298 "GPhoto.c"
-			goto __catch58_g_error;
+			goto __catch59_g_error;
 		}
 	}
-	goto __finally58;
-	__catch58_g_error:
+	goto __finally59;
+	__catch59_g_error:
 	{
 #line 139 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		g_clear_error (&_inner_error_);
@@ -1311,7 +1311,7 @@ PhotoMetadata* gp_get_fallback_metadata (Camera* camera, GPContext* context, con
 		metadata = NULL;
 #line 1313 "GPhoto.c"
 	}
-	__finally58:
+	__finally59:
 #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"
@@ -1420,7 +1420,7 @@ GdkPixbuf* gp_load_preview (GPContext* context, Camera* camera, const gchar* fol
 #line 154 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1423 "GPhoto.c"
-			goto __catch59_g_error;
+			goto __catch60_g_error;
 		}
 #line 154 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp7_ = _tmp0_;
@@ -1440,8 +1440,8 @@ GdkPixbuf* gp_load_preview (GPContext* context, Camera* camera, const gchar* fol
 		_tmp0_ = (g_free (_tmp0_), NULL);
 #line 1442 "GPhoto.c"
 	}
-	goto __finally59;
-	__catch59_g_error:
+	goto __finally60;
+	__catch60_g_error:
 	{
 		PhotoMetadata* metadata = NULL;
 		Camera* _tmp8_ = NULL;
@@ -1578,7 +1578,7 @@ GdkPixbuf* gp_load_preview (GPContext* context, Camera* camera, const gchar* fol
 #line 162 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 			_media_metadata_unref0 (metadata);
 #line 1581 "GPhoto.c"
-			goto __finally59;
+			goto __finally60;
 		}
 #line 162 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp24_ = _tmp20_;
@@ -1602,7 +1602,7 @@ GdkPixbuf* gp_load_preview (GPContext* context, Camera* camera, const gchar* fol
 		_media_metadata_unref0 (metadata);
 #line 1604 "GPhoto.c"
 	}
-	__finally59:
+	__finally60:
 #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"
@@ -2145,7 +2145,7 @@ PhotoMetadata* gp_load_metadata (GPContext* context, Camera* camera, const gchar
 #line 221 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 2148 "GPhoto.c"
-			goto __catch60_g_error;
+			goto __catch61_g_error;
 		}
 #line 221 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp7_ = _tmp0_;
@@ -2167,8 +2167,8 @@ PhotoMetadata* gp_load_metadata (GPContext* context, Camera* camera, const gchar
 		_tmp0_ = (g_free (_tmp0_), NULL);
 #line 2169 "GPhoto.c"
 	}
-	goto __finally60;
-	__catch60_g_error:
+	goto __finally61;
+	__catch61_g_error:
 	{
 		Camera* _tmp8_ = NULL;
 		GPContext* _tmp9_ = NULL;
@@ -2197,7 +2197,7 @@ PhotoMetadata* gp_load_metadata (GPContext* context, Camera* camera, const gchar
 		return result;
 #line 2199 "GPhoto.c"
 	}
-	__finally60:
+	__finally61:
 #line 220 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 220 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
diff --git a/src/camera/ImportPage.c b/src/camera/ImportPage.c
index 2967842..ecf784c 100644
--- a/src/camera/ImportPage.c
+++ b/src/camera/ImportPage.c
@@ -1803,8 +1803,8 @@ static ImportPageImportPageSearchViewFilter* import_page_import_page_search_view
 static ImportPageImportPageSearchViewFilter* import_page_import_page_search_view_filter_construct (GType object_type);
 static ImportPageHideImportedViewFilter* import_page_hide_imported_view_filter_new (void);
 static ImportPageHideImportedViewFilter* import_page_hide_imported_view_filter_construct (GType object_type);
-#define IMPORT_PAGE_UNMOUNT_FAILED_MSG _ ("Unable to unmount camera.  Try unmounting the camera from the file man" \
-"ager.")
+#define IMPORT_PAGE_UNMOUNT_FAILED_MSG _ ("Unable to unmount camera. Try unmounting the camera from the file mana" \
+"ger.")
 ImportPage* import_page_new (Camera* camera, const gchar* uri, const gchar* display_name, const gchar* icon);
 ImportPage* import_page_construct (GType object_type, Camera* camera, const gchar* uri, const gchar* display_name, const gchar* icon);
 CheckerboardPage* checkerboard_page_construct (GType object_type, const gchar* page_name);
@@ -3907,7 +3907,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 3909 "ImportPage.c"
-			goto __catch61_g_error;
+			goto __catch62_g_error;
 		}
 #line 283 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp9_ = _tmp6_;
@@ -3921,8 +3921,8 @@ ImportPreview* import_preview_construct (GType object_type, ImportSource* source
 		_g_object_unref0 (_tmp6_);
 #line 3922 "ImportPage.c"
 	}
-	goto __finally61;
-	__catch61_g_error:
+	goto __finally62;
+	__catch62_g_error:
 	{
 		GError* err = NULL;
 		gchar* _tmp10_ = NULL;
@@ -3949,7 +3949,7 @@ ImportPreview* import_preview_construct (GType object_type, ImportSource* source
 		_g_error_free0 (err);
 #line 3950 "ImportPage.c"
 	}
-	__finally61:
+	__finally62:
 #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"
@@ -6885,7 +6885,7 @@ static void import_page_try_refreshing_camera (ImportPage* self, gboolean fail_o
 #line 1000 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp6_ = self->priv->uri;
 #line 1000 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-			g_debug ("ImportPage.vala:1000: Checking if %s is mounted ...", _tmp6_);
+			g_debug ("ImportPage.vala:1000: Checking if %s is mounted…", _tmp6_);
 #line 1002 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp7_ = self->priv->uri;
 #line 1002 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -6909,7 +6909,7 @@ static void import_page_try_refreshing_camera (ImportPage* self, gboolean fail_o
 #line 1006 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 6911 "ImportPage.c"
-					goto __catch62_g_error;
+					goto __catch63_g_error;
 				}
 #line 1006 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp12_ = _tmp9_;
@@ -6923,8 +6923,8 @@ static void import_page_try_refreshing_camera (ImportPage* self, gboolean fail_o
 				_g_object_unref0 (_tmp9_);
 #line 6924 "ImportPage.c"
 			}
-			goto __finally62;
-			__catch62_g_error:
+			goto __finally63;
+			__catch63_g_error:
 			{
 				GError* err = NULL;
 #line 1005 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -6935,7 +6935,7 @@ static void import_page_try_refreshing_camera (ImportPage* self, gboolean fail_o
 				_g_error_free0 (err);
 #line 6936 "ImportPage.c"
 			}
-			__finally62:
+			__finally63:
 #line 1005 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1005 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -6974,7 +6974,7 @@ static void import_page_try_refreshing_camera (ImportPage* self, gboolean fail_o
 				gint _tmp27_ = 0;
 #line 1013 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp14_ = _ ("Shotwell needs to unmount the camera from the filesystem in order to a" \
-"ccess it.  Continue?");
+"ccess it. Continue?");
 #line 1013 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp15_ = g_strdup (_tmp14_);
 #line 1013 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -7054,9 +7054,9 @@ static void import_page_try_refreshing_camera (ImportPage* self, gboolean fail_o
 				GtkMessageDialog* _tmp39_ = NULL;
 				const gchar* _tmp40_ = NULL;
 #line 1029 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-				_tmp30_ = _ ("The camera is locked by another application.  Shotwell can only access" \
-" the camera when it's unlocked.  Please close any other application us" \
-"ing the camera and try again.");
+				_tmp30_ = _ ("The camera is locked by another application. Shotwell can only access " \
+"the camera when it’s unlocked. Please close any other application usin" \
+"g the camera and try again.");
 #line 1029 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp31_ = g_strdup (_tmp30_);
 #line 1029 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -7210,7 +7210,7 @@ gboolean import_page_unmount_camera (ImportPage* self, GMount* mount) {
 #line 1061 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp4_ = self->priv->progress_bar;
 #line 1061 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp5_ = _ ("Unmounting...");
+	_tmp5_ = _ ("Unmounting…");
 #line 1061 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	gtk_progress_bar_set_text (_tmp4_, _tmp5_);
 #line 1066 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -7218,7 +7218,7 @@ gboolean import_page_unmount_camera (ImportPage* self, GMount* mount) {
 #line 1066 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	g_signal_connect_object (_tmp6_, "unmounted", (GCallback) _import_page_on_unmounted_g_mount_unmounted, self, 0);
 #line 1068 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	g_debug ("ImportPage.vala:1068: Unmounting camera ...");
+	g_debug ("ImportPage.vala:1068: Unmounting camera…");
 #line 1069 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	_tmp7_ = mount;
 #line 1069 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -7272,11 +7272,11 @@ static void import_page_on_unmount_finished (ImportPage* self, GObject* source,
 #line 1080 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 7271 "ImportPage.c"
-			goto __catch63_g_error;
+			goto __catch64_g_error;
 		}
 	}
-	goto __finally63;
-	__catch63_g_error:
+	goto __finally64;
+	__catch64_g_error:
 	{
 		GError* err = NULL;
 		guint _tmp3_ = 0U;
@@ -7314,7 +7314,7 @@ static void import_page_on_unmount_finished (ImportPage* self, GObject* source,
 		_g_error_free0 (err);
 #line 7312 "ImportPage.c"
 	}
-	__finally63:
+	__finally64:
 #line 1079 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1079 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -7641,7 +7641,7 @@ static ImportPageRefreshResult import_page_refresh_camera (ImportPage* self) {
 #line 7638 "ImportPage.c"
 	}
 #line 1152 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
-	_tmp1_ = _ ("Starting import, please wait...");
+	_tmp1_ = _ ("Starting import, please wait…");
 #line 1152 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	checkerboard_page_set_page_message (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), _tmp1_);
 #line 1154 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -8977,7 +8977,7 @@ static gboolean import_page_enumerate_files (ImportPage* self, gint fsid, const
 #line 1387 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						 (info);
 #line 8976 "ImportPage.c"
-						goto __catch64_g_error;
+						goto __catch65_g_error;
 					}
 #line 1387 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					if (!_tmp40_) {
@@ -9213,8 +9213,8 @@ static gboolean import_page_enumerate_files (ImportPage* self, gint fsid, const
 					 (info);
 #line 9210 "ImportPage.c"
 				}
-				goto __finally64;
-				__catch64_g_error:
+				goto __finally65;
+				__catch65_g_error:
 				{
 					GError* err = NULL;
 					const gchar* _tmp103_ = NULL;
@@ -9259,7 +9259,7 @@ static gboolean import_page_enumerate_files (ImportPage* self, gint fsid, const
 					return result;
 #line 9256 "ImportPage.c"
 				}
-				__finally64:
+				__finally65:
 #line 1385 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1385 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -10233,7 +10233,7 @@ static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* i
 #line 1537 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 10230 "ImportPage.c"
-						goto __catch65_g_error;
+						goto __catch66_g_error;
 					}
 #line 1537 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp43_ = _tmp36_;
@@ -10247,8 +10247,8 @@ static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* i
 					_media_metadata_unref0 (_tmp36_);
 #line 10243 "ImportPage.c"
 				}
-				goto __finally65;
-				__catch65_g_error:
+				goto __finally66;
+				__catch66_g_error:
 				{
 					GError* err = NULL;
 					const gchar* _tmp44_ = NULL;
@@ -10273,7 +10273,7 @@ static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* i
 					_g_error_free0 (err);
 #line 10269 "ImportPage.c"
 				}
-				__finally65:
+				__finally66:
 #line 1536 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1536 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -10472,7 +10472,7 @@ static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* i
 #line 1569 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_g_free0 (preview_fulldir);
 #line 10469 "ImportPage.c"
-					goto __catch66_g_error;
+					goto __catch67_g_error;
 				}
 #line 1569 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp77_ = _tmp67_;
@@ -10490,8 +10490,8 @@ static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* i
 				_g_free0 (preview_fulldir);
 #line 10486 "ImportPage.c"
 			}
-			goto __finally66;
-			__catch66_g_error:
+			goto __finally67;
+			__catch67_g_error:
 			{
 				GError* err = NULL;
 				const gchar* _tmp78_ = NULL;
@@ -10527,7 +10527,7 @@ static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* i
 				_g_error_free0 (err);
 #line 10523 "ImportPage.c"
 			}
-			__finally66:
+			__finally67:
 #line 1562 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1562 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -10704,7 +10704,7 @@ static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* i
 #line 1600 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 10701 "ImportPage.c"
-						goto __catch67_g_error;
+						goto __catch68_g_error;
 					}
 #line 1602 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp113_ = associated;
@@ -10720,8 +10720,8 @@ static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* i
 					_media_metadata_unref0 (associated_metadata);
 #line 10716 "ImportPage.c"
 				}
-				goto __finally67;
-				__catch67_g_error:
+				goto __finally68;
+				__catch68_g_error:
 				{
 					GError* err = NULL;
 					PhotoImportSource* _tmp117_ = NULL;
@@ -10762,7 +10762,7 @@ static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* i
 					_g_error_free0 (err);
 #line 10758 "ImportPage.c"
 				}
-				__finally67:
+				__finally68:
 #line 1599 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1599 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -11449,11 +11449,11 @@ static void import_page_on_import_job_failed (ImportPage* self, BatchImportResul
 #line 1712 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 11445 "ImportPage.c"
-			goto __catch68_g_error;
+			goto __catch69_g_error;
 		}
 	}
-	goto __finally68;
-	__catch68_g_error:
+	goto __finally69;
+	__catch69_g_error:
 	{
 		GError* err = NULL;
 		BatchImportResult* _tmp7_ = NULL;
@@ -11486,7 +11486,7 @@ static void import_page_on_import_job_failed (ImportPage* self, BatchImportResul
 		_g_error_free0 (err);
 #line 11481 "ImportPage.c"
 	}
-	__finally68:
+	__finally69:
 #line 1711 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1711 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -12613,7 +12613,7 @@ static gboolean import_page_camera_import_job_real_prepare (BatchImportJob* base
 #line 557 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 12609 "ImportPage.c"
-			goto __catch69_g_error;
+			goto __catch70_g_error;
 		}
 #line 557 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp6_ = _tmp0_;
@@ -12627,8 +12627,8 @@ static gboolean import_page_camera_import_job_real_prepare (BatchImportJob* base
 		_g_object_unref0 (_tmp0_);
 #line 12622 "ImportPage.c"
 	}
-	goto __finally69;
-	__catch69_g_error:
+	goto __finally70;
+	__catch70_g_error:
 	{
 		GError* err = NULL;
 		ImportSource* _tmp7_ = NULL;
@@ -12658,7 +12658,7 @@ static gboolean import_page_camera_import_job_real_prepare (BatchImportJob* base
 		_g_error_free0 (err);
 #line 12653 "ImportPage.c"
 	}
-	__finally69:
+	__finally70:
 #line 555 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 555 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -12740,10 +12740,10 @@ static gboolean import_page_camera_import_job_real_prepare (BatchImportJob* base
 #line 574 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 12736 "ImportPage.c"
-			goto __finally70;
+			goto __finally71;
 		}
 	}
-	__finally70:
+	__finally71:
 	{
 		GFile* _tmp23_ = NULL;
 #line 576 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -12809,7 +12809,7 @@ static gboolean import_page_camera_import_job_real_prepare (BatchImportJob* base
 #line 583 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 12805 "ImportPage.c"
-				goto __catch71_g_error;
+				goto __catch72_g_error;
 			}
 #line 582 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp34_ = _tmp25_;
@@ -12823,8 +12823,8 @@ static gboolean import_page_camera_import_job_real_prepare (BatchImportJob* base
 			_backing_photo_row_unref0 (_tmp25_);
 #line 12818 "ImportPage.c"
 		}
-		goto __finally71;
-		__catch71_g_error:
+		goto __finally72;
+		__catch72_g_error:
 		{
 			GError* err = NULL;
 			ImportPageCameraImportJob* _tmp35_ = NULL;
@@ -12850,7 +12850,7 @@ static gboolean import_page_camera_import_job_real_prepare (BatchImportJob* base
 			_g_error_free0 (err);
 #line 12844 "ImportPage.c"
 		}
-		__finally71:
+		__finally72:
 #line 581 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 581 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -12941,10 +12941,10 @@ static gboolean import_page_camera_import_job_real_prepare (BatchImportJob* base
 #line 598 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 12936 "ImportPage.c"
-				goto __finally72;
+				goto __finally73;
 			}
 		}
-		__finally72:
+		__finally73:
 		{
 			GFile* _tmp54_ = NULL;
 #line 601 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
diff --git a/src/camera/ImportPage.vala b/src/camera/ImportPage.vala
index 45924f9..db48634 100644
--- a/src/camera/ImportPage.vala
+++ b/src/camera/ImportPage.vala
@@ -455,7 +455,7 @@ public class CameraAccumulator : Object, Core.TrackerAccumulator {
 }
 
 public class ImportPage : CheckerboardPage {
-    private const string UNMOUNT_FAILED_MSG = _("Unable to unmount camera.  Try unmounting the camera from the file manager.");
+    private const string UNMOUNT_FAILED_MSG = _("Unable to unmount camera. Try unmounting the camera from the file manager.");
     
     private class ImportViewManager : ViewManager {
         private ImportPage owner;
@@ -997,7 +997,7 @@ public class ImportPage : CheckerboardPage {
                 }
                 
                 // if locked because it's mounted, offer to unmount
-                debug("Checking if %s is mounted ...", uri);
+                debug("Checking if %s is mounted…", uri);
 
                 File uri = File.new_for_uri(uri);
 
@@ -1010,7 +1010,7 @@ public class ImportPage : CheckerboardPage {
                 
                 if (mount != null) {
                     // it's mounted, offer to unmount for the user
-                    string mounted_message = _("Shotwell needs to unmount the camera from the filesystem in order to access it.  Continue?");
+                    string mounted_message = _("Shotwell needs to unmount the camera from the filesystem in order to access it. Continue?");
 
                     Gtk.MessageDialog dialog = new Gtk.MessageDialog(AppWindow.get_instance(), 
                         Gtk.DialogFlags.MODAL, Gtk.MessageType.QUESTION,
@@ -1026,7 +1026,7 @@ public class ImportPage : CheckerboardPage {
                         unmount_camera(mount);
                     }
                 } else {
-                    string locked_message = _("The camera is locked by another application.  Shotwell can only access the camera when it's unlocked.  Please close any other application using the camera and try again.");
+                    string locked_message = _("The camera is locked by another application. Shotwell can only access the camera when it’s unlocked. Please close any other application using the camera and try again.");
 
                     // it's not mounted, so another application must have it locked
                     Gtk.MessageDialog dialog = new Gtk.MessageDialog(AppWindow.get_instance(),
@@ -1058,14 +1058,14 @@ public class ImportPage : CheckerboardPage {
         progress_bar.visible = true;
         progress_bar.set_fraction(0.0);
         progress_bar.set_ellipsize(Pango.EllipsizeMode.NONE);
-        progress_bar.set_text(_("Unmounting..."));
+        progress_bar.set_text(_("Unmounting…"));
         
         // unmount_with_operation() can/will complete with the volume still mounted (probably meaning
         // it's been *scheduled* for unmounting).  However, this signal is fired when the mount
         // really is unmounted -- *if* a VolumeMonitor has been instantiated.
         mount.unmounted.connect(on_unmounted);
         
-        debug("Unmounting camera ...");
+        debug("Unmounting camera…");
         mount.unmount_with_operation.begin(MountUnmountFlags.NONE, 
             new Gtk.MountOperation(AppWindow.get_instance()), null, on_unmount_finished);
         
@@ -1149,7 +1149,7 @@ public class ImportPage : CheckerboardPage {
         if (busy)
             return RefreshResult.BUSY;
             
-        this.set_page_message (_("Starting import, please wait..."));
+        this.set_page_message (_("Starting import, please wait…"));
 
         update_status(busy, false);
         
diff --git a/src/config/Config.c b/src/config/Config.c
index 2f48a67..397fbb0 100644
--- a/src/config/Config.c
+++ b/src/config/Config.c
@@ -38,6 +38,14 @@ typedef struct _ConfigurationFacadePrivate ConfigurationFacadePrivate;
 #define TYPE_DIMENSIONS (dimensions_get_type ())
 typedef struct _Dimensions Dimensions;
 
+#define TYPE_SCALE_CONSTRAINT (scale_constraint_get_type ())
+
+#define TYPE_EXPORT_FORMAT_MODE (export_format_mode_get_type ())
+
+#define TYPE_PHOTO_FILE_FORMAT (photo_file_format_get_type ())
+
+#define JPEG_TYPE_QUALITY (jpeg_quality_get_type ())
+
 #define TYPE_RAW_DEVELOPER (raw_developer_get_type ())
 
 #define TYPE_FUZZY_PROPERTY_STATE (fuzzy_property_state_get_type ())
@@ -81,6 +89,37 @@ struct _Dimensions {
 };
 
 typedef enum  {
+	SCALE_CONSTRAINT_ORIGINAL,
+	SCALE_CONSTRAINT_DIMENSIONS,
+	SCALE_CONSTRAINT_WIDTH,
+	SCALE_CONSTRAINT_HEIGHT,
+	SCALE_CONSTRAINT_FILL_VIEWPORT
+} ScaleConstraint;
+
+typedef enum  {
+	EXPORT_FORMAT_MODE_UNMODIFIED,
+	EXPORT_FORMAT_MODE_CURRENT,
+	EXPORT_FORMAT_MODE_SPECIFIED,
+	EXPORT_FORMAT_MODE_LAST
+} ExportFormatMode;
+
+typedef enum  {
+	PHOTO_FILE_FORMAT_JFIF,
+	PHOTO_FILE_FORMAT_RAW,
+	PHOTO_FILE_FORMAT_PNG,
+	PHOTO_FILE_FORMAT_TIFF,
+	PHOTO_FILE_FORMAT_BMP,
+	PHOTO_FILE_FORMAT_UNKNOWN
+} PhotoFileFormat;
+
+typedef enum  {
+	JPEG_QUALITY_LOW = 50,
+	JPEG_QUALITY_MEDIUM = 75,
+	JPEG_QUALITY_HIGH = 90,
+	JPEG_QUALITY_MAXIMUM = 100
+} JpegQuality;
+
+typedef enum  {
 	RAW_DEVELOPER_SHOTWELL = 0,
 	RAW_DEVELOPER_CAMERA,
 	RAW_DEVELOPER_EMBEDDED
@@ -143,6 +182,18 @@ struct _ConfigurationFacadeClass {
 	void (*set_external_photo_app) (ConfigurationFacade* self, const gchar* external_photo_app);
 	gchar* (*get_external_raw_app) (ConfigurationFacade* self);
 	void (*set_external_raw_app) (ConfigurationFacade* self, const gchar* external_raw_app);
+	ScaleConstraint (*get_export_constraint) (ConfigurationFacade* self);
+	void (*set_export_constraint) (ConfigurationFacade* self, ScaleConstraint constraint);
+	ExportFormatMode (*get_export_export_format_mode) (ConfigurationFacade* self);
+	void (*set_export_export_format_mode) (ConfigurationFacade* self, ExportFormatMode export_format_mode);
+	gboolean (*get_export_export_metadata) (ConfigurationFacade* self);
+	void (*set_export_export_metadata) (ConfigurationFacade* self, gboolean export_metadata);
+	PhotoFileFormat (*get_export_photo_file_format) (ConfigurationFacade* self);
+	void (*set_export_photo_file_format) (ConfigurationFacade* self, PhotoFileFormat photo_file_format);
+	JpegQuality (*get_export_quality) (ConfigurationFacade* self);
+	void (*set_export_quality) (ConfigurationFacade* self, JpegQuality quality);
+	gint (*get_export_scale) (ConfigurationFacade* self);
+	void (*set_export_scale) (ConfigurationFacade* self, gint scale);
 	RawDeveloper (*get_default_raw_developer) (ConfigurationFacade* self);
 	void (*set_default_raw_developer) (ConfigurationFacade* self, RawDeveloper d);
 	gboolean (*get_hide_photos_already_imported) (ConfigurationFacade* self);
@@ -265,6 +316,12 @@ typedef enum  {
 	CONFIGURABLE_PROPERTY_EVENT_PHOTOS_SORT_ASCENDING,
 	CONFIGURABLE_PROPERTY_EVENT_PHOTOS_SORT_BY,
 	CONFIGURABLE_PROPERTY_EVENTS_SORT_ASCENDING,
+	CONFIGURABLE_PROPERTY_EXPORT_CONSTRAINT,
+	CONFIGURABLE_PROPERTY_EXPORT_EXPORT_FORMAT_MODE,
+	CONFIGURABLE_PROPERTY_EXPORT_EXPORT_METADATA,
+	CONFIGURABLE_PROPERTY_EXPORT_PHOTO_FILE_FORMAT,
+	CONFIGURABLE_PROPERTY_EXPORT_QUALITY,
+	CONFIGURABLE_PROPERTY_EXPORT_SCALE,
 	CONFIGURABLE_PROPERTY_EXTERNAL_PHOTO_APP,
 	CONFIGURABLE_PROPERTY_EXTERNAL_RAW_APP,
 	CONFIGURABLE_PROPERTY_HIDE_PHOTOS_ALREADY_IMPORTED,
@@ -316,6 +373,8 @@ struct _ConfigurationEngineIface {
 	gchar* (*get_name) (ConfigurationEngine* self);
 	gint (*get_int_property) (ConfigurationEngine* self, ConfigurableProperty p, GError** error);
 	void (*set_int_property) (ConfigurationEngine* self, ConfigurableProperty p, gint val, GError** error);
+	gint (*get_enum_property) (ConfigurationEngine* self, ConfigurableProperty p, GError** error);
+	void (*set_enum_property) (ConfigurationEngine* self, ConfigurableProperty p, gint val, GError** error);
 	gchar* (*get_string_property) (ConfigurationEngine* self, ConfigurableProperty p, GError** error);
 	void (*set_string_property) (ConfigurationEngine* self, ConfigurableProperty p, const gchar* val, GError** error);
 	gboolean (*get_bool_property) (ConfigurationEngine* self, ConfigurableProperty p, GError** error);
@@ -344,6 +403,10 @@ GType configuration_facade_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 scale_constraint_get_type (void) G_GNUC_CONST;
+GType export_format_mode_get_type (void) G_GNUC_CONST;
+GType photo_file_format_get_type (void) G_GNUC_CONST;
+GType jpeg_quality_get_type (void) G_GNUC_CONST;
 GType raw_developer_get_type (void) G_GNUC_CONST;
 GType fuzzy_property_state_get_type (void) G_GNUC_CONST;
 GType config_facade_get_type (void) G_GNUC_CONST;
@@ -406,7 +469,7 @@ void config_terminate (void);
 static void _config_facade_on_color_name_changed_configuration_facade_bg_color_name_changed (ConfigurationFacade* _sender, gpointer self) {
 #line 55 "/home/jens/Source/shotwell/src/config/Config.vala"
 	config_facade_on_color_name_changed ((ConfigFacade*) self);
-#line 410 "Config.c"
+#line 473 "Config.c"
 }
 
 
@@ -426,21 +489,21 @@ static ConfigFacade* config_facade_construct (GType object_type) {
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), "bg-color-name-changed", (GCallback) _config_facade_on_color_name_changed_configuration_facade_bg_color_name_changed, self, 0);
 #line 52 "/home/jens/Source/shotwell/src/config/Config.vala"
 	return self;
-#line 430 "Config.c"
+#line 493 "Config.c"
 }
 
 
 static ConfigFacade* config_facade_new (void) {
 #line 52 "/home/jens/Source/shotwell/src/config/Config.vala"
 	return config_facade_construct (CONFIG_TYPE_FACADE);
-#line 437 "Config.c"
+#line 500 "Config.c"
 }
 
 
 static gpointer _g_object_ref0 (gpointer self) {
 #line 62 "/home/jens/Source/shotwell/src/config/Config.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 444 "Config.c"
+#line 507 "Config.c"
 }
 
 
@@ -453,7 +516,7 @@ ConfigFacade* config_facade_get_instance (void) {
 	_tmp0_ = config_facade_instance;
 #line 59 "/home/jens/Source/shotwell/src/config/Config.vala"
 	if (_tmp0_ == NULL) {
-#line 457 "Config.c"
+#line 520 "Config.c"
 		ConfigFacade* _tmp1_ = NULL;
 #line 60 "/home/jens/Source/shotwell/src/config/Config.vala"
 		_tmp1_ = config_facade_new ();
@@ -461,7 +524,7 @@ ConfigFacade* config_facade_get_instance (void) {
 		_g_object_unref0 (config_facade_instance);
 #line 60 "/home/jens/Source/shotwell/src/config/Config.vala"
 		config_facade_instance = _tmp1_;
-#line 465 "Config.c"
+#line 528 "Config.c"
 	}
 #line 62 "/home/jens/Source/shotwell/src/config/Config.vala"
 	_tmp2_ = config_facade_instance;
@@ -471,7 +534,7 @@ ConfigFacade* config_facade_get_instance (void) {
 	result = _tmp3_;
 #line 62 "/home/jens/Source/shotwell/src/config/Config.vala"
 	return result;
-#line 475 "Config.c"
+#line 538 "Config.c"
 }
 
 
@@ -480,7 +543,7 @@ static void config_facade_on_color_name_changed (ConfigFacade* self) {
 	g_return_if_fail (CONFIG_IS_FACADE (self));
 #line 66 "/home/jens/Source/shotwell/src/config/Config.vala"
 	g_signal_emit_by_name (self, "colors-changed");
-#line 484 "Config.c"
+#line 547 "Config.c"
 }
 
 
@@ -497,7 +560,7 @@ static void config_facade_set_text_colors (ConfigFacade* self, GdkRGBA* bg_color
 	_tmp1_ = _tmp0_.red;
 #line 73 "/home/jens/Source/shotwell/src/config/Config.vala"
 	if (_tmp1_ > CONFIG_FACADE_BLACK_THRESHOLD) {
-#line 501 "Config.c"
+#line 564 "Config.c"
 		gchar* _tmp2_ = NULL;
 		gchar* _tmp3_ = NULL;
 		gchar* _tmp4_ = NULL;
@@ -526,7 +589,7 @@ static void config_facade_set_text_colors (ConfigFacade* self, GdkRGBA* bg_color
 		_g_free0 (self->priv->border_color);
 #line 77 "/home/jens/Source/shotwell/src/config/Config.vala"
 		self->priv->border_color = _tmp5_;
-#line 530 "Config.c"
+#line 593 "Config.c"
 	} else {
 		gchar* _tmp6_ = NULL;
 		gchar* _tmp7_ = NULL;
@@ -556,7 +619,7 @@ static void config_facade_set_text_colors (ConfigFacade* self, GdkRGBA* bg_color
 		_g_free0 (self->priv->border_color);
 #line 82 "/home/jens/Source/shotwell/src/config/Config.vala"
 		self->priv->border_color = _tmp9_;
-#line 560 "Config.c"
+#line 623 "Config.c"
 	}
 }
 
@@ -581,7 +644,7 @@ static void config_facade_get_colors (ConfigFacade* self) {
 	_tmp2_ = is_color_parsable (_tmp1_);
 #line 89 "/home/jens/Source/shotwell/src/config/Config.vala"
 	if (!_tmp2_) {
-#line 585 "Config.c"
+#line 648 "Config.c"
 		gchar* _tmp3_ = NULL;
 #line 90 "/home/jens/Source/shotwell/src/config/Config.vala"
 		_tmp3_ = g_strdup (CONFIG_FACADE_DEFAULT_BG_COLOR);
@@ -589,7 +652,7 @@ static void config_facade_get_colors (ConfigFacade* self) {
 		_g_free0 (self->priv->bg_color);
 #line 90 "/home/jens/Source/shotwell/src/config/Config.vala"
 		self->priv->bg_color = _tmp3_;
-#line 593 "Config.c"
+#line 656 "Config.c"
 	}
 #line 92 "/home/jens/Source/shotwell/src/config/Config.vala"
 	_tmp4_ = self->priv->bg_color;
@@ -597,7 +660,7 @@ static void config_facade_get_colors (ConfigFacade* self) {
 	parse_color (_tmp4_, &_tmp5_);
 #line 92 "/home/jens/Source/shotwell/src/config/Config.vala"
 	config_facade_set_text_colors (self, &_tmp5_);
-#line 601 "Config.c"
+#line 664 "Config.c"
 }
 
 
@@ -616,7 +679,7 @@ void config_facade_get_bg_color (ConfigFacade* self, GdkRGBA* result) {
 	if (_tmp1_) {
 #line 97 "/home/jens/Source/shotwell/src/config/Config.vala"
 		config_facade_get_colors (self);
-#line 620 "Config.c"
+#line 683 "Config.c"
 	}
 #line 99 "/home/jens/Source/shotwell/src/config/Config.vala"
 	_tmp2_ = self->priv->bg_color;
@@ -626,7 +689,7 @@ void config_facade_get_bg_color (ConfigFacade* self, GdkRGBA* result) {
 	*result = _tmp3_;
 #line 99 "/home/jens/Source/shotwell/src/config/Config.vala"
 	return;
-#line 630 "Config.c"
+#line 693 "Config.c"
 }
 
 
@@ -638,7 +701,7 @@ void config_facade_get_selected_color (ConfigFacade* self, gboolean in_focus, Gd
 	_tmp0_ = in_focus;
 #line 103 "/home/jens/Source/shotwell/src/config/Config.vala"
 	if (_tmp0_) {
-#line 642 "Config.c"
+#line 705 "Config.c"
 		const gchar* _tmp1_ = NULL;
 		gboolean _tmp2_ = FALSE;
 		const gchar* _tmp3_ = NULL;
@@ -651,7 +714,7 @@ void config_facade_get_selected_color (ConfigFacade* self, gboolean in_focus, Gd
 		if (_tmp2_) {
 #line 105 "/home/jens/Source/shotwell/src/config/Config.vala"
 			config_facade_get_colors (self);
-#line 655 "Config.c"
+#line 718 "Config.c"
 		}
 #line 107 "/home/jens/Source/shotwell/src/config/Config.vala"
 		_tmp3_ = self->priv->selected_color;
@@ -661,7 +724,7 @@ void config_facade_get_selected_color (ConfigFacade* self, gboolean in_focus, Gd
 		*result = _tmp4_;
 #line 107 "/home/jens/Source/shotwell/src/config/Config.vala"
 		return;
-#line 665 "Config.c"
+#line 728 "Config.c"
 	} else {
 		const gchar* _tmp5_ = NULL;
 		gboolean _tmp6_ = FALSE;
@@ -675,7 +738,7 @@ void config_facade_get_selected_color (ConfigFacade* self, gboolean in_focus, Gd
 		if (_tmp6_) {
 #line 110 "/home/jens/Source/shotwell/src/config/Config.vala"
 			config_facade_get_colors (self);
-#line 679 "Config.c"
+#line 742 "Config.c"
 		}
 #line 112 "/home/jens/Source/shotwell/src/config/Config.vala"
 		_tmp7_ = self->priv->unfocused_selected_color;
@@ -685,7 +748,7 @@ void config_facade_get_selected_color (ConfigFacade* self, gboolean in_focus, Gd
 		*result = _tmp8_;
 #line 112 "/home/jens/Source/shotwell/src/config/Config.vala"
 		return;
-#line 689 "Config.c"
+#line 752 "Config.c"
 	}
 }
 
@@ -705,7 +768,7 @@ void config_facade_get_unselected_color (ConfigFacade* self, GdkRGBA* result) {
 	if (_tmp1_) {
 #line 118 "/home/jens/Source/shotwell/src/config/Config.vala"
 		config_facade_get_colors (self);
-#line 709 "Config.c"
+#line 772 "Config.c"
 	}
 #line 120 "/home/jens/Source/shotwell/src/config/Config.vala"
 	_tmp2_ = self->priv->unselected_color;
@@ -715,7 +778,7 @@ void config_facade_get_unselected_color (ConfigFacade* self, GdkRGBA* result) {
 	*result = _tmp3_;
 #line 120 "/home/jens/Source/shotwell/src/config/Config.vala"
 	return;
-#line 719 "Config.c"
+#line 782 "Config.c"
 }
 
 
@@ -734,7 +797,7 @@ void config_facade_get_border_color (ConfigFacade* self, GdkRGBA* result) {
 	if (_tmp1_) {
 #line 125 "/home/jens/Source/shotwell/src/config/Config.vala"
 		config_facade_get_colors (self);
-#line 738 "Config.c"
+#line 801 "Config.c"
 	}
 #line 127 "/home/jens/Source/shotwell/src/config/Config.vala"
 	_tmp2_ = self->priv->border_color;
@@ -744,7 +807,7 @@ void config_facade_get_border_color (ConfigFacade* self, GdkRGBA* result) {
 	*result = _tmp3_;
 #line 127 "/home/jens/Source/shotwell/src/config/Config.vala"
 	return;
-#line 748 "Config.c"
+#line 811 "Config.c"
 }
 
 
@@ -779,7 +842,7 @@ void config_facade_set_bg_color (ConfigFacade* self, GdkRGBA* color) {
 	_tmp4_ = *color;
 #line 136 "/home/jens/Source/shotwell/src/config/Config.vala"
 	config_facade_set_text_colors (self, &_tmp4_);
-#line 783 "Config.c"
+#line 846 "Config.c"
 }
 
 
@@ -791,7 +854,7 @@ void config_facade_commit_bg_color (ConfigFacade* self) {
 	_tmp0_ = self->priv->bg_color;
 #line 140 "/home/jens/Source/shotwell/src/config/Config.vala"
 	CONFIGURATION_FACADE_CLASS (config_facade_parent_class)->set_bg_color_name (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp0_);
-#line 795 "Config.c"
+#line 858 "Config.c"
 }
 
 
@@ -804,7 +867,7 @@ static void config_facade_class_init (ConfigFacadeClass * klass) {
 	G_OBJECT_CLASS (klass)->finalize = config_facade_finalize;
 #line 18 "/home/jens/Source/shotwell/src/config/Config.vala"
 	g_signal_new ("colors_changed", CONFIG_TYPE_FACADE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-#line 808 "Config.c"
+#line 871 "Config.c"
 }
 
 
@@ -821,7 +884,7 @@ static void config_facade_instance_init (ConfigFacade * self) {
 	self->priv->unfocused_selected_color = NULL;
 #line 46 "/home/jens/Source/shotwell/src/config/Config.vala"
 	self->priv->border_color = NULL;
-#line 825 "Config.c"
+#line 888 "Config.c"
 }
 
 
@@ -841,7 +904,7 @@ static void config_facade_finalize (GObject* obj) {
 	_g_free0 (self->priv->border_color);
 #line 18 "/home/jens/Source/shotwell/src/config/Config.vala"
 	G_OBJECT_CLASS (config_facade_parent_class)->finalize (obj);
-#line 845 "Config.c"
+#line 908 "Config.c"
 }
 
 
diff --git a/src/config/ConfigurationInterfaces.c b/src/config/ConfigurationInterfaces.c
index d1fa9e7..cacb1ad 100644
--- a/src/config/ConfigurationInterfaces.c
+++ b/src/config/ConfigurationInterfaces.c
@@ -42,6 +42,14 @@ typedef struct _ConfigurationFacadePrivate ConfigurationFacadePrivate;
 #define TYPE_DIMENSIONS (dimensions_get_type ())
 typedef struct _Dimensions Dimensions;
 
+#define TYPE_SCALE_CONSTRAINT (scale_constraint_get_type ())
+
+#define TYPE_EXPORT_FORMAT_MODE (export_format_mode_get_type ())
+
+#define TYPE_PHOTO_FILE_FORMAT (photo_file_format_get_type ())
+
+#define JPEG_TYPE_QUALITY (jpeg_quality_get_type ())
+
 #define TYPE_RAW_DEVELOPER (raw_developer_get_type ())
 #define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
 #define _g_free0(var) (var = (g_free (var), NULL))
@@ -84,6 +92,12 @@ typedef enum  {
 	CONFIGURABLE_PROPERTY_EVENT_PHOTOS_SORT_ASCENDING,
 	CONFIGURABLE_PROPERTY_EVENT_PHOTOS_SORT_BY,
 	CONFIGURABLE_PROPERTY_EVENTS_SORT_ASCENDING,
+	CONFIGURABLE_PROPERTY_EXPORT_CONSTRAINT,
+	CONFIGURABLE_PROPERTY_EXPORT_EXPORT_FORMAT_MODE,
+	CONFIGURABLE_PROPERTY_EXPORT_EXPORT_METADATA,
+	CONFIGURABLE_PROPERTY_EXPORT_PHOTO_FILE_FORMAT,
+	CONFIGURABLE_PROPERTY_EXPORT_QUALITY,
+	CONFIGURABLE_PROPERTY_EXPORT_SCALE,
 	CONFIGURABLE_PROPERTY_EXTERNAL_PHOTO_APP,
 	CONFIGURABLE_PROPERTY_EXTERNAL_RAW_APP,
 	CONFIGURABLE_PROPERTY_HIDE_PHOTOS_ALREADY_IMPORTED,
@@ -130,6 +144,8 @@ struct _ConfigurationEngineIface {
 	gchar* (*get_name) (ConfigurationEngine* self);
 	gint (*get_int_property) (ConfigurationEngine* self, ConfigurableProperty p, GError** error);
 	void (*set_int_property) (ConfigurationEngine* self, ConfigurableProperty p, gint val, GError** error);
+	gint (*get_enum_property) (ConfigurationEngine* self, ConfigurableProperty p, GError** error);
+	void (*set_enum_property) (ConfigurationEngine* self, ConfigurableProperty p, gint val, GError** error);
 	gchar* (*get_string_property) (ConfigurationEngine* self, ConfigurableProperty p, GError** error);
 	void (*set_string_property) (ConfigurationEngine* self, ConfigurableProperty p, const gchar* val, GError** error);
 	gboolean (*get_bool_property) (ConfigurationEngine* self, ConfigurableProperty p, GError** error);
@@ -155,6 +171,37 @@ struct _Dimensions {
 };
 
 typedef enum  {
+	SCALE_CONSTRAINT_ORIGINAL,
+	SCALE_CONSTRAINT_DIMENSIONS,
+	SCALE_CONSTRAINT_WIDTH,
+	SCALE_CONSTRAINT_HEIGHT,
+	SCALE_CONSTRAINT_FILL_VIEWPORT
+} ScaleConstraint;
+
+typedef enum  {
+	EXPORT_FORMAT_MODE_UNMODIFIED,
+	EXPORT_FORMAT_MODE_CURRENT,
+	EXPORT_FORMAT_MODE_SPECIFIED,
+	EXPORT_FORMAT_MODE_LAST
+} ExportFormatMode;
+
+typedef enum  {
+	PHOTO_FILE_FORMAT_JFIF,
+	PHOTO_FILE_FORMAT_RAW,
+	PHOTO_FILE_FORMAT_PNG,
+	PHOTO_FILE_FORMAT_TIFF,
+	PHOTO_FILE_FORMAT_BMP,
+	PHOTO_FILE_FORMAT_UNKNOWN
+} PhotoFileFormat;
+
+typedef enum  {
+	JPEG_QUALITY_LOW = 50,
+	JPEG_QUALITY_MEDIUM = 75,
+	JPEG_QUALITY_HIGH = 90,
+	JPEG_QUALITY_MAXIMUM = 100
+} JpegQuality;
+
+typedef enum  {
 	RAW_DEVELOPER_SHOTWELL = 0,
 	RAW_DEVELOPER_CAMERA,
 	RAW_DEVELOPER_EMBEDDED
@@ -211,6 +258,18 @@ struct _ConfigurationFacadeClass {
 	void (*set_external_photo_app) (ConfigurationFacade* self, const gchar* external_photo_app);
 	gchar* (*get_external_raw_app) (ConfigurationFacade* self);
 	void (*set_external_raw_app) (ConfigurationFacade* self, const gchar* external_raw_app);
+	ScaleConstraint (*get_export_constraint) (ConfigurationFacade* self);
+	void (*set_export_constraint) (ConfigurationFacade* self, ScaleConstraint constraint);
+	ExportFormatMode (*get_export_export_format_mode) (ConfigurationFacade* self);
+	void (*set_export_export_format_mode) (ConfigurationFacade* self, ExportFormatMode export_format_mode);
+	gboolean (*get_export_export_metadata) (ConfigurationFacade* self);
+	void (*set_export_export_metadata) (ConfigurationFacade* self, gboolean export_metadata);
+	PhotoFileFormat (*get_export_photo_file_format) (ConfigurationFacade* self);
+	void (*set_export_photo_file_format) (ConfigurationFacade* self, PhotoFileFormat photo_file_format);
+	JpegQuality (*get_export_quality) (ConfigurationFacade* self);
+	void (*set_export_quality) (ConfigurationFacade* self, JpegQuality quality);
+	gint (*get_export_scale) (ConfigurationFacade* self);
+	void (*set_export_scale) (ConfigurationFacade* self, gint scale);
 	RawDeveloper (*get_default_raw_developer) (ConfigurationFacade* self);
 	void (*set_default_raw_developer) (ConfigurationFacade* self, RawDeveloper d);
 	gboolean (*get_hide_photos_already_imported) (ConfigurationFacade* self);
@@ -305,6 +364,8 @@ GType configuration_engine_get_type (void) G_GNUC_CONST;
 gchar* configuration_engine_get_name (ConfigurationEngine* self);
 gint configuration_engine_get_int_property (ConfigurationEngine* self, ConfigurableProperty p, GError** error);
 void configuration_engine_set_int_property (ConfigurationEngine* self, ConfigurableProperty p, gint val, GError** error);
+gint configuration_engine_get_enum_property (ConfigurationEngine* self, ConfigurableProperty p, GError** error);
+void configuration_engine_set_enum_property (ConfigurationEngine* self, ConfigurableProperty p, gint val, GError** error);
 gchar* configuration_engine_get_string_property (ConfigurationEngine* self, ConfigurableProperty p, GError** error);
 void configuration_engine_set_string_property (ConfigurationEngine* self, ConfigurableProperty p, const gchar* val, GError** error);
 gboolean configuration_engine_get_bool_property (ConfigurationEngine* self, ConfigurableProperty p, GError** error);
@@ -326,6 +387,10 @@ GType configuration_facade_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 scale_constraint_get_type (void) G_GNUC_CONST;
+GType export_format_mode_get_type (void) G_GNUC_CONST;
+GType photo_file_format_get_type (void) G_GNUC_CONST;
+GType jpeg_quality_get_type (void) G_GNUC_CONST;
 GType raw_developer_get_type (void) G_GNUC_CONST;
 #define CONFIGURATION_FACADE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_CONFIGURATION_FACADE, ConfigurationFacadePrivate))
 enum  {
@@ -425,6 +490,32 @@ gchar* configuration_facade_get_external_raw_app (ConfigurationFacade* self);
 static gchar* configuration_facade_real_get_external_raw_app (ConfigurationFacade* self);
 void configuration_facade_set_external_raw_app (ConfigurationFacade* self, const gchar* external_raw_app);
 static void configuration_facade_real_set_external_raw_app (ConfigurationFacade* self, const gchar* external_raw_app);
+ScaleConstraint configuration_facade_get_export_constraint (ConfigurationFacade* self);
+static ScaleConstraint configuration_facade_real_get_export_constraint (ConfigurationFacade* self);
+void configuration_facade_set_export_constraint (ConfigurationFacade* self, ScaleConstraint constraint);
+static void configuration_facade_real_set_export_constraint (ConfigurationFacade* self, ScaleConstraint constraint);
+ExportFormatMode configuration_facade_get_export_export_format_mode (ConfigurationFacade* self);
+static ExportFormatMode configuration_facade_real_get_export_export_format_mode (ConfigurationFacade* self);
+void configuration_facade_set_export_export_format_mode (ConfigurationFacade* self, ExportFormatMode export_format_mode);
+static void configuration_facade_real_set_export_export_format_mode (ConfigurationFacade* self, ExportFormatMode export_format_mode);
+gboolean configuration_facade_get_export_export_metadata (ConfigurationFacade* self);
+static gboolean configuration_facade_real_get_export_export_metadata (ConfigurationFacade* self);
+void configuration_facade_set_export_export_metadata (ConfigurationFacade* self, gboolean export_metadata);
+static void configuration_facade_real_set_export_export_metadata (ConfigurationFacade* self, gboolean export_metadata);
+PhotoFileFormat configuration_facade_get_export_photo_file_format (ConfigurationFacade* self);
+static PhotoFileFormat configuration_facade_real_get_export_photo_file_format (ConfigurationFacade* self);
+PhotoFileFormat photo_file_format_unserialize (gint value);
+void configuration_facade_set_export_photo_file_format (ConfigurationFacade* self, PhotoFileFormat photo_file_format);
+static void configuration_facade_real_set_export_photo_file_format (ConfigurationFacade* self, PhotoFileFormat photo_file_format);
+gint photo_file_format_serialize (PhotoFileFormat self);
+JpegQuality configuration_facade_get_export_quality (ConfigurationFacade* self);
+static JpegQuality configuration_facade_real_get_export_quality (ConfigurationFacade* self);
+void configuration_facade_set_export_quality (ConfigurationFacade* self, JpegQuality quality);
+static void configuration_facade_real_set_export_quality (ConfigurationFacade* self, JpegQuality quality);
+gint configuration_facade_get_export_scale (ConfigurationFacade* self);
+static gint configuration_facade_real_get_export_scale (ConfigurationFacade* self);
+void configuration_facade_set_export_scale (ConfigurationFacade* self, gint scale);
+static void configuration_facade_real_set_export_scale (ConfigurationFacade* self, gint scale);
 RawDeveloper configuration_facade_get_default_raw_developer (ConfigurationFacade* self);
 static RawDeveloper configuration_facade_real_get_default_raw_developer (ConfigurationFacade* self);
 RawDeveloper raw_developer_from_string (const gchar* value);
@@ -607,833 +698,911 @@ GType fuzzy_property_state_get_type (void) {
 
 gchar* configurable_property_to_string (ConfigurableProperty self) {
 	gchar* result = NULL;
-#line 91 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	switch (self) {
-#line 91 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_AUTO_IMPORT_FROM_LIBRARY:
-#line 615 "ConfigurationInterfaces.c"
+#line 706 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp0_ = NULL;
-#line 93 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 99 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			_tmp0_ = g_strdup ("AUTO_IMPORT_FROM_LIBRARY");
-#line 93 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 99 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			result = _tmp0_;
-#line 93 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 99 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 624 "ConfigurationInterfaces.c"
+#line 715 "ConfigurationInterfaces.c"
 		}
-#line 91 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_BG_COLOR_NAME:
-#line 628 "ConfigurationInterfaces.c"
+#line 719 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp1_ = NULL;
-#line 96 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 102 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			_tmp1_ = g_strdup ("BG_COLOR_NAME");
-#line 96 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 102 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			result = _tmp1_;
-#line 96 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 102 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 637 "ConfigurationInterfaces.c"
+#line 728 "ConfigurationInterfaces.c"
 		}
-#line 91 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_COMMIT_METADATA_TO_MASTERS:
-#line 641 "ConfigurationInterfaces.c"
+#line 732 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp2_ = NULL;
-#line 99 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 105 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			_tmp2_ = g_strdup ("COMMIT_METADATA_TO_MASTERS");
-#line 99 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 105 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			result = _tmp2_;
-#line 99 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 105 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 650 "ConfigurationInterfaces.c"
+#line 741 "ConfigurationInterfaces.c"
 		}
-#line 91 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_DESKTOP_BACKGROUND_FILE:
-#line 654 "ConfigurationInterfaces.c"
+#line 745 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp3_ = NULL;
-#line 102 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 108 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			_tmp3_ = g_strdup ("DESKTOP_BACKGROUND_FILE");
-#line 102 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 108 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			result = _tmp3_;
-#line 102 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 108 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 663 "ConfigurationInterfaces.c"
+#line 754 "ConfigurationInterfaces.c"
 		}
-#line 91 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_DESKTOP_BACKGROUND_MODE:
-#line 667 "ConfigurationInterfaces.c"
+#line 758 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp4_ = NULL;
-#line 105 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 111 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			_tmp4_ = g_strdup ("DESKTOP_BACKGROUND_MODE");
-#line 105 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 111 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			result = _tmp4_;
-#line 105 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 111 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 676 "ConfigurationInterfaces.c"
+#line 767 "ConfigurationInterfaces.c"
 		}
-#line 91 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_SCREENSAVER_FILE:
-#line 680 "ConfigurationInterfaces.c"
+#line 771 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp5_ = NULL;
-#line 108 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 114 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			_tmp5_ = g_strdup ("SCREENSAVER_FILE");
-#line 108 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 114 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			result = _tmp5_;
-#line 108 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 114 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 689 "ConfigurationInterfaces.c"
+#line 780 "ConfigurationInterfaces.c"
 		}
-#line 91 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_SCREENSAVER_MODE:
-#line 693 "ConfigurationInterfaces.c"
+#line 784 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp6_ = NULL;
-#line 111 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 117 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			_tmp6_ = g_strdup ("SCREENSAVER_MODE");
-#line 111 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 117 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			result = _tmp6_;
-#line 111 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 117 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 702 "ConfigurationInterfaces.c"
+#line 793 "ConfigurationInterfaces.c"
 		}
-#line 91 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_DIRECTORY_PATTERN:
-#line 706 "ConfigurationInterfaces.c"
+#line 797 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp7_ = NULL;
-#line 114 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 120 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			_tmp7_ = g_strdup ("DIRECTORY_PATTERN");
-#line 114 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 120 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			result = _tmp7_;
-#line 114 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 120 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 715 "ConfigurationInterfaces.c"
+#line 806 "ConfigurationInterfaces.c"
 		}
-#line 91 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_DIRECTORY_PATTERN_CUSTOM:
-#line 719 "ConfigurationInterfaces.c"
+#line 810 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp8_ = NULL;
-#line 117 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 123 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			_tmp8_ = g_strdup ("DIRECTORY_PATTERN_CUSTOM");
-#line 117 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 123 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			result = _tmp8_;
-#line 117 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 123 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 728 "ConfigurationInterfaces.c"
+#line 819 "ConfigurationInterfaces.c"
 		}
-#line 91 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_DIRECT_WINDOW_HEIGHT:
-#line 732 "ConfigurationInterfaces.c"
+#line 823 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp9_ = NULL;
-#line 120 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 126 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			_tmp9_ = g_strdup ("DIRECT_WINDOW_HEIGHT");
-#line 120 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 126 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			result = _tmp9_;
-#line 120 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 126 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 741 "ConfigurationInterfaces.c"
+#line 832 "ConfigurationInterfaces.c"
 		}
-#line 91 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_DIRECT_WINDOW_MAXIMIZE:
-#line 745 "ConfigurationInterfaces.c"
+#line 836 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp10_ = NULL;
-#line 123 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 129 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			_tmp10_ = g_strdup ("DIRECT_WINDOW_MAXIMIZE");
-#line 123 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 129 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			result = _tmp10_;
-#line 123 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 129 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 754 "ConfigurationInterfaces.c"
+#line 845 "ConfigurationInterfaces.c"
 		}
-#line 91 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_DIRECT_WINDOW_WIDTH:
-#line 758 "ConfigurationInterfaces.c"
+#line 849 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp11_ = NULL;
-#line 126 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 132 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			_tmp11_ = g_strdup ("DIRECT_WINDOW_WIDTH");
-#line 126 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 132 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			result = _tmp11_;
-#line 126 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 132 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 767 "ConfigurationInterfaces.c"
+#line 858 "ConfigurationInterfaces.c"
 		}
-#line 91 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_DISPLAY_BASIC_PROPERTIES:
-#line 771 "ConfigurationInterfaces.c"
+#line 862 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp12_ = NULL;
-#line 129 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 135 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			_tmp12_ = g_strdup ("DISPLAY_BASIC_PROPERTIES");
-#line 129 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 135 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			result = _tmp12_;
-#line 129 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 135 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 780 "ConfigurationInterfaces.c"
+#line 871 "ConfigurationInterfaces.c"
 		}
-#line 91 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_DISPLAY_EXTENDED_PROPERTIES:
-#line 784 "ConfigurationInterfaces.c"
+#line 875 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp13_ = NULL;
-#line 132 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 138 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			_tmp13_ = g_strdup ("DISPLAY_EXTENDED_PROPERTIES");
-#line 132 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 138 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			result = _tmp13_;
-#line 132 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 138 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 793 "ConfigurationInterfaces.c"
+#line 884 "ConfigurationInterfaces.c"
 		}
-#line 91 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_DISPLAY_SIDEBAR:
-#line 797 "ConfigurationInterfaces.c"
+#line 888 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp14_ = NULL;
-#line 135 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 141 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			_tmp14_ = g_strdup ("DISPLAY_SIDEBAR");
-#line 135 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 141 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			result = _tmp14_;
-#line 135 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 141 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 806 "ConfigurationInterfaces.c"
+#line 897 "ConfigurationInterfaces.c"
 		}
-#line 91 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_DISPLAY_TOOLBAR:
-#line 810 "ConfigurationInterfaces.c"
+#line 901 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp15_ = NULL;
-#line 138 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 144 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			_tmp15_ = g_strdup ("DISPLAY_TOOLBAR");
-#line 138 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 144 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			result = _tmp15_;
-#line 138 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 144 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 819 "ConfigurationInterfaces.c"
+#line 910 "ConfigurationInterfaces.c"
 		}
-#line 91 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_DISPLAY_SEARCH_BAR:
-#line 823 "ConfigurationInterfaces.c"
+#line 914 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp16_ = NULL;
-#line 141 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 147 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			_tmp16_ = g_strdup ("DISPLAY_SEARCH_BAR");
-#line 141 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 147 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			result = _tmp16_;
-#line 141 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 147 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 832 "ConfigurationInterfaces.c"
+#line 923 "ConfigurationInterfaces.c"
 		}
-#line 91 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_DISPLAY_PHOTO_RATINGS:
-#line 836 "ConfigurationInterfaces.c"
+#line 927 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp17_ = NULL;
-#line 144 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 150 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			_tmp17_ = g_strdup ("DISPLAY_PHOTO_RATINGS");
-#line 144 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 150 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			result = _tmp17_;
-#line 144 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 150 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 845 "ConfigurationInterfaces.c"
+#line 936 "ConfigurationInterfaces.c"
 		}
-#line 91 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_DISPLAY_PHOTO_TAGS:
-#line 849 "ConfigurationInterfaces.c"
+#line 940 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp18_ = NULL;
-#line 147 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 153 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			_tmp18_ = g_strdup ("DISPLAY_PHOTO_TAGS");
-#line 147 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 153 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			result = _tmp18_;
-#line 147 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 153 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 858 "ConfigurationInterfaces.c"
+#line 949 "ConfigurationInterfaces.c"
 		}
-#line 91 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_DISPLAY_PHOTO_TITLES:
-#line 862 "ConfigurationInterfaces.c"
+#line 953 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp19_ = NULL;
-#line 150 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 156 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			_tmp19_ = g_strdup ("DISPLAY_PHOTO_TITLES");
-#line 150 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 156 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			result = _tmp19_;
-#line 150 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 156 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 871 "ConfigurationInterfaces.c"
+#line 962 "ConfigurationInterfaces.c"
 		}
-#line 91 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_DISPLAY_PHOTO_COMMENTS:
-#line 875 "ConfigurationInterfaces.c"
+#line 966 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp20_ = NULL;
-#line 153 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 159 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			_tmp20_ = g_strdup ("DISPLAY_PHOTO_COMMENTS");
-#line 153 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 159 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			result = _tmp20_;
-#line 153 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 159 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 884 "ConfigurationInterfaces.c"
+#line 975 "ConfigurationInterfaces.c"
 		}
-#line 91 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_DISPLAY_EVENT_COMMENTS:
-#line 888 "ConfigurationInterfaces.c"
+#line 979 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp21_ = NULL;
-#line 156 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 162 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			_tmp21_ = g_strdup ("DISPLAY_EVENT_COMMENTS");
-#line 156 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 162 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			result = _tmp21_;
-#line 156 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 162 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 897 "ConfigurationInterfaces.c"
+#line 988 "ConfigurationInterfaces.c"
 		}
-#line 91 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_EVENT_PHOTOS_SORT_ASCENDING:
-#line 901 "ConfigurationInterfaces.c"
+#line 992 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp22_ = NULL;
-#line 159 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 165 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			_tmp22_ = g_strdup ("EVENT_PHOTOS_SORT_ASCENDING");
-#line 159 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 165 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			result = _tmp22_;
-#line 159 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 165 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 910 "ConfigurationInterfaces.c"
+#line 1001 "ConfigurationInterfaces.c"
 		}
-#line 91 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_EVENT_PHOTOS_SORT_BY:
-#line 914 "ConfigurationInterfaces.c"
+#line 1005 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp23_ = NULL;
-#line 162 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 168 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			_tmp23_ = g_strdup ("EVENT_PHOTOS_SORT_BY");
-#line 162 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 168 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			result = _tmp23_;
-#line 162 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 168 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 923 "ConfigurationInterfaces.c"
+#line 1014 "ConfigurationInterfaces.c"
 		}
-#line 91 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_EVENTS_SORT_ASCENDING:
-#line 927 "ConfigurationInterfaces.c"
+#line 1018 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp24_ = NULL;
-#line 165 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-			_tmp24_ = g_strdup ("EVENTS_SORT_ASCENDING");
-#line 165 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-			result = _tmp24_;
-#line 165 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-			return result;
-#line 936 "ConfigurationInterfaces.c"
-		}
-#line 91 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-		case CONFIGURABLE_PROPERTY_EXTERNAL_PHOTO_APP:
-#line 940 "ConfigurationInterfaces.c"
-		{
-			gchar* _tmp25_ = NULL;
-#line 168 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-			_tmp25_ = g_strdup ("EXTERNAL_PHOTO_APP");
-#line 168 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-			result = _tmp25_;
-#line 168 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-			return result;
-#line 949 "ConfigurationInterfaces.c"
-		}
-#line 91 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-		case CONFIGURABLE_PROPERTY_EXTERNAL_RAW_APP:
-#line 953 "ConfigurationInterfaces.c"
-		{
-			gchar* _tmp26_ = NULL;
 #line 171 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-			_tmp26_ = g_strdup ("EXTERNAL_RAW_APP");
+			_tmp24_ = g_strdup ("EVENTS_SORT_ASCENDING");
 #line 171 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-			result = _tmp26_;
+			result = _tmp24_;
 #line 171 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 962 "ConfigurationInterfaces.c"
+#line 1027 "ConfigurationInterfaces.c"
 		}
-#line 91 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-		case CONFIGURABLE_PROPERTY_HIDE_PHOTOS_ALREADY_IMPORTED:
-#line 966 "ConfigurationInterfaces.c"
+#line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		case CONFIGURABLE_PROPERTY_EXPORT_CONSTRAINT:
+#line 1031 "ConfigurationInterfaces.c"
 		{
-			gchar* _tmp27_ = NULL;
+			gchar* _tmp25_ = NULL;
 #line 174 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-			_tmp27_ = g_strdup ("HIDE_PHOTOS_ALREADY_IMPORTED");
+			_tmp25_ = g_strdup ("EXPORT_CONSTRAINT");
 #line 174 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-			result = _tmp27_;
+			result = _tmp25_;
 #line 174 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 975 "ConfigurationInterfaces.c"
+#line 1040 "ConfigurationInterfaces.c"
 		}
-#line 91 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-		case CONFIGURABLE_PROPERTY_IMPORT_DIR:
-#line 979 "ConfigurationInterfaces.c"
+#line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		case CONFIGURABLE_PROPERTY_EXPORT_EXPORT_FORMAT_MODE:
+#line 1044 "ConfigurationInterfaces.c"
 		{
-			gchar* _tmp28_ = NULL;
+			gchar* _tmp26_ = NULL;
 #line 177 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-			_tmp28_ = g_strdup ("IMPORT_DIR");
+			_tmp26_ = g_strdup ("EXPORT_EXPORT_FORMAT_MODE");
 #line 177 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-			result = _tmp28_;
+			result = _tmp26_;
 #line 177 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 988 "ConfigurationInterfaces.c"
+#line 1053 "ConfigurationInterfaces.c"
 		}
-#line 91 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-		case CONFIGURABLE_PROPERTY_KEEP_RELATIVITY:
-#line 992 "ConfigurationInterfaces.c"
+#line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		case CONFIGURABLE_PROPERTY_EXPORT_EXPORT_METADATA:
+#line 1057 "ConfigurationInterfaces.c"
 		{
-			gchar* _tmp29_ = NULL;
+			gchar* _tmp27_ = NULL;
 #line 180 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-			_tmp29_ = g_strdup ("KEEP_RELATIVITY");
+			_tmp27_ = g_strdup ("EXPORT_EXPORT_METADATA");
 #line 180 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-			result = _tmp29_;
+			result = _tmp27_;
 #line 180 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1001 "ConfigurationInterfaces.c"
+#line 1066 "ConfigurationInterfaces.c"
 		}
-#line 91 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-		case CONFIGURABLE_PROPERTY_LAST_CROP_HEIGHT:
-#line 1005 "ConfigurationInterfaces.c"
+#line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		case CONFIGURABLE_PROPERTY_EXPORT_PHOTO_FILE_FORMAT:
+#line 1070 "ConfigurationInterfaces.c"
 		{
-			gchar* _tmp30_ = NULL;
+			gchar* _tmp28_ = NULL;
 #line 183 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-			_tmp30_ = g_strdup ("LAST_CROP_HEIGHT");
+			_tmp28_ = g_strdup ("EXPORT_PHOTO_FILE_FORMAT");
 #line 183 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-			result = _tmp30_;
+			result = _tmp28_;
 #line 183 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1014 "ConfigurationInterfaces.c"
+#line 1079 "ConfigurationInterfaces.c"
 		}
-#line 91 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-		case CONFIGURABLE_PROPERTY_LAST_CROP_MENU_CHOICE:
-#line 1018 "ConfigurationInterfaces.c"
+#line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		case CONFIGURABLE_PROPERTY_EXPORT_QUALITY:
+#line 1083 "ConfigurationInterfaces.c"
 		{
-			gchar* _tmp31_ = NULL;
+			gchar* _tmp29_ = NULL;
 #line 186 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-			_tmp31_ = g_strdup ("LAST_CROP_MENU_CHOICE");
+			_tmp29_ = g_strdup ("EXPORT_QUALITY");
 #line 186 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-			result = _tmp31_;
+			result = _tmp29_;
 #line 186 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1027 "ConfigurationInterfaces.c"
+#line 1092 "ConfigurationInterfaces.c"
 		}
-#line 91 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-		case CONFIGURABLE_PROPERTY_LAST_CROP_WIDTH:
-#line 1031 "ConfigurationInterfaces.c"
+#line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		case CONFIGURABLE_PROPERTY_EXPORT_SCALE:
+#line 1096 "ConfigurationInterfaces.c"
 		{
-			gchar* _tmp32_ = NULL;
+			gchar* _tmp30_ = NULL;
 #line 189 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-			_tmp32_ = g_strdup ("LAST_CROP_WIDTH");
+			_tmp30_ = g_strdup ("EXPORT_SCALE");
 #line 189 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-			result = _tmp32_;
+			result = _tmp30_;
 #line 189 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1040 "ConfigurationInterfaces.c"
+#line 1105 "ConfigurationInterfaces.c"
 		}
-#line 91 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-		case CONFIGURABLE_PROPERTY_LAST_USED_SERVICE:
-#line 1044 "ConfigurationInterfaces.c"
+#line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		case CONFIGURABLE_PROPERTY_EXTERNAL_PHOTO_APP:
+#line 1109 "ConfigurationInterfaces.c"
 		{
-			gchar* _tmp33_ = NULL;
+			gchar* _tmp31_ = NULL;
 #line 192 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-			_tmp33_ = g_strdup ("LAST_USED_SERVICE");
+			_tmp31_ = g_strdup ("EXTERNAL_PHOTO_APP");
 #line 192 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-			result = _tmp33_;
+			result = _tmp31_;
 #line 192 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1053 "ConfigurationInterfaces.c"
+#line 1118 "ConfigurationInterfaces.c"
 		}
-#line 91 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-		case CONFIGURABLE_PROPERTY_LAST_USED_DATAIMPORTS_SERVICE:
-#line 1057 "ConfigurationInterfaces.c"
+#line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		case CONFIGURABLE_PROPERTY_EXTERNAL_RAW_APP:
+#line 1122 "ConfigurationInterfaces.c"
 		{
-			gchar* _tmp34_ = NULL;
+			gchar* _tmp32_ = NULL;
 #line 195 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-			_tmp34_ = g_strdup ("LAST_USED_DATAIMPORTS_SERVICE");
+			_tmp32_ = g_strdup ("EXTERNAL_RAW_APP");
 #line 195 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-			result = _tmp34_;
+			result = _tmp32_;
 #line 195 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1066 "ConfigurationInterfaces.c"
+#line 1131 "ConfigurationInterfaces.c"
 		}
-#line 91 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-		case CONFIGURABLE_PROPERTY_LIBRARY_PHOTOS_SORT_ASCENDING:
-#line 1070 "ConfigurationInterfaces.c"
+#line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		case CONFIGURABLE_PROPERTY_HIDE_PHOTOS_ALREADY_IMPORTED:
+#line 1135 "ConfigurationInterfaces.c"
 		{
-			gchar* _tmp35_ = NULL;
+			gchar* _tmp33_ = NULL;
 #line 198 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-			_tmp35_ = g_strdup ("LIBRARY_PHOTOS_SORT_ASCENDING");
+			_tmp33_ = g_strdup ("HIDE_PHOTOS_ALREADY_IMPORTED");
 #line 198 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-			result = _tmp35_;
+			result = _tmp33_;
 #line 198 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1079 "ConfigurationInterfaces.c"
+#line 1144 "ConfigurationInterfaces.c"
 		}
-#line 91 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-		case CONFIGURABLE_PROPERTY_LIBRARY_PHOTOS_SORT_BY:
-#line 1083 "ConfigurationInterfaces.c"
+#line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		case CONFIGURABLE_PROPERTY_IMPORT_DIR:
+#line 1148 "ConfigurationInterfaces.c"
 		{
-			gchar* _tmp36_ = NULL;
+			gchar* _tmp34_ = NULL;
 #line 201 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-			_tmp36_ = g_strdup ("LIBRARY_PHOTOS_SORT_BY");
+			_tmp34_ = g_strdup ("IMPORT_DIR");
 #line 201 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-			result = _tmp36_;
+			result = _tmp34_;
 #line 201 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1092 "ConfigurationInterfaces.c"
+#line 1157 "ConfigurationInterfaces.c"
 		}
-#line 91 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-		case CONFIGURABLE_PROPERTY_LIBRARY_WINDOW_HEIGHT:
-#line 1096 "ConfigurationInterfaces.c"
+#line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		case CONFIGURABLE_PROPERTY_KEEP_RELATIVITY:
+#line 1161 "ConfigurationInterfaces.c"
 		{
-			gchar* _tmp37_ = NULL;
+			gchar* _tmp35_ = NULL;
 #line 204 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-			_tmp37_ = g_strdup ("LIBRARY_WINDOW_HEIGHT");
+			_tmp35_ = g_strdup ("KEEP_RELATIVITY");
 #line 204 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-			result = _tmp37_;
+			result = _tmp35_;
 #line 204 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1105 "ConfigurationInterfaces.c"
+#line 1170 "ConfigurationInterfaces.c"
 		}
-#line 91 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-		case CONFIGURABLE_PROPERTY_LIBRARY_WINDOW_MAXIMIZE:
-#line 1109 "ConfigurationInterfaces.c"
+#line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		case CONFIGURABLE_PROPERTY_LAST_CROP_HEIGHT:
+#line 1174 "ConfigurationInterfaces.c"
 		{
-			gchar* _tmp38_ = NULL;
+			gchar* _tmp36_ = NULL;
 #line 207 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-			_tmp38_ = g_strdup ("LIBRARY_WINDOW_MAXIMIZE");
+			_tmp36_ = g_strdup ("LAST_CROP_HEIGHT");
 #line 207 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-			result = _tmp38_;
+			result = _tmp36_;
 #line 207 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1118 "ConfigurationInterfaces.c"
+#line 1183 "ConfigurationInterfaces.c"
 		}
-#line 91 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-		case CONFIGURABLE_PROPERTY_LIBRARY_WINDOW_WIDTH:
-#line 1122 "ConfigurationInterfaces.c"
+#line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		case CONFIGURABLE_PROPERTY_LAST_CROP_MENU_CHOICE:
+#line 1187 "ConfigurationInterfaces.c"
 		{
-			gchar* _tmp39_ = NULL;
+			gchar* _tmp37_ = NULL;
 #line 210 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-			_tmp39_ = g_strdup ("LIBRARY_WINDOW_WIDTH");
+			_tmp37_ = g_strdup ("LAST_CROP_MENU_CHOICE");
 #line 210 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-			result = _tmp39_;
+			result = _tmp37_;
 #line 210 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1131 "ConfigurationInterfaces.c"
+#line 1196 "ConfigurationInterfaces.c"
 		}
-#line 91 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-		case CONFIGURABLE_PROPERTY_MODIFY_ORIGINALS:
-#line 1135 "ConfigurationInterfaces.c"
+#line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		case CONFIGURABLE_PROPERTY_LAST_CROP_WIDTH:
+#line 1200 "ConfigurationInterfaces.c"
 		{
-			gchar* _tmp40_ = NULL;
+			gchar* _tmp38_ = NULL;
 #line 213 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-			_tmp40_ = g_strdup ("MODIFY_ORIGINALS");
+			_tmp38_ = g_strdup ("LAST_CROP_WIDTH");
 #line 213 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-			result = _tmp40_;
+			result = _tmp38_;
 #line 213 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1144 "ConfigurationInterfaces.c"
+#line 1209 "ConfigurationInterfaces.c"
 		}
-#line 91 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-		case CONFIGURABLE_PROPERTY_PHOTO_THUMBNAIL_SCALE:
-#line 1148 "ConfigurationInterfaces.c"
+#line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		case CONFIGURABLE_PROPERTY_LAST_USED_SERVICE:
+#line 1213 "ConfigurationInterfaces.c"
 		{
-			gchar* _tmp41_ = NULL;
+			gchar* _tmp39_ = NULL;
 #line 216 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-			_tmp41_ = g_strdup ("PHOTO_THUMBNAIL_SCALE");
+			_tmp39_ = g_strdup ("LAST_USED_SERVICE");
 #line 216 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-			result = _tmp41_;
+			result = _tmp39_;
 #line 216 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1157 "ConfigurationInterfaces.c"
+#line 1222 "ConfigurationInterfaces.c"
 		}
-#line 91 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-		case CONFIGURABLE_PROPERTY_PIN_TOOLBAR_STATE:
-#line 1161 "ConfigurationInterfaces.c"
+#line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		case CONFIGURABLE_PROPERTY_LAST_USED_DATAIMPORTS_SERVICE:
+#line 1226 "ConfigurationInterfaces.c"
 		{
-			gchar* _tmp42_ = NULL;
+			gchar* _tmp40_ = NULL;
 #line 219 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-			_tmp42_ = g_strdup ("PIN_TOOLBAR_STATE");
+			_tmp40_ = g_strdup ("LAST_USED_DATAIMPORTS_SERVICE");
 #line 219 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-			result = _tmp42_;
+			result = _tmp40_;
 #line 219 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1170 "ConfigurationInterfaces.c"
+#line 1235 "ConfigurationInterfaces.c"
 		}
-#line 91 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-		case CONFIGURABLE_PROPERTY_PRINTING_CONTENT_HEIGHT:
-#line 1174 "ConfigurationInterfaces.c"
+#line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		case CONFIGURABLE_PROPERTY_LIBRARY_PHOTOS_SORT_ASCENDING:
+#line 1239 "ConfigurationInterfaces.c"
 		{
-			gchar* _tmp43_ = NULL;
+			gchar* _tmp41_ = NULL;
 #line 222 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-			_tmp43_ = g_strdup ("PRINTING_CONTENT_HEIGHT");
+			_tmp41_ = g_strdup ("LIBRARY_PHOTOS_SORT_ASCENDING");
 #line 222 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-			result = _tmp43_;
+			result = _tmp41_;
 #line 222 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1183 "ConfigurationInterfaces.c"
+#line 1248 "ConfigurationInterfaces.c"
 		}
-#line 91 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-		case CONFIGURABLE_PROPERTY_PRINTING_CONTENT_LAYOUT:
-#line 1187 "ConfigurationInterfaces.c"
+#line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		case CONFIGURABLE_PROPERTY_LIBRARY_PHOTOS_SORT_BY:
+#line 1252 "ConfigurationInterfaces.c"
 		{
-			gchar* _tmp44_ = NULL;
+			gchar* _tmp42_ = NULL;
 #line 225 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-			_tmp44_ = g_strdup ("PRINTING_CONTENT_LAYOUT");
+			_tmp42_ = g_strdup ("LIBRARY_PHOTOS_SORT_BY");
 #line 225 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-			result = _tmp44_;
+			result = _tmp42_;
 #line 225 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1196 "ConfigurationInterfaces.c"
+#line 1261 "ConfigurationInterfaces.c"
 		}
-#line 91 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-		case CONFIGURABLE_PROPERTY_PRINTING_CONTENT_PPI:
-#line 1200 "ConfigurationInterfaces.c"
+#line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		case CONFIGURABLE_PROPERTY_LIBRARY_WINDOW_HEIGHT:
+#line 1265 "ConfigurationInterfaces.c"
 		{
-			gchar* _tmp45_ = NULL;
+			gchar* _tmp43_ = NULL;
 #line 228 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-			_tmp45_ = g_strdup ("PRINTING_CONTENT_PPI");
+			_tmp43_ = g_strdup ("LIBRARY_WINDOW_HEIGHT");
 #line 228 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-			result = _tmp45_;
+			result = _tmp43_;
 #line 228 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1209 "ConfigurationInterfaces.c"
+#line 1274 "ConfigurationInterfaces.c"
 		}
-#line 91 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-		case CONFIGURABLE_PROPERTY_PRINTING_CONTENT_UNITS:
-#line 1213 "ConfigurationInterfaces.c"
+#line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		case CONFIGURABLE_PROPERTY_LIBRARY_WINDOW_MAXIMIZE:
+#line 1278 "ConfigurationInterfaces.c"
 		{
-			gchar* _tmp46_ = NULL;
+			gchar* _tmp44_ = NULL;
 #line 231 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-			_tmp46_ = g_strdup ("PRINTING_CONTENT_UNITS");
+			_tmp44_ = g_strdup ("LIBRARY_WINDOW_MAXIMIZE");
 #line 231 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-			result = _tmp46_;
+			result = _tmp44_;
 #line 231 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1222 "ConfigurationInterfaces.c"
+#line 1287 "ConfigurationInterfaces.c"
 		}
-#line 91 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-		case CONFIGURABLE_PROPERTY_PRINTING_CONTENT_WIDTH:
-#line 1226 "ConfigurationInterfaces.c"
+#line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		case CONFIGURABLE_PROPERTY_LIBRARY_WINDOW_WIDTH:
+#line 1291 "ConfigurationInterfaces.c"
 		{
-			gchar* _tmp47_ = NULL;
+			gchar* _tmp45_ = NULL;
 #line 234 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-			_tmp47_ = g_strdup ("PRINTING_CONTENT_WIDTH");
+			_tmp45_ = g_strdup ("LIBRARY_WINDOW_WIDTH");
 #line 234 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-			result = _tmp47_;
+			result = _tmp45_;
 #line 234 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1235 "ConfigurationInterfaces.c"
+#line 1300 "ConfigurationInterfaces.c"
 		}
-#line 91 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-		case CONFIGURABLE_PROPERTY_PRINTING_IMAGES_PER_PAGE:
-#line 1239 "ConfigurationInterfaces.c"
+#line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		case CONFIGURABLE_PROPERTY_MODIFY_ORIGINALS:
+#line 1304 "ConfigurationInterfaces.c"
 		{
-			gchar* _tmp48_ = NULL;
+			gchar* _tmp46_ = NULL;
 #line 237 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-			_tmp48_ = g_strdup ("PRINTING_IMAGES_PER_PAGE");
+			_tmp46_ = g_strdup ("MODIFY_ORIGINALS");
 #line 237 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-			result = _tmp48_;
+			result = _tmp46_;
 #line 237 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1248 "ConfigurationInterfaces.c"
+#line 1313 "ConfigurationInterfaces.c"
 		}
-#line 91 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-		case CONFIGURABLE_PROPERTY_PRINTING_MATCH_ASPECT_RATIO:
-#line 1252 "ConfigurationInterfaces.c"
+#line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		case CONFIGURABLE_PROPERTY_PHOTO_THUMBNAIL_SCALE:
+#line 1317 "ConfigurationInterfaces.c"
 		{
-			gchar* _tmp49_ = NULL;
+			gchar* _tmp47_ = NULL;
 #line 240 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-			_tmp49_ = g_strdup ("PRINTING_MATCH_ASPECT_RATIO");
+			_tmp47_ = g_strdup ("PHOTO_THUMBNAIL_SCALE");
 #line 240 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-			result = _tmp49_;
+			result = _tmp47_;
 #line 240 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1261 "ConfigurationInterfaces.c"
+#line 1326 "ConfigurationInterfaces.c"
 		}
-#line 91 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-		case CONFIGURABLE_PROPERTY_PRINTING_PRINT_TITLES:
-#line 1265 "ConfigurationInterfaces.c"
+#line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		case CONFIGURABLE_PROPERTY_PIN_TOOLBAR_STATE:
+#line 1330 "ConfigurationInterfaces.c"
 		{
-			gchar* _tmp50_ = NULL;
+			gchar* _tmp48_ = NULL;
 #line 243 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-			_tmp50_ = g_strdup ("PRINTING_PRINT_TITLES");
+			_tmp48_ = g_strdup ("PIN_TOOLBAR_STATE");
 #line 243 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-			result = _tmp50_;
+			result = _tmp48_;
 #line 243 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1274 "ConfigurationInterfaces.c"
+#line 1339 "ConfigurationInterfaces.c"
 		}
-#line 91 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-		case CONFIGURABLE_PROPERTY_PRINTING_SIZE_SELECTION:
-#line 1278 "ConfigurationInterfaces.c"
+#line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		case CONFIGURABLE_PROPERTY_PRINTING_CONTENT_HEIGHT:
+#line 1343 "ConfigurationInterfaces.c"
 		{
-			gchar* _tmp51_ = NULL;
+			gchar* _tmp49_ = NULL;
 #line 246 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-			_tmp51_ = g_strdup ("PRINTING_SIZE_SELECTION");
+			_tmp49_ = g_strdup ("PRINTING_CONTENT_HEIGHT");
 #line 246 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-			result = _tmp51_;
+			result = _tmp49_;
 #line 246 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1287 "ConfigurationInterfaces.c"
+#line 1352 "ConfigurationInterfaces.c"
 		}
-#line 91 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-		case CONFIGURABLE_PROPERTY_PRINTING_TITLES_FONT:
-#line 1291 "ConfigurationInterfaces.c"
+#line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		case CONFIGURABLE_PROPERTY_PRINTING_CONTENT_LAYOUT:
+#line 1356 "ConfigurationInterfaces.c"
 		{
-			gchar* _tmp52_ = NULL;
+			gchar* _tmp50_ = NULL;
 #line 249 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-			_tmp52_ = g_strdup ("PRINTING_TITLES_FONT");
+			_tmp50_ = g_strdup ("PRINTING_CONTENT_LAYOUT");
 #line 249 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-			result = _tmp52_;
+			result = _tmp50_;
 #line 249 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1300 "ConfigurationInterfaces.c"
+#line 1365 "ConfigurationInterfaces.c"
 		}
-#line 91 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-		case CONFIGURABLE_PROPERTY_RAW_DEVELOPER_DEFAULT:
-#line 1304 "ConfigurationInterfaces.c"
+#line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		case CONFIGURABLE_PROPERTY_PRINTING_CONTENT_PPI:
+#line 1369 "ConfigurationInterfaces.c"
 		{
-			gchar* _tmp53_ = NULL;
+			gchar* _tmp51_ = NULL;
 #line 252 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-			_tmp53_ = g_strdup ("RAW_DEVELOPER_DEFAULT");
+			_tmp51_ = g_strdup ("PRINTING_CONTENT_PPI");
 #line 252 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-			result = _tmp53_;
+			result = _tmp51_;
 #line 252 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1313 "ConfigurationInterfaces.c"
+#line 1378 "ConfigurationInterfaces.c"
 		}
-#line 91 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-		case CONFIGURABLE_PROPERTY_SHOW_WELCOME_DIALOG:
-#line 1317 "ConfigurationInterfaces.c"
+#line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		case CONFIGURABLE_PROPERTY_PRINTING_CONTENT_UNITS:
+#line 1382 "ConfigurationInterfaces.c"
 		{
-			gchar* _tmp54_ = NULL;
+			gchar* _tmp52_ = NULL;
 #line 255 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-			_tmp54_ = g_strdup ("SHOW_WELCOME_DIALOG");
+			_tmp52_ = g_strdup ("PRINTING_CONTENT_UNITS");
 #line 255 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-			result = _tmp54_;
+			result = _tmp52_;
 #line 255 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1326 "ConfigurationInterfaces.c"
+#line 1391 "ConfigurationInterfaces.c"
 		}
-#line 91 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-		case CONFIGURABLE_PROPERTY_SIDEBAR_POSITION:
-#line 1330 "ConfigurationInterfaces.c"
+#line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		case CONFIGURABLE_PROPERTY_PRINTING_CONTENT_WIDTH:
+#line 1395 "ConfigurationInterfaces.c"
 		{
-			gchar* _tmp55_ = NULL;
+			gchar* _tmp53_ = NULL;
 #line 258 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-			_tmp55_ = g_strdup ("SIDEBAR_POSITION");
+			_tmp53_ = g_strdup ("PRINTING_CONTENT_WIDTH");
 #line 258 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-			result = _tmp55_;
+			result = _tmp53_;
 #line 258 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1339 "ConfigurationInterfaces.c"
+#line 1404 "ConfigurationInterfaces.c"
 		}
-#line 91 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-		case CONFIGURABLE_PROPERTY_SLIDESHOW_DELAY:
-#line 1343 "ConfigurationInterfaces.c"
+#line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		case CONFIGURABLE_PROPERTY_PRINTING_IMAGES_PER_PAGE:
+#line 1408 "ConfigurationInterfaces.c"
 		{
-			gchar* _tmp56_ = NULL;
+			gchar* _tmp54_ = NULL;
 #line 261 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-			_tmp56_ = g_strdup ("SLIDESHOW_DELAY");
+			_tmp54_ = g_strdup ("PRINTING_IMAGES_PER_PAGE");
 #line 261 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-			result = _tmp56_;
+			result = _tmp54_;
 #line 261 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1352 "ConfigurationInterfaces.c"
+#line 1417 "ConfigurationInterfaces.c"
 		}
-#line 91 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-		case CONFIGURABLE_PROPERTY_SLIDESHOW_TRANSITION_DELAY:
-#line 1356 "ConfigurationInterfaces.c"
+#line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		case CONFIGURABLE_PROPERTY_PRINTING_MATCH_ASPECT_RATIO:
+#line 1421 "ConfigurationInterfaces.c"
 		{
-			gchar* _tmp57_ = NULL;
+			gchar* _tmp55_ = NULL;
 #line 264 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-			_tmp57_ = g_strdup ("SLIDESHOW_TRANSITION_DELAY");
+			_tmp55_ = g_strdup ("PRINTING_MATCH_ASPECT_RATIO");
 #line 264 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-			result = _tmp57_;
+			result = _tmp55_;
 #line 264 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1365 "ConfigurationInterfaces.c"
+#line 1430 "ConfigurationInterfaces.c"
 		}
-#line 91 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-		case CONFIGURABLE_PROPERTY_SLIDESHOW_TRANSITION_EFFECT_ID:
-#line 1369 "ConfigurationInterfaces.c"
+#line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		case CONFIGURABLE_PROPERTY_PRINTING_PRINT_TITLES:
+#line 1434 "ConfigurationInterfaces.c"
 		{
-			gchar* _tmp58_ = NULL;
+			gchar* _tmp56_ = NULL;
 #line 267 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-			_tmp58_ = g_strdup ("SLIDESHOW_TRANSITION_EFFECT_ID");
+			_tmp56_ = g_strdup ("PRINTING_PRINT_TITLES");
 #line 267 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-			result = _tmp58_;
+			result = _tmp56_;
 #line 267 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1378 "ConfigurationInterfaces.c"
+#line 1443 "ConfigurationInterfaces.c"
 		}
-#line 91 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-		case CONFIGURABLE_PROPERTY_SLIDESHOW_SHOW_TITLE:
-#line 1382 "ConfigurationInterfaces.c"
+#line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		case CONFIGURABLE_PROPERTY_PRINTING_SIZE_SELECTION:
+#line 1447 "ConfigurationInterfaces.c"
 		{
-			gchar* _tmp59_ = NULL;
+			gchar* _tmp57_ = NULL;
 #line 270 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-			_tmp59_ = g_strdup ("SLIDESHOW_SHOW_TITLE");
+			_tmp57_ = g_strdup ("PRINTING_SIZE_SELECTION");
 #line 270 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-			result = _tmp59_;
+			result = _tmp57_;
 #line 270 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1391 "ConfigurationInterfaces.c"
+#line 1456 "ConfigurationInterfaces.c"
 		}
-#line 91 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-		case CONFIGURABLE_PROPERTY_USE_24_HOUR_TIME:
-#line 1395 "ConfigurationInterfaces.c"
+#line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		case CONFIGURABLE_PROPERTY_PRINTING_TITLES_FONT:
+#line 1460 "ConfigurationInterfaces.c"
 		{
-			gchar* _tmp60_ = NULL;
+			gchar* _tmp58_ = NULL;
 #line 273 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-			_tmp60_ = g_strdup ("USE_24_HOUR_TIME");
+			_tmp58_ = g_strdup ("PRINTING_TITLES_FONT");
 #line 273 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-			result = _tmp60_;
+			result = _tmp58_;
 #line 273 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1404 "ConfigurationInterfaces.c"
+#line 1469 "ConfigurationInterfaces.c"
 		}
-#line 91 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-		case CONFIGURABLE_PROPERTY_USE_LOWERCASE_FILENAMES:
-#line 1408 "ConfigurationInterfaces.c"
+#line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		case CONFIGURABLE_PROPERTY_RAW_DEVELOPER_DEFAULT:
+#line 1473 "ConfigurationInterfaces.c"
 		{
-			gchar* _tmp61_ = NULL;
+			gchar* _tmp59_ = NULL;
 #line 276 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-			_tmp61_ = g_strdup ("USE_LOWERCASE_FILENAMES");
+			_tmp59_ = g_strdup ("RAW_DEVELOPER_DEFAULT");
 #line 276 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-			result = _tmp61_;
+			result = _tmp59_;
 #line 276 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1417 "ConfigurationInterfaces.c"
+#line 1482 "ConfigurationInterfaces.c"
 		}
-#line 91 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-		case CONFIGURABLE_PROPERTY_VIDEO_INTERPRETER_STATE_COOKIE:
-#line 1421 "ConfigurationInterfaces.c"
+#line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		case CONFIGURABLE_PROPERTY_SHOW_WELCOME_DIALOG:
+#line 1486 "ConfigurationInterfaces.c"
 		{
-			gchar* _tmp62_ = NULL;
+			gchar* _tmp60_ = NULL;
 #line 279 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-			_tmp62_ = g_strdup ("VIDEO_INTERPRETER_STATE_COOKIE");
+			_tmp60_ = g_strdup ("SHOW_WELCOME_DIALOG");
 #line 279 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-			result = _tmp62_;
+			result = _tmp60_;
 #line 279 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1430 "ConfigurationInterfaces.c"
+#line 1495 "ConfigurationInterfaces.c"
 		}
-		default:
+#line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		case CONFIGURABLE_PROPERTY_SIDEBAR_POSITION:
+#line 1499 "ConfigurationInterfaces.c"
 		{
+			gchar* _tmp61_ = NULL;
 #line 282 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-			g_error ("ConfigurationInterfaces.vala:282: unknown ConfigurableProperty enumera" \
+			_tmp61_ = g_strdup ("SIDEBAR_POSITION");
+#line 282 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+			result = _tmp61_;
+#line 282 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+			return result;
+#line 1508 "ConfigurationInterfaces.c"
+		}
+#line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		case CONFIGURABLE_PROPERTY_SLIDESHOW_DELAY:
+#line 1512 "ConfigurationInterfaces.c"
+		{
+			gchar* _tmp62_ = NULL;
+#line 285 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+			_tmp62_ = g_strdup ("SLIDESHOW_DELAY");
+#line 285 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+			result = _tmp62_;
+#line 285 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+			return result;
+#line 1521 "ConfigurationInterfaces.c"
+		}
+#line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		case CONFIGURABLE_PROPERTY_SLIDESHOW_TRANSITION_DELAY:
+#line 1525 "ConfigurationInterfaces.c"
+		{
+			gchar* _tmp63_ = NULL;
+#line 288 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+			_tmp63_ = g_strdup ("SLIDESHOW_TRANSITION_DELAY");
+#line 288 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+			result = _tmp63_;
+#line 288 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+			return result;
+#line 1534 "ConfigurationInterfaces.c"
+		}
+#line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		case CONFIGURABLE_PROPERTY_SLIDESHOW_TRANSITION_EFFECT_ID:
+#line 1538 "ConfigurationInterfaces.c"
+		{
+			gchar* _tmp64_ = NULL;
+#line 291 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+			_tmp64_ = g_strdup ("SLIDESHOW_TRANSITION_EFFECT_ID");
+#line 291 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+			result = _tmp64_;
+#line 291 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+			return result;
+#line 1547 "ConfigurationInterfaces.c"
+		}
+#line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		case CONFIGURABLE_PROPERTY_SLIDESHOW_SHOW_TITLE:
+#line 1551 "ConfigurationInterfaces.c"
+		{
+			gchar* _tmp65_ = NULL;
+#line 294 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+			_tmp65_ = g_strdup ("SLIDESHOW_SHOW_TITLE");
+#line 294 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+			result = _tmp65_;
+#line 294 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+			return result;
+#line 1560 "ConfigurationInterfaces.c"
+		}
+#line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		case CONFIGURABLE_PROPERTY_USE_24_HOUR_TIME:
+#line 1564 "ConfigurationInterfaces.c"
+		{
+			gchar* _tmp66_ = NULL;
+#line 297 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+			_tmp66_ = g_strdup ("USE_24_HOUR_TIME");
+#line 297 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+			result = _tmp66_;
+#line 297 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+			return result;
+#line 1573 "ConfigurationInterfaces.c"
+		}
+#line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		case CONFIGURABLE_PROPERTY_USE_LOWERCASE_FILENAMES:
+#line 1577 "ConfigurationInterfaces.c"
+		{
+			gchar* _tmp67_ = NULL;
+#line 300 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+			_tmp67_ = g_strdup ("USE_LOWERCASE_FILENAMES");
+#line 300 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+			result = _tmp67_;
+#line 300 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+			return result;
+#line 1586 "ConfigurationInterfaces.c"
+		}
+#line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		case CONFIGURABLE_PROPERTY_VIDEO_INTERPRETER_STATE_COOKIE:
+#line 1590 "ConfigurationInterfaces.c"
+		{
+			gchar* _tmp68_ = NULL;
+#line 303 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+			_tmp68_ = g_strdup ("VIDEO_INTERPRETER_STATE_COOKIE");
+#line 303 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+			result = _tmp68_;
+#line 303 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+			return result;
+#line 1599 "ConfigurationInterfaces.c"
+		}
+		default:
+		{
+#line 306 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+			g_error ("ConfigurationInterfaces.vala:306: unknown ConfigurableProperty enumera" \
 "tion value");
-#line 1436 "ConfigurationInterfaces.c"
+#line 1605 "ConfigurationInterfaces.c"
 		}
 	}
 }
@@ -1442,7 +1611,7 @@ gchar* configurable_property_to_string (ConfigurableProperty self) {
 GType configurable_property_get_type (void) {
 	static volatile gsize configurable_property_type_id__volatile = 0;
 	if (g_once_init_enter (&configurable_property_type_id__volatile)) {
-		static const GEnumValue values[] = {{CONFIGURABLE_PROPERTY_AUTO_IMPORT_FROM_LIBRARY, "CONFIGURABLE_PROPERTY_AUTO_IMPORT_FROM_LIBRARY", "auto-import-from-library"}, {CONFIGURABLE_PROPERTY_BG_COLOR_NAME, "CONFIGURABLE_PROPERTY_BG_COLOR_NAME", "bg-color-name"}, {CONFIGURABLE_PROPERTY_COMMIT_METADATA_TO_MASTERS, "CONFIGURABLE_PROPERTY_COMMIT_METADATA_TO_MASTERS", "commit-metadata-to-masters"}, {CONFIGURABLE_PROPERTY_DESKTOP_BACKGROUND_FILE, "CONFIGURABLE_PROPERTY_DESKTOP_BACKGROUND_FILE", "desktop-background-file"}, {CONFIGURABLE_PROPERTY_DESKTOP_BACKGROUND_MODE, "CONFIGURABLE_PROPERTY_DESKTOP_BACKGROUND_MODE", "desktop-background-mode"}, {CONFIGURABLE_PROPERTY_SCREENSAVER_FILE, "CONFIGURABLE_PROPERTY_SCREENSAVER_FILE", "screensaver-file"}, {CONFIGURABLE_PROPERTY_SCREENSAVER_MODE, "CONFIGURABLE_PROPERTY_SCREENSAVER_MODE", "screensaver-mode"}, {CONFIGURABLE_PROPERTY_DIRECTORY_PATTERN, "CONFIGURABLE_PROPERTY_DIRECTORY_PATTERN", "directory-pattern"}, {CONFIGURABLE_PROPERTY_DIRECTORY_PATTERN_CUSTOM, "CONFIGURABLE_PROPERTY_DIRECTORY_PATTERN_CUSTOM", "directory-pattern-custom"}, {CONFIGURABLE_PROPERTY_DIRECT_WINDOW_HEIGHT, "CONFIGURABLE_PROPERTY_DIRECT_WINDOW_HEIGHT", "direct-window-height"}, {CONFIGURABLE_PROPERTY_DIRECT_WINDOW_MAXIMIZE, "CONFIGURABLE_PROPERTY_DIRECT_WINDOW_MAXIMIZE", "direct-window-maximize"}, {CONFIGURABLE_PROPERTY_DIRECT_WINDOW_WIDTH, "CONFIGURABLE_PROPERTY_DIRECT_WINDOW_WIDTH", "direct-window-width"}, {CONFIGURABLE_PROPERTY_DISPLAY_BASIC_PROPERTIES, "CONFIGURABLE_PROPERTY_DISPLAY_BASIC_PROPERTIES", "display-basic-properties"}, {CONFIGURABLE_PROPERTY_DISPLAY_EVENT_COMMENTS, "CONFIGURABLE_PROPERTY_DISPLAY_EVENT_COMMENTS", "display-event-comments"}, {CONFIGURABLE_PROPERTY_DISPLAY_EXTENDED_PROPERTIES, "CONFIGURABLE_PROPERTY_DISPLAY_EXTENDED_PROPERTIES", "display-extended-properties"}, {CONFIGURABLE_PROPERTY_DISPLAY_SIDEBAR, "CONFIGURABLE_PROPERTY_DISPLAY_SIDEBAR", "display-sidebar"}, {CONFIGURABLE_PROPERTY_DISPLAY_TOOLBAR, "CONFIGURABLE_PROPERTY_DISPLAY_TOOLBAR", "display-toolbar"}, {CONFIGURABLE_PROPERTY_DISPLAY_SEARCH_BAR, "CONFIGURABLE_PROPERTY_DISPLAY_SEARCH_BAR", "display-search-bar"}, {CONFIGURABLE_PROPERTY_DISPLAY_PHOTO_RATINGS, "CONFIGURABLE_PROPERTY_DISPLAY_PHOTO_RATINGS", "display-photo-ratings"}, {CONFIGURABLE_PROPERTY_DISPLAY_PHOTO_TAGS, "CONFIGURABLE_PROPERTY_DISPLAY_PHOTO_TAGS", "display-photo-tags"}, {CONFIGURABLE_PROPERTY_DISPLAY_PHOTO_TITLES, "CONFIGURABLE_PROPERTY_DISPLAY_PHOTO_TITLES", "display-photo-titles"}, {CONFIGURABLE_PROPERTY_DISPLAY_PHOTO_COMMENTS, "CONFIGURABLE_PROPERTY_DISPLAY_PHOTO_COMMENTS", "display-photo-comments"}, {CONFIGURABLE_PROPERTY_EVENT_PHOTOS_SORT_ASCENDING, "CONFIGURABLE_PROPERTY_EVENT_PHOTOS_SORT_ASCENDING", "event-photos-sort-ascending"}, {CONFIGURABLE_PROPERTY_EVENT_PHOTOS_SORT_BY, "CONFIGURABLE_PROPERTY_EVENT_PHOTOS_SORT_BY", "event-photos-sort-by"}, {CONFIGURABLE_PROPERTY_EVENTS_SORT_ASCENDING, "CONFIGURABLE_PROPERTY_EVENTS_SORT_ASCENDING", "events-sort-ascending"}, {CONFIGURABLE_PROPERTY_EXTERNAL_PHOTO_APP, "CONFIGURABLE_PROPERTY_EXTERNAL_PHOTO_APP", "external-photo-app"}, {CONFIGURABLE_PROPERTY_EXTERNAL_RAW_APP, "CONFIGURABLE_PROPERTY_EXTERNAL_RAW_APP", "external-raw-app"}, {CONFIGURABLE_PROPERTY_HIDE_PHOTOS_ALREADY_IMPORTED, "CONFIGURABLE_PROPERTY_HIDE_PHOTOS_ALREADY_IMPORTED", "hide-photos-already-imported"}, {CONFIGURABLE_PROPERTY_IMPORT_DIR, "CONFIGURABLE_PROPERTY_IMPORT_DIR", "import-dir"}, {CONFIGURABLE_PROPERTY_KEEP_RELATIVITY, "CONFIGURABLE_PROPERTY_KEEP_RELATIVITY", "keep-relativity"}, {CONFIGURABLE_PROPERTY_LAST_CROP_HEIGHT, "CONFIGURABLE_PROPERTY_LAST_CROP_HEIGHT", "last-crop-height"}, {CONFIGURABLE_PROPERTY_LAST_CROP_MENU_CHOICE, "CONFIGURABLE_PROPERTY_LAST_CROP_MENU_CHOICE", "last-crop-menu-choice"}, {CONFIGURABLE_PROPERTY_LAST_CROP_WIDTH, "CONFIGURABLE_PROPERTY_LAST_CROP_WIDTH", "last-crop-width"}, {CONFIGURABLE_PROPERTY_LAST_USED_SERVICE, "CONFIGURABLE_PROPERTY_LAST_USED_SERVICE", "last-used-service"}, {CONFIGURABLE_PROPERTY_LAST_USED_DATAIMPORTS_SERVICE, "CONFIGURABLE_PROPERTY_LAST_USED_DATAIMPORTS_SERVICE", "last-used-dataimports-service"}, {CONFIGURABLE_PROPERTY_LIBRARY_PHOTOS_SORT_ASCENDING, "CONFIGURABLE_PROPERTY_LIBRARY_PHOTOS_SORT_ASCENDING", "library-photos-sort-ascending"}, {CONFIGURABLE_PROPERTY_LIBRARY_PHOTOS_SORT_BY, "CONFIGURABLE_PROPERTY_LIBRARY_PHOTOS_SORT_BY", "library-photos-sort-by"}, {CONFIGURABLE_PROPERTY_LIBRARY_WINDOW_HEIGHT, "CONFIGURABLE_PROPERTY_LIBRARY_WINDOW_HEIGHT", "library-window-height"}, {CONFIGURABLE_PROPERTY_LIBRARY_WINDOW_MAXIMIZE, "CONFIGURABLE_PROPERTY_LIBRARY_WINDOW_MAXIMIZE", "library-window-maximize"}, {CONFIGURABLE_PROPERTY_LIBRARY_WINDOW_WIDTH, "CONFIGURABLE_PROPERTY_LIBRARY_WINDOW_WIDTH", "library-window-width"}, {CONFIGURABLE_PROPERTY_MODIFY_ORIGINALS, "CONFIGURABLE_PROPERTY_MODIFY_ORIGINALS", "modify-originals"}, {CONFIGURABLE_PROPERTY_PHOTO_THUMBNAIL_SCALE, "CONFIGURABLE_PROPERTY_PHOTO_THUMBNAIL_SCALE", "photo-thumbnail-scale"}, {CONFIGURABLE_PROPERTY_PIN_TOOLBAR_STATE, "CONFIGURABLE_PROPERTY_PIN_TOOLBAR_STATE", "pin-toolbar-state"}, {CONFIGURABLE_PROPERTY_PRINTING_CONTENT_HEIGHT, "CONFIGURABLE_PROPERTY_PRINTING_CONTENT_HEIGHT", "printing-content-height"}, {CONFIGURABLE_PROPERTY_PRINTING_CONTENT_LAYOUT, "CONFIGURABLE_PROPERTY_PRINTING_CONTENT_LAYOUT", "printing-content-layout"}, {CONFIGURABLE_PROPERTY_PRINTING_CONTENT_PPI, "CONFIGURABLE_PROPERTY_PRINTING_CONTENT_PPI", "printing-content-ppi"}, {CONFIGURABLE_PROPERTY_PRINTING_CONTENT_UNITS, "CONFIGURABLE_PROPERTY_PRINTING_CONTENT_UNITS", "printing-content-units"}, {CONFIGURABLE_PROPERTY_PRINTING_CONTENT_WIDTH, "CONFIGURABLE_PROPERTY_PRINTING_CONTENT_WIDTH", "printing-content-width"}, {CONFIGURABLE_PROPERTY_PRINTING_IMAGES_PER_PAGE, "CONFIGURABLE_PROPERTY_PRINTING_IMAGES_PER_PAGE", "printing-images-per-page"}, {CONFIGURABLE_PROPERTY_PRINTING_MATCH_ASPECT_RATIO, "CONFIGURABLE_PROPERTY_PRINTING_MATCH_ASPECT_RATIO", "printing-match-aspect-ratio"}, {CONFIGURABLE_PROPERTY_PRINTING_PRINT_TITLES, "CONFIGURABLE_PROPERTY_PRINTING_PRINT_TITLES", "printing-print-titles"}, {CONFIGURABLE_PROPERTY_PRINTING_SIZE_SELECTION, "CONFIGURABLE_PROPERTY_PRINTING_SIZE_SELECTION", "printing-size-selection"}, {CONFIGURABLE_PROPERTY_PRINTING_TITLES_FONT, "CONFIGURABLE_PROPERTY_PRINTING_TITLES_FONT", "printing-titles-font"}, {CONFIGURABLE_PROPERTY_RAW_DEVELOPER_DEFAULT, "CONFIGURABLE_PROPERTY_RAW_DEVELOPER_DEFAULT", "raw-developer-default"}, {CONFIGURABLE_PROPERTY_SHOW_WELCOME_DIALOG, "CONFIGURABLE_PROPERTY_SHOW_WELCOME_DIALOG", "show-welcome-dialog"}, {CONFIGURABLE_PROPERTY_SIDEBAR_POSITION, "CONFIGURABLE_PROPERTY_SIDEBAR_POSITION", "sidebar-position"}, {CONFIGURABLE_PROPERTY_SLIDESHOW_DELAY, "CONFIGURABLE_PROPERTY_SLIDESHOW_DELAY", "slideshow-delay"}, {CONFIGURABLE_PROPERTY_SLIDESHOW_TRANSITION_DELAY, "CONFIGURABLE_PROPERTY_SLIDESHOW_TRANSITION_DELAY", "slideshow-transition-delay"}, {CONFIGURABLE_PROPERTY_SLIDESHOW_TRANSITION_EFFECT_ID, "CONFIGURABLE_PROPERTY_SLIDESHOW_TRANSITION_EFFECT_ID", "slideshow-transition-effect-id"}, {CONFIGURABLE_PROPERTY_SLIDESHOW_SHOW_TITLE, "CONFIGURABLE_PROPERTY_SLIDESHOW_SHOW_TITLE", "slideshow-show-title"}, {CONFIGURABLE_PROPERTY_USE_24_HOUR_TIME, "CONFIGURABLE_PROPERTY_USE_24_HOUR_TIME", "use-24-hour-time"}, {CONFIGURABLE_PROPERTY_USE_LOWERCASE_FILENAMES, "CONFIGURABLE_PROPERTY_USE_LOWERCASE_FILENAMES", "use-lowercase-filenames"}, {CONFIGURABLE_PROPERTY_VIDEO_INTERPRETER_STATE_COOKIE, "CONFIGURABLE_PROPERTY_VIDEO_INTERPRETER_STATE_COOKIE", "video-interpreter-state-cookie"}, {CONFIGURABLE_PROPERTY_NUM_PROPERTIES, "CONFIGURABLE_PROPERTY_NUM_PROPERTIES", "num-properties"}, {0, NULL, NULL}};
+		static const GEnumValue values[] = {{CONFIGURABLE_PROPERTY_AUTO_IMPORT_FROM_LIBRARY, "CONFIGURABLE_PROPERTY_AUTO_IMPORT_FROM_LIBRARY", "auto-import-from-library"}, {CONFIGURABLE_PROPERTY_BG_COLOR_NAME, "CONFIGURABLE_PROPERTY_BG_COLOR_NAME", "bg-color-name"}, {CONFIGURABLE_PROPERTY_COMMIT_METADATA_TO_MASTERS, "CONFIGURABLE_PROPERTY_COMMIT_METADATA_TO_MASTERS", "commit-metadata-to-masters"}, {CONFIGURABLE_PROPERTY_DESKTOP_BACKGROUND_FILE, "CONFIGURABLE_PROPERTY_DESKTOP_BACKGROUND_FILE", "desktop-background-file"}, {CONFIGURABLE_PROPERTY_DESKTOP_BACKGROUND_MODE, "CONFIGURABLE_PROPERTY_DESKTOP_BACKGROUND_MODE", "desktop-background-mode"}, {CONFIGURABLE_PROPERTY_SCREENSAVER_FILE, "CONFIGURABLE_PROPERTY_SCREENSAVER_FILE", "screensaver-file"}, {CONFIGURABLE_PROPERTY_SCREENSAVER_MODE, "CONFIGURABLE_PROPERTY_SCREENSAVER_MODE", "screensaver-mode"}, {CONFIGURABLE_PROPERTY_DIRECTORY_PATTERN, "CONFIGURABLE_PROPERTY_DIRECTORY_PATTERN", "directory-pattern"}, {CONFIGURABLE_PROPERTY_DIRECTORY_PATTERN_CUSTOM, "CONFIGURABLE_PROPERTY_DIRECTORY_PATTERN_CUSTOM", "directory-pattern-custom"}, {CONFIGURABLE_PROPERTY_DIRECT_WINDOW_HEIGHT, "CONFIGURABLE_PROPERTY_DIRECT_WINDOW_HEIGHT", "direct-window-height"}, {CONFIGURABLE_PROPERTY_DIRECT_WINDOW_MAXIMIZE, "CONFIGURABLE_PROPERTY_DIRECT_WINDOW_MAXIMIZE", "direct-window-maximize"}, {CONFIGURABLE_PROPERTY_DIRECT_WINDOW_WIDTH, "CONFIGURABLE_PROPERTY_DIRECT_WINDOW_WIDTH", "direct-window-width"}, {CONFIGURABLE_PROPERTY_DISPLAY_BASIC_PROPERTIES, "CONFIGURABLE_PROPERTY_DISPLAY_BASIC_PROPERTIES", "display-basic-properties"}, {CONFIGURABLE_PROPERTY_DISPLAY_EVENT_COMMENTS, "CONFIGURABLE_PROPERTY_DISPLAY_EVENT_COMMENTS", "display-event-comments"}, {CONFIGURABLE_PROPERTY_DISPLAY_EXTENDED_PROPERTIES, "CONFIGURABLE_PROPERTY_DISPLAY_EXTENDED_PROPERTIES", "display-extended-properties"}, {CONFIGURABLE_PROPERTY_DISPLAY_SIDEBAR, "CONFIGURABLE_PROPERTY_DISPLAY_SIDEBAR", "display-sidebar"}, {CONFIGURABLE_PROPERTY_DISPLAY_TOOLBAR, "CONFIGURABLE_PROPERTY_DISPLAY_TOOLBAR", "display-toolbar"}, {CONFIGURABLE_PROPERTY_DISPLAY_SEARCH_BAR, "CONFIGURABLE_PROPERTY_DISPLAY_SEARCH_BAR", "display-search-bar"}, {CONFIGURABLE_PROPERTY_DISPLAY_PHOTO_RATINGS, "CONFIGURABLE_PROPERTY_DISPLAY_PHOTO_RATINGS", "display-photo-ratings"}, {CONFIGURABLE_PROPERTY_DISPLAY_PHOTO_TAGS, "CONFIGURABLE_PROPERTY_DISPLAY_PHOTO_TAGS", "display-photo-tags"}, {CONFIGURABLE_PROPERTY_DISPLAY_PHOTO_TITLES, "CONFIGURABLE_PROPERTY_DISPLAY_PHOTO_TITLES", "display-photo-titles"}, {CONFIGURABLE_PROPERTY_DISPLAY_PHOTO_COMMENTS, "CONFIGURABLE_PROPERTY_DISPLAY_PHOTO_COMMENTS", "display-photo-comments"}, {CONFIGURABLE_PROPERTY_EVENT_PHOTOS_SORT_ASCENDING, "CONFIGURABLE_PROPERTY_EVENT_PHOTOS_SORT_ASCENDING", "event-photos-sort-ascending"}, {CONFIGURABLE_PROPERTY_EVENT_PHOTOS_SORT_BY, "CONFIGURABLE_PROPERTY_EVENT_PHOTOS_SORT_BY", "event-photos-sort-by"}, {CONFIGURABLE_PROPERTY_EVENTS_SORT_ASCENDING, "CONFIGURABLE_PROPERTY_EVENTS_SORT_ASCENDING", "events-sort-ascending"}, {CONFIGURABLE_PROPERTY_EXPORT_CONSTRAINT, "CONFIGURABLE_PROPERTY_EXPORT_CONSTRAINT", "export-constraint"}, {CONFIGURABLE_PROPERTY_EXPORT_EXPORT_FORMAT_MODE, "CONFIGURABLE_PROPERTY_EXPORT_EXPORT_FORMAT_MODE", "export-export-format-mode"}, {CONFIGURABLE_PROPERTY_EXPORT_EXPORT_METADATA, "CONFIGURABLE_PROPERTY_EXPORT_EXPORT_METADATA", "export-export-metadata"}, {CONFIGURABLE_PROPERTY_EXPORT_PHOTO_FILE_FORMAT, "CONFIGURABLE_PROPERTY_EXPORT_PHOTO_FILE_FORMAT", "export-photo-file-format"}, {CONFIGURABLE_PROPERTY_EXPORT_QUALITY, "CONFIGURABLE_PROPERTY_EXPORT_QUALITY", "export-quality"}, {CONFIGURABLE_PROPERTY_EXPORT_SCALE, "CONFIGURABLE_PROPERTY_EXPORT_SCALE", "export-scale"}, {CONFIGURABLE_PROPERTY_EXTERNAL_PHOTO_APP, "CONFIGURABLE_PROPERTY_EXTERNAL_PHOTO_APP", "external-photo-app"}, {CONFIGURABLE_PROPERTY_EXTERNAL_RAW_APP, "CONFIGURABLE_PROPERTY_EXTERNAL_RAW_APP", "external-raw-app"}, {CONFIGURABLE_PROPERTY_HIDE_PHOTOS_ALREADY_IMPORTED, "CONFIGURABLE_PROPERTY_HIDE_PHOTOS_ALREADY_IMPORTED", "hide-photos-already-imported"}, {CONFIGURABLE_PROPERTY_IMPORT_DIR, "CONFIGURABLE_PROPERTY_IMPORT_DIR", "import-dir"}, {CONFIGURABLE_PROPERTY_KEEP_RELATIVITY, "CONFIGURABLE_PROPERTY_KEEP_RELATIVITY", "keep-relativity"}, {CONFIGURABLE_PROPERTY_LAST_CROP_HEIGHT, "CONFIGURABLE_PROPERTY_LAST_CROP_HEIGHT", "last-crop-height"}, {CONFIGURABLE_PROPERTY_LAST_CROP_MENU_CHOICE, "CONFIGURABLE_PROPERTY_LAST_CROP_MENU_CHOICE", "last-crop-menu-choice"}, {CONFIGURABLE_PROPERTY_LAST_CROP_WIDTH, "CONFIGURABLE_PROPERTY_LAST_CROP_WIDTH", "last-crop-width"}, {CONFIGURABLE_PROPERTY_LAST_USED_SERVICE, "CONFIGURABLE_PROPERTY_LAST_USED_SERVICE", "last-used-service"}, {CONFIGURABLE_PROPERTY_LAST_USED_DATAIMPORTS_SERVICE, "CONFIGURABLE_PROPERTY_LAST_USED_DATAIMPORTS_SERVICE", "last-used-dataimports-service"}, {CONFIGURABLE_PROPERTY_LIBRARY_PHOTOS_SORT_ASCENDING, "CONFIGURABLE_PROPERTY_LIBRARY_PHOTOS_SORT_ASCENDING", "library-photos-sort-ascending"}, {CONFIGURABLE_PROPERTY_LIBRARY_PHOTOS_SORT_BY, "CONFIGURABLE_PROPERTY_LIBRARY_PHOTOS_SORT_BY", "library-photos-sort-by"}, {CONFIGURABLE_PROPERTY_LIBRARY_WINDOW_HEIGHT, "CONFIGURABLE_PROPERTY_LIBRARY_WINDOW_HEIGHT", "library-window-height"}, {CONFIGURABLE_PROPERTY_LIBRARY_WINDOW_MAXIMIZE, "CONFIGURABLE_PROPERTY_LIBRARY_WINDOW_MAXIMIZE", "library-window-maximize"}, {CONFIGURABLE_PROPERTY_LIBRARY_WINDOW_WIDTH, "CONFIGURABLE_PROPERTY_LIBRARY_WINDOW_WIDTH", "library-window-width"}, {CONFIGURABLE_PROPERTY_MODIFY_ORIGINALS, "CONFIGURABLE_PROPERTY_MODIFY_ORIGINALS", "modify-originals"}, {CONFIGURABLE_PROPERTY_PHOTO_THUMBNAIL_SCALE, "CONFIGURABLE_PROPERTY_PHOTO_THUMBNAIL_SCALE", "photo-thumbnail-scale"}, {CONFIGURABLE_PROPERTY_PIN_TOOLBAR_STATE, "CONFIGURABLE_PROPERTY_PIN_TOOLBAR_STATE", "pin-toolbar-state"}, {CONFIGURABLE_PROPERTY_PRINTING_CONTENT_HEIGHT, "CONFIGURABLE_PROPERTY_PRINTING_CONTENT_HEIGHT", "printing-content-height"}, {CONFIGURABLE_PROPERTY_PRINTING_CONTENT_LAYOUT, "CONFIGURABLE_PROPERTY_PRINTING_CONTENT_LAYOUT", "printing-content-layout"}, {CONFIGURABLE_PROPERTY_PRINTING_CONTENT_PPI, "CONFIGURABLE_PROPERTY_PRINTING_CONTENT_PPI", "printing-content-ppi"}, {CONFIGURABLE_PROPERTY_PRINTING_CONTENT_UNITS, "CONFIGURABLE_PROPERTY_PRINTING_CONTENT_UNITS", "printing-content-units"}, {CONFIGURABLE_PROPERTY_PRINTING_CONTENT_WIDTH, "CONFIGURABLE_PROPERTY_PRINTING_CONTENT_WIDTH", "printing-content-width"}, {CONFIGURABLE_PROPERTY_PRINTING_IMAGES_PER_PAGE, "CONFIGURABLE_PROPERTY_PRINTING_IMAGES_PER_PAGE", "printing-images-per-page"}, {CONFIGURABLE_PROPERTY_PRINTING_MATCH_ASPECT_RATIO, "CONFIGURABLE_PROPERTY_PRINTING_MATCH_ASPECT_RATIO", "printing-match-aspect-ratio"}, {CONFIGURABLE_PROPERTY_PRINTING_PRINT_TITLES, "CONFIGURABLE_PROPERTY_PRINTING_PRINT_TITLES", "printing-print-titles"}, {CONFIGURABLE_PROPERTY_PRINTING_SIZE_SELECTION, "CONFIGURABLE_PROPERTY_PRINTING_SIZE_SELECTION", "printing-size-selection"}, {CONFIGURABLE_PROPERTY_PRINTING_TITLES_FONT, "CONFIGURABLE_PROPERTY_PRINTING_TITLES_FONT", "printing-titles-font"}, {CONFIGURABLE_PROPERTY_RAW_DEVELOPER_DEFAULT, "CONFIGURABLE_PROPERTY_RAW_DEVELOPER_DEFAULT", "raw-developer-default"}, {CONFIGURABLE_PROPERTY_SHOW_WELCOME_DIALOG, "CONFIGURABLE_PROPERTY_SHOW_WELCOME_DIALOG", "show-welcome-dialog"}, {CONFIGURABLE_PROPERTY_SIDEBAR_POSITION, "CONFIGURABLE_PROPERTY_SIDEBAR_POSITION", "sidebar-position"}, {CONFIGURABLE_PROPERTY_SLIDESHOW_DELAY, "CONFIGURABLE_PROPERTY_SLIDESHOW_DELAY", "slideshow-delay"}, {CONFIGURABLE_PROPERTY_SLIDESHOW_TRANSITION_DELAY, "CONFIGURABLE_PROPERTY_SLIDESHOW_TRANSITION_DELAY", "slideshow-transition-delay"}, {CONFIGURABLE_PROPERTY_SLIDESHOW_TRANSITION_EFFECT_ID, "CONFIGURABLE_PROPERTY_SLIDESHOW_TRANSITION_EFFECT_ID", "slideshow-transition-effect-id"}, {CONFIGURABLE_PROPERTY_SLIDESHOW_SHOW_TITLE, "CONFIGURABLE_PROPERTY_SLIDESHOW_SHOW_TITLE", "slideshow-show-title"}, {CONFIGURABLE_PROPERTY_USE_24_HOUR_TIME, "CONFIGURABLE_PROPERTY_USE_24_HOUR_TIME", "use-24-hour-time"}, {CONFIGURABLE_PROPERTY_USE_LOWERCASE_FILENAMES, "CONFIGURABLE_PROPERTY_USE_LOWERCASE_FILENAMES", "use-lowercase-filenames"}, {CONFIGURABLE_PROPERTY_VIDEO_INTERPRETER_STATE_COOKIE, "CONFIGURABLE_PROPERTY_VIDEO_INTERPRETER_STATE_COOKIE", "video-interpreter-state-cookie"}, {CONFIGURABLE_PROPERTY_NUM_PROPERTIES, "CONFIGURABLE_PROPERTY_NUM_PROPERTIES", "num-properties"}, {0, NULL, NULL}};
 		GType configurable_property_type_id;
 		configurable_property_type_id = g_enum_register_static ("ConfigurableProperty", values);
 		g_once_init_leave (&configurable_property_type_id__volatile, configurable_property_type_id);
@@ -1452,195 +1621,213 @@ GType configurable_property_get_type (void) {
 
 
 gchar* configuration_engine_get_name (ConfigurationEngine* self) {
-#line 290 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 314 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (IS_CONFIGURATION_ENGINE (self), NULL);
-#line 290 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 314 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_ENGINE_GET_INTERFACE (self)->get_name (self);
-#line 1459 "ConfigurationInterfaces.c"
+#line 1628 "ConfigurationInterfaces.c"
 }
 
 
 gint configuration_engine_get_int_property (ConfigurationEngine* self, ConfigurableProperty p, GError** error) {
-#line 292 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 316 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (IS_CONFIGURATION_ENGINE (self), 0);
-#line 292 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 316 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_ENGINE_GET_INTERFACE (self)->get_int_property (self, p, error);
-#line 1468 "ConfigurationInterfaces.c"
+#line 1637 "ConfigurationInterfaces.c"
 }
 
 
 void configuration_engine_set_int_property (ConfigurationEngine* self, ConfigurableProperty p, gint val, GError** error) {
-#line 293 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 317 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (IS_CONFIGURATION_ENGINE (self));
-#line 293 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 317 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_ENGINE_GET_INTERFACE (self)->set_int_property (self, p, val, error);
-#line 1477 "ConfigurationInterfaces.c"
+#line 1646 "ConfigurationInterfaces.c"
+}
+
+
+gint configuration_engine_get_enum_property (ConfigurationEngine* self, ConfigurableProperty p, GError** error) {
+#line 319 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	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"
+}
+
+
+void configuration_engine_set_enum_property (ConfigurationEngine* self, ConfigurableProperty p, gint val, GError** error) {
+#line 320 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	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"
 }
 
 
 gchar* configuration_engine_get_string_property (ConfigurationEngine* self, ConfigurableProperty p, GError** error) {
-#line 295 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 322 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (IS_CONFIGURATION_ENGINE (self), NULL);
-#line 295 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 322 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_ENGINE_GET_INTERFACE (self)->get_string_property (self, p, error);
-#line 1486 "ConfigurationInterfaces.c"
+#line 1673 "ConfigurationInterfaces.c"
 }
 
 
 void configuration_engine_set_string_property (ConfigurationEngine* self, ConfigurableProperty p, const gchar* val, GError** error) {
-#line 296 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 323 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (IS_CONFIGURATION_ENGINE (self));
-#line 296 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 323 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_ENGINE_GET_INTERFACE (self)->set_string_property (self, p, val, error);
-#line 1495 "ConfigurationInterfaces.c"
+#line 1682 "ConfigurationInterfaces.c"
 }
 
 
 gboolean configuration_engine_get_bool_property (ConfigurationEngine* self, ConfigurableProperty p, GError** error) {
-#line 298 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 325 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (IS_CONFIGURATION_ENGINE (self), FALSE);
-#line 298 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 325 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_ENGINE_GET_INTERFACE (self)->get_bool_property (self, p, error);
-#line 1504 "ConfigurationInterfaces.c"
+#line 1691 "ConfigurationInterfaces.c"
 }
 
 
 void configuration_engine_set_bool_property (ConfigurationEngine* self, ConfigurableProperty p, gboolean val, GError** error) {
-#line 299 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 326 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (IS_CONFIGURATION_ENGINE (self));
-#line 299 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 326 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_ENGINE_GET_INTERFACE (self)->set_bool_property (self, p, val, error);
-#line 1513 "ConfigurationInterfaces.c"
+#line 1700 "ConfigurationInterfaces.c"
 }
 
 
 gdouble configuration_engine_get_double_property (ConfigurationEngine* self, ConfigurableProperty p, GError** error) {
-#line 301 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 328 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (IS_CONFIGURATION_ENGINE (self), 0.0);
-#line 301 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 328 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_ENGINE_GET_INTERFACE (self)->get_double_property (self, p, error);
-#line 1522 "ConfigurationInterfaces.c"
+#line 1709 "ConfigurationInterfaces.c"
 }
 
 
 void configuration_engine_set_double_property (ConfigurationEngine* self, ConfigurableProperty p, gdouble val, GError** error) {
-#line 302 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 329 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (IS_CONFIGURATION_ENGINE (self));
-#line 302 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 329 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_ENGINE_GET_INTERFACE (self)->set_double_property (self, p, val, error);
-#line 1531 "ConfigurationInterfaces.c"
+#line 1718 "ConfigurationInterfaces.c"
 }
 
 
 gboolean configuration_engine_get_plugin_bool (ConfigurationEngine* self, const gchar* domain, const gchar* id, const gchar* key, gboolean def) {
-#line 304 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 331 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (IS_CONFIGURATION_ENGINE (self), FALSE);
-#line 304 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#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 1540 "ConfigurationInterfaces.c"
+#line 1727 "ConfigurationInterfaces.c"
 }
 
 
 void configuration_engine_set_plugin_bool (ConfigurationEngine* self, const gchar* domain, const gchar* id, const gchar* key, gboolean val) {
-#line 305 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 332 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (IS_CONFIGURATION_ENGINE (self));
-#line 305 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 332 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_ENGINE_GET_INTERFACE (self)->set_plugin_bool (self, domain, id, key, val);
-#line 1549 "ConfigurationInterfaces.c"
+#line 1736 "ConfigurationInterfaces.c"
 }
 
 
 gdouble configuration_engine_get_plugin_double (ConfigurationEngine* self, const gchar* domain, const gchar* id, const gchar* key, gdouble def) {
-#line 306 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 333 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (IS_CONFIGURATION_ENGINE (self), 0.0);
-#line 306 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#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 1558 "ConfigurationInterfaces.c"
+#line 1745 "ConfigurationInterfaces.c"
 }
 
 
 void configuration_engine_set_plugin_double (ConfigurationEngine* self, const gchar* domain, const gchar* id, const gchar* key, gdouble val) {
-#line 307 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 334 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (IS_CONFIGURATION_ENGINE (self));
-#line 307 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 334 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_ENGINE_GET_INTERFACE (self)->set_plugin_double (self, domain, id, key, val);
-#line 1567 "ConfigurationInterfaces.c"
+#line 1754 "ConfigurationInterfaces.c"
 }
 
 
 gint configuration_engine_get_plugin_int (ConfigurationEngine* self, const gchar* domain, const gchar* id, const gchar* key, gint def) {
-#line 308 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 335 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (IS_CONFIGURATION_ENGINE (self), 0);
-#line 308 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#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 1576 "ConfigurationInterfaces.c"
+#line 1763 "ConfigurationInterfaces.c"
 }
 
 
 void configuration_engine_set_plugin_int (ConfigurationEngine* self, const gchar* domain, const gchar* id, const gchar* key, gint val) {
-#line 309 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 336 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (IS_CONFIGURATION_ENGINE (self));
-#line 309 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 336 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_ENGINE_GET_INTERFACE (self)->set_plugin_int (self, domain, id, key, val);
-#line 1585 "ConfigurationInterfaces.c"
+#line 1772 "ConfigurationInterfaces.c"
 }
 
 
 gchar* configuration_engine_get_plugin_string (ConfigurationEngine* self, const gchar* domain, const gchar* id, const gchar* key, const gchar* def) {
-#line 310 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 337 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (IS_CONFIGURATION_ENGINE (self), NULL);
-#line 310 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#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 1594 "ConfigurationInterfaces.c"
+#line 1781 "ConfigurationInterfaces.c"
 }
 
 
 void configuration_engine_set_plugin_string (ConfigurationEngine* self, const gchar* domain, const gchar* id, const gchar* key, const gchar* val) {
-#line 311 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 338 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (IS_CONFIGURATION_ENGINE (self));
-#line 311 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 338 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_ENGINE_GET_INTERFACE (self)->set_plugin_string (self, domain, id, key, val);
-#line 1603 "ConfigurationInterfaces.c"
+#line 1790 "ConfigurationInterfaces.c"
 }
 
 
 void configuration_engine_unset_plugin_key (ConfigurationEngine* self, const gchar* domain, const gchar* id, const gchar* key) {
-#line 312 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 339 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (IS_CONFIGURATION_ENGINE (self));
-#line 312 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 339 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_ENGINE_GET_INTERFACE (self)->unset_plugin_key (self, domain, id, key);
-#line 1612 "ConfigurationInterfaces.c"
+#line 1799 "ConfigurationInterfaces.c"
 }
 
 
 FuzzyPropertyState configuration_engine_is_plugin_enabled (ConfigurationEngine* self, const gchar* id) {
-#line 314 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 341 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (IS_CONFIGURATION_ENGINE (self), 0);
-#line 314 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 341 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_ENGINE_GET_INTERFACE (self)->is_plugin_enabled (self, id);
-#line 1621 "ConfigurationInterfaces.c"
+#line 1808 "ConfigurationInterfaces.c"
 }
 
 
 void configuration_engine_set_plugin_enabled (ConfigurationEngine* self, const gchar* id, gboolean enabled) {
-#line 315 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 342 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (IS_CONFIGURATION_ENGINE (self));
-#line 315 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 342 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_ENGINE_GET_INTERFACE (self)->set_plugin_enabled (self, id, enabled);
-#line 1630 "ConfigurationInterfaces.c"
+#line 1817 "ConfigurationInterfaces.c"
 }
 
 
 static void configuration_engine_base_init (ConfigurationEngineIface * iface) {
-#line 287 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 311 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	static gboolean initialized = FALSE;
-#line 287 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 311 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (!initialized) {
-#line 287 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 311 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		initialized = TRUE;
-#line 287 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#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 1643 "ConfigurationInterfaces.c"
+#line 1830 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -1659,16 +1846,16 @@ GType configuration_engine_get_type (void) {
 
 
 static gpointer _g_object_ref0 (gpointer self) {
-#line 329 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 356 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 1664 "ConfigurationInterfaces.c"
+#line 1851 "ConfigurationInterfaces.c"
 }
 
 
 static void _configuration_facade_on_property_changed_configuration_engine_property_changed (ConfigurationEngine* _sender, ConfigurableProperty p, gpointer self) {
-#line 331 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 358 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	configuration_facade_on_property_changed ((ConfigurationFacade*) self, p);
-#line 1671 "ConfigurationInterfaces.c"
+#line 1858 "ConfigurationInterfaces.c"
 }
 
 
@@ -1677,25 +1864,25 @@ ConfigurationFacade* configuration_facade_construct (GType object_type, Configur
 	ConfigurationEngine* _tmp0_ = NULL;
 	ConfigurationEngine* _tmp1_ = NULL;
 	ConfigurationEngine* _tmp2_ = NULL;
-#line 328 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 355 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (IS_CONFIGURATION_ENGINE (engine), NULL);
-#line 328 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 355 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	self = (ConfigurationFacade*) g_object_new (object_type, NULL);
-#line 329 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 356 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp0_ = engine;
-#line 329 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 356 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 329 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 356 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_g_object_unref0 (self->priv->engine);
-#line 329 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 356 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	self->priv->engine = _tmp1_;
-#line 331 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 358 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp2_ = engine;
-#line 331 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 358 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_signal_connect_object (_tmp2_, "property-changed", (GCallback) _configuration_facade_on_property_changed_configuration_engine_property_changed, self, 0);
-#line 328 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 355 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return self;
-#line 1698 "ConfigurationInterfaces.c"
+#line 1885 "ConfigurationInterfaces.c"
 }
 
 
@@ -1704,89 +1891,89 @@ static void configuration_facade_on_property_changed (ConfigurationFacade* self,
 	gchar* _tmp1_ = NULL;
 	gchar* _tmp2_ = NULL;
 	ConfigurableProperty _tmp3_ = 0;
-#line 334 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 361 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
-#line 335 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 362 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp0_ = p;
-#line 335 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 362 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp1_ = configurable_property_to_string (_tmp0_);
-#line 335 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 362 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp2_ = _tmp1_;
-#line 335 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-	g_debug ("ConfigurationInterfaces.vala:335: ConfigurationFacade: engine reports " \
+#line 362 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	g_debug ("ConfigurationInterfaces.vala:362: ConfigurationFacade: engine reports " \
 "property '%s' changed.", _tmp2_);
-#line 335 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 362 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_g_free0 (_tmp2_);
-#line 337 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 364 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp3_ = p;
-#line 337 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 364 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	switch (_tmp3_) {
-#line 337 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 364 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_AUTO_IMPORT_FROM_LIBRARY:
-#line 1725 "ConfigurationInterfaces.c"
+#line 1912 "ConfigurationInterfaces.c"
 		{
-#line 339 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 366 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_signal_emit_by_name (self, "auto-import-from-library-changed");
-#line 340 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 367 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			break;
-#line 1731 "ConfigurationInterfaces.c"
+#line 1918 "ConfigurationInterfaces.c"
 		}
-#line 337 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 364 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_BG_COLOR_NAME:
-#line 1735 "ConfigurationInterfaces.c"
+#line 1922 "ConfigurationInterfaces.c"
 		{
-#line 343 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 370 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_signal_emit_by_name (self, "bg-color-name-changed");
-#line 344 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 371 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			break;
-#line 1741 "ConfigurationInterfaces.c"
+#line 1928 "ConfigurationInterfaces.c"
 		}
-#line 337 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 364 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_COMMIT_METADATA_TO_MASTERS:
-#line 1745 "ConfigurationInterfaces.c"
+#line 1932 "ConfigurationInterfaces.c"
 		{
-#line 347 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 374 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_signal_emit_by_name (self, "commit-metadata-to-masters-changed");
-#line 348 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 375 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			break;
-#line 1751 "ConfigurationInterfaces.c"
+#line 1938 "ConfigurationInterfaces.c"
 		}
-#line 337 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 364 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_EVENTS_SORT_ASCENDING:
-#line 1755 "ConfigurationInterfaces.c"
+#line 1942 "ConfigurationInterfaces.c"
 		{
-#line 351 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 378 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_signal_emit_by_name (self, "events-sort-ascending-changed");
-#line 352 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 379 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			break;
-#line 1761 "ConfigurationInterfaces.c"
+#line 1948 "ConfigurationInterfaces.c"
 		}
-#line 337 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 364 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_EXTERNAL_PHOTO_APP:
-#line 337 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 364 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_EXTERNAL_RAW_APP:
-#line 1767 "ConfigurationInterfaces.c"
+#line 1954 "ConfigurationInterfaces.c"
 		{
-#line 356 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 383 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_signal_emit_by_name (self, "external-app-changed");
-#line 357 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 384 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			break;
-#line 1773 "ConfigurationInterfaces.c"
+#line 1960 "ConfigurationInterfaces.c"
 		}
-#line 337 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 364 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_IMPORT_DIR:
-#line 1777 "ConfigurationInterfaces.c"
+#line 1964 "ConfigurationInterfaces.c"
 		{
-#line 360 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 387 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_signal_emit_by_name (self, "import-directory-changed");
-#line 361 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 388 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			break;
-#line 1783 "ConfigurationInterfaces.c"
+#line 1970 "ConfigurationInterfaces.c"
 		}
 		default:
-#line 337 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 364 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		break;
-#line 1788 "ConfigurationInterfaces.c"
+#line 1975 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -1795,100 +1982,100 @@ ConfigurationEngine* configuration_facade_get_engine (ConfigurationFacade* self)
 	ConfigurationEngine* result = NULL;
 	ConfigurationEngine* _tmp0_ = NULL;
 	ConfigurationEngine* _tmp1_ = NULL;
-#line 365 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 392 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), NULL);
-#line 366 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 393 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp0_ = self->priv->engine;
-#line 366 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 393 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 366 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 393 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	result = _tmp1_;
-#line 366 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 393 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return result;
-#line 1807 "ConfigurationInterfaces.c"
+#line 1994 "ConfigurationInterfaces.c"
 }
 
 
 void configuration_facade_on_configuration_error (ConfigurationFacade* self, GError* err) {
 	GError* _tmp0_ = NULL;
-#line 369 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 396 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
-#line 370 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 397 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp0_ = err;
-#line 370 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 397 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (g_error_matches (_tmp0_, CONFIGURATION_ERROR, CONFIGURATION_ERROR_PROPERTY_HAS_NO_VALUE)) {
-#line 1819 "ConfigurationInterfaces.c"
+#line 2006 "ConfigurationInterfaces.c"
 		ConfigurationEngine* _tmp1_ = NULL;
 		gchar* _tmp2_ = NULL;
 		gchar* _tmp3_ = NULL;
 		GError* _tmp4_ = NULL;
 		const gchar* _tmp5_ = NULL;
-#line 371 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 398 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = self->priv->engine;
-#line 371 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 398 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = configuration_engine_get_name (_tmp1_);
-#line 371 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 398 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = _tmp2_;
-#line 371 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 398 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp4_ = err;
-#line 371 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 398 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp5_ = _tmp4_->message;
-#line 371 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-		g_message ("ConfigurationInterfaces.vala:371: configuration engine '%s' reports PR" \
+#line 398 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		g_message ("ConfigurationInterfaces.vala:398: configuration engine '%s' reports PR" \
 "OPERTY_HAS_NO_VALUE error: %s", _tmp3_, _tmp5_);
-#line 371 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 398 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_free0 (_tmp3_);
-#line 1839 "ConfigurationInterfaces.c"
+#line 2026 "ConfigurationInterfaces.c"
 	} else {
 		GError* _tmp6_ = NULL;
-#line 374 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 401 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp6_ = err;
-#line 374 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 401 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (g_error_matches (_tmp6_, CONFIGURATION_ERROR, CONFIGURATION_ERROR_ENGINE_ERROR)) {
-#line 1846 "ConfigurationInterfaces.c"
+#line 2033 "ConfigurationInterfaces.c"
 			ConfigurationEngine* _tmp7_ = NULL;
 			gchar* _tmp8_ = NULL;
 			gchar* _tmp9_ = NULL;
 			GError* _tmp10_ = NULL;
 			const gchar* _tmp11_ = NULL;
-#line 375 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 402 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			_tmp7_ = self->priv->engine;
-#line 375 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 402 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			_tmp8_ = configuration_engine_get_name (_tmp7_);
-#line 375 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 402 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			_tmp9_ = _tmp8_;
-#line 375 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 402 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			_tmp10_ = err;
-#line 375 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 402 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			_tmp11_ = _tmp10_->message;
-#line 375 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-			g_critical ("ConfigurationInterfaces.vala:375: configuration engine '%s' reports EN" \
+#line 402 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+			g_critical ("ConfigurationInterfaces.vala:402: configuration engine '%s' reports EN" \
 "GINE_ERROR: %s", _tmp9_, _tmp11_);
-#line 375 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 402 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			_g_free0 (_tmp9_);
-#line 1866 "ConfigurationInterfaces.c"
+#line 2053 "ConfigurationInterfaces.c"
 		} else {
 			ConfigurationEngine* _tmp12_ = NULL;
 			gchar* _tmp13_ = NULL;
 			gchar* _tmp14_ = NULL;
 			GError* _tmp15_ = NULL;
 			const gchar* _tmp16_ = NULL;
-#line 378 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 405 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			_tmp12_ = self->priv->engine;
-#line 378 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 405 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			_tmp13_ = configuration_engine_get_name (_tmp12_);
-#line 378 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 405 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			_tmp14_ = _tmp13_;
-#line 378 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 405 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			_tmp15_ = err;
-#line 378 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 405 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			_tmp16_ = _tmp15_->message;
-#line 378 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-			g_critical ("ConfigurationInterfaces.vala:378: configuration engine '%s' reports un" \
+#line 405 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+			g_critical ("ConfigurationInterfaces.vala:405: configuration engine '%s' reports un" \
 "known error: %s", _tmp14_, _tmp16_);
-#line 378 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 405 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			_g_free0 (_tmp14_);
-#line 1887 "ConfigurationInterfaces.c"
+#line 2074 "ConfigurationInterfaces.c"
 		}
 	}
 }
@@ -1903,77 +2090,77 @@ static gboolean configuration_facade_real_get_auto_import_from_library (Configur
 		ConfigurationEngine* _tmp2_ = NULL;
 		gboolean _tmp3_ = FALSE;
 		gboolean _tmp4_ = FALSE;
-#line 388 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 415 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = configuration_facade_get_engine (self);
-#line 388 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 415 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = _tmp1_;
-#line 388 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 415 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = configuration_engine_get_bool_property (_tmp2_, CONFIGURABLE_PROPERTY_AUTO_IMPORT_FROM_LIBRARY, &_inner_error_);
-#line 388 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 415 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp4_ = _tmp3_;
-#line 388 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 415 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp2_);
-#line 388 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 415 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = _tmp4_;
-#line 388 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 415 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 388 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 415 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 1918 "ConfigurationInterfaces.c"
-				goto __catch79_configuration_error;
+#line 2105 "ConfigurationInterfaces.c"
+				goto __catch80_configuration_error;
 			}
-#line 388 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#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);
-#line 388 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 415 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 388 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 415 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return FALSE;
-#line 1927 "ConfigurationInterfaces.c"
+#line 2114 "ConfigurationInterfaces.c"
 		}
-#line 388 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 415 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp0_;
-#line 388 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 415 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 1933 "ConfigurationInterfaces.c"
+#line 2120 "ConfigurationInterfaces.c"
 	}
-	goto __finally79;
-	__catch79_configuration_error:
+	goto __finally80;
+	__catch80_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp5_ = NULL;
-#line 387 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 414 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 387 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 414 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 390 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 417 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp5_ = err;
-#line 390 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 417 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp5_);
-#line 392 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 419 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = FALSE;
-#line 392 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 419 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 392 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 419 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 1954 "ConfigurationInterfaces.c"
+#line 2141 "ConfigurationInterfaces.c"
 	}
-	__finally79:
-#line 387 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally80:
+#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 387 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 414 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
-#line 387 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 414 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return FALSE;
-#line 1963 "ConfigurationInterfaces.c"
+#line 2150 "ConfigurationInterfaces.c"
 }
 
 
 gboolean configuration_facade_get_auto_import_from_library (ConfigurationFacade* self) {
-#line 386 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 413 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), FALSE);
-#line 386 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 413 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_auto_import_from_library (self);
-#line 1972 "ConfigurationInterfaces.c"
+#line 2159 "ConfigurationInterfaces.c"
 }
 
 
@@ -1983,71 +2170,71 @@ static void configuration_facade_real_set_auto_import_from_library (Configuratio
 		ConfigurationEngine* _tmp0_ = NULL;
 		ConfigurationEngine* _tmp1_ = NULL;
 		gboolean _tmp2_ = FALSE;
-#line 398 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 425 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = configuration_facade_get_engine (self);
-#line 398 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 425 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = _tmp0_;
-#line 398 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 425 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = auto_import;
-#line 398 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 425 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_engine_set_bool_property (_tmp1_, CONFIGURABLE_PROPERTY_AUTO_IMPORT_FROM_LIBRARY, _tmp2_, &_inner_error_);
-#line 398 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 425 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp1_);
-#line 398 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 425 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 398 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 425 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 1996 "ConfigurationInterfaces.c"
-				goto __catch80_configuration_error;
+#line 2183 "ConfigurationInterfaces.c"
+				goto __catch81_configuration_error;
 			}
-#line 398 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#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);
-#line 398 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 425 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 398 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 425 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 2005 "ConfigurationInterfaces.c"
+#line 2192 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally80;
-	__catch80_configuration_error:
+	goto __finally81;
+	__catch81_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
-#line 397 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 424 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 397 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 424 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 401 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 428 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = err;
-#line 401 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 428 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp3_);
-#line 402 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 429 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 402 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 429 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 2025 "ConfigurationInterfaces.c"
+#line 2212 "ConfigurationInterfaces.c"
 	}
-	__finally80:
-#line 397 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally81:
+#line 424 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 397 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 424 "/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 397 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 424 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		g_clear_error (&_inner_error_);
-#line 397 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 424 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 2036 "ConfigurationInterfaces.c"
+#line 2223 "ConfigurationInterfaces.c"
 	}
 }
 
 
 void configuration_facade_set_auto_import_from_library (ConfigurationFacade* self, gboolean auto_import) {
-#line 396 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 423 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
-#line 396 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 423 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_auto_import_from_library (self, auto_import);
-#line 2046 "ConfigurationInterfaces.c"
+#line 2233 "ConfigurationInterfaces.c"
 }
 
 
@@ -2061,163 +2248,163 @@ static gchar* configuration_facade_real_get_bg_color_name (ConfigurationFacade*
 		gchar* _tmp3_ = NULL;
 		gchar* _tmp4_ = NULL;
 		gchar* _tmp5_ = NULL;
-#line 411 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 438 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = configuration_facade_get_engine (self);
-#line 411 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 438 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = _tmp1_;
-#line 411 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 438 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = configuration_engine_get_string_property (_tmp2_, CONFIGURABLE_PROPERTY_BG_COLOR_NAME, &_inner_error_);
-#line 411 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 438 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp4_ = _tmp3_;
-#line 411 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 438 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp2_);
-#line 411 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 438 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = _tmp4_;
-#line 411 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 438 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 411 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 438 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 2076 "ConfigurationInterfaces.c"
-				goto __catch81_configuration_error;
+#line 2263 "ConfigurationInterfaces.c"
+				goto __catch82_configuration_error;
 			}
-#line 411 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#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);
-#line 411 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 438 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 411 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 438 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return NULL;
-#line 2085 "ConfigurationInterfaces.c"
+#line 2272 "ConfigurationInterfaces.c"
 		}
-#line 411 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 438 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp5_ = _tmp0_;
-#line 411 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 438 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = NULL;
-#line 411 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 438 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp5_;
-#line 411 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 438 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_free0 (_tmp0_);
-#line 411 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 438 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 2097 "ConfigurationInterfaces.c"
+#line 2284 "ConfigurationInterfaces.c"
 	}
-	goto __finally81;
-	__catch81_configuration_error:
+	goto __finally82;
+	__catch82_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp6_ = NULL;
 		gchar* _tmp7_ = NULL;
-#line 410 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 437 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 410 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 437 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 413 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 440 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp6_ = err;
-#line 413 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 440 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp6_);
-#line 415 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 442 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp7_ = g_strdup ("");
-#line 415 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 442 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp7_;
-#line 415 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 442 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 415 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 442 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 2121 "ConfigurationInterfaces.c"
+#line 2308 "ConfigurationInterfaces.c"
 	}
-	__finally81:
-#line 410 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally82:
+#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 410 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 437 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
-#line 410 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 437 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return NULL;
-#line 2130 "ConfigurationInterfaces.c"
+#line 2317 "ConfigurationInterfaces.c"
 }
 
 
 gchar* configuration_facade_get_bg_color_name (ConfigurationFacade* self) {
-#line 409 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 436 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), NULL);
-#line 409 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 436 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_bg_color_name (self);
-#line 2139 "ConfigurationInterfaces.c"
+#line 2326 "ConfigurationInterfaces.c"
 }
 
 
 static void configuration_facade_real_set_bg_color_name (ConfigurationFacade* self, const gchar* color_name) {
 	GError * _inner_error_ = NULL;
-#line 419 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 446 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (color_name != NULL);
-#line 2147 "ConfigurationInterfaces.c"
+#line 2334 "ConfigurationInterfaces.c"
 	{
 		ConfigurationEngine* _tmp0_ = NULL;
 		ConfigurationEngine* _tmp1_ = NULL;
 		const gchar* _tmp2_ = NULL;
-#line 421 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 448 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = configuration_facade_get_engine (self);
-#line 421 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 448 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = _tmp0_;
-#line 421 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 448 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = color_name;
-#line 421 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 448 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_engine_set_string_property (_tmp1_, CONFIGURABLE_PROPERTY_BG_COLOR_NAME, _tmp2_, &_inner_error_);
-#line 421 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 448 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp1_);
-#line 421 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 448 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 421 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 448 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 2166 "ConfigurationInterfaces.c"
-				goto __catch82_configuration_error;
+#line 2353 "ConfigurationInterfaces.c"
+				goto __catch83_configuration_error;
 			}
-#line 421 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#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);
-#line 421 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 448 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 421 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 448 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 2175 "ConfigurationInterfaces.c"
+#line 2362 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally82;
-	__catch82_configuration_error:
+	goto __finally83;
+	__catch83_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
-#line 420 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 447 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 420 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 447 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 423 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 450 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = err;
-#line 423 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 450 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp3_);
-#line 424 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 451 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 424 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 451 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 2195 "ConfigurationInterfaces.c"
+#line 2382 "ConfigurationInterfaces.c"
 	}
-	__finally82:
-#line 420 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally83:
+#line 447 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 420 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 447 "/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 420 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 447 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		g_clear_error (&_inner_error_);
-#line 420 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 447 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 2206 "ConfigurationInterfaces.c"
+#line 2393 "ConfigurationInterfaces.c"
 	}
 }
 
 
 void configuration_facade_set_bg_color_name (ConfigurationFacade* self, const gchar* color_name) {
-#line 419 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 446 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
-#line 419 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 446 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_bg_color_name (self, color_name);
-#line 2216 "ConfigurationInterfaces.c"
+#line 2403 "ConfigurationInterfaces.c"
 }
 
 
@@ -2230,77 +2417,77 @@ static gboolean configuration_facade_real_get_commit_metadata_to_masters (Config
 		ConfigurationEngine* _tmp2_ = NULL;
 		gboolean _tmp3_ = FALSE;
 		gboolean _tmp4_ = FALSE;
-#line 433 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 460 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = configuration_facade_get_engine (self);
-#line 433 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 460 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = _tmp1_;
-#line 433 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 460 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = configuration_engine_get_bool_property (_tmp2_, CONFIGURABLE_PROPERTY_COMMIT_METADATA_TO_MASTERS, &_inner_error_);
-#line 433 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 460 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp4_ = _tmp3_;
-#line 433 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 460 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp2_);
-#line 433 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 460 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = _tmp4_;
-#line 433 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 460 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 433 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 460 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 2245 "ConfigurationInterfaces.c"
-				goto __catch83_configuration_error;
+#line 2432 "ConfigurationInterfaces.c"
+				goto __catch84_configuration_error;
 			}
-#line 433 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#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);
-#line 433 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 460 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 433 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 460 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return FALSE;
-#line 2254 "ConfigurationInterfaces.c"
+#line 2441 "ConfigurationInterfaces.c"
 		}
-#line 433 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 460 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp0_;
-#line 433 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 460 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 2260 "ConfigurationInterfaces.c"
+#line 2447 "ConfigurationInterfaces.c"
 	}
-	goto __finally83;
-	__catch83_configuration_error:
+	goto __finally84;
+	__catch84_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp5_ = NULL;
-#line 432 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 459 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 432 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 459 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 435 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 462 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp5_ = err;
-#line 435 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 462 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp5_);
-#line 437 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 464 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = FALSE;
-#line 437 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 464 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 437 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 464 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 2281 "ConfigurationInterfaces.c"
+#line 2468 "ConfigurationInterfaces.c"
 	}
-	__finally83:
-#line 432 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally84:
+#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 432 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 459 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
-#line 432 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 459 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return FALSE;
-#line 2290 "ConfigurationInterfaces.c"
+#line 2477 "ConfigurationInterfaces.c"
 }
 
 
 gboolean configuration_facade_get_commit_metadata_to_masters (ConfigurationFacade* self) {
-#line 431 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 458 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), FALSE);
-#line 431 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 458 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_commit_metadata_to_masters (self);
-#line 2299 "ConfigurationInterfaces.c"
+#line 2486 "ConfigurationInterfaces.c"
 }
 
 
@@ -2310,71 +2497,71 @@ static void configuration_facade_real_set_commit_metadata_to_masters (Configurat
 		ConfigurationEngine* _tmp0_ = NULL;
 		ConfigurationEngine* _tmp1_ = NULL;
 		gboolean _tmp2_ = FALSE;
-#line 443 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 470 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = configuration_facade_get_engine (self);
-#line 443 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 470 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = _tmp0_;
-#line 443 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 470 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = commit_metadata;
-#line 443 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 470 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_engine_set_bool_property (_tmp1_, CONFIGURABLE_PROPERTY_COMMIT_METADATA_TO_MASTERS, _tmp2_, &_inner_error_);
-#line 443 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 470 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp1_);
-#line 443 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 470 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 443 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 470 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 2323 "ConfigurationInterfaces.c"
-				goto __catch84_configuration_error;
+#line 2510 "ConfigurationInterfaces.c"
+				goto __catch85_configuration_error;
 			}
-#line 443 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#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);
-#line 443 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 470 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 443 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 470 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 2332 "ConfigurationInterfaces.c"
+#line 2519 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally84;
-	__catch84_configuration_error:
+	goto __finally85;
+	__catch85_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
-#line 442 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 469 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 442 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 469 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 446 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 473 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = err;
-#line 446 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 473 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp3_);
-#line 447 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 474 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 447 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 474 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 2352 "ConfigurationInterfaces.c"
+#line 2539 "ConfigurationInterfaces.c"
 	}
-	__finally84:
-#line 442 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally85:
+#line 469 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 442 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 469 "/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 442 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 469 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		g_clear_error (&_inner_error_);
-#line 442 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 469 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 2363 "ConfigurationInterfaces.c"
+#line 2550 "ConfigurationInterfaces.c"
 	}
 }
 
 
 void configuration_facade_set_commit_metadata_to_masters (ConfigurationFacade* self, gboolean commit_metadata) {
-#line 441 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 468 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
-#line 441 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 468 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_commit_metadata_to_masters (self, commit_metadata);
-#line 2373 "ConfigurationInterfaces.c"
+#line 2560 "ConfigurationInterfaces.c"
 }
 
 
@@ -2388,186 +2575,186 @@ static gchar* configuration_facade_real_get_desktop_background (ConfigurationFac
 		gchar* _tmp3_ = NULL;
 		gchar* _tmp4_ = NULL;
 		gchar* _tmp5_ = NULL;
-#line 456 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 483 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = configuration_facade_get_engine (self);
-#line 456 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 483 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = _tmp1_;
-#line 456 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 483 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = configuration_engine_get_string_property (_tmp2_, CONFIGURABLE_PROPERTY_DESKTOP_BACKGROUND_FILE, &_inner_error_);
-#line 456 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 483 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp4_ = _tmp3_;
-#line 456 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 483 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp2_);
-#line 456 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 483 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = _tmp4_;
-#line 456 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 483 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 456 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 483 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 2403 "ConfigurationInterfaces.c"
-				goto __catch85_configuration_error;
+#line 2590 "ConfigurationInterfaces.c"
+				goto __catch86_configuration_error;
 			}
-#line 456 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#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);
-#line 456 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 483 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 456 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 483 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return NULL;
-#line 2412 "ConfigurationInterfaces.c"
+#line 2599 "ConfigurationInterfaces.c"
 		}
-#line 456 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 483 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp5_ = _tmp0_;
-#line 456 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 483 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = NULL;
-#line 456 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 483 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp5_;
-#line 456 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 483 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_free0 (_tmp0_);
-#line 456 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 483 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 2424 "ConfigurationInterfaces.c"
+#line 2611 "ConfigurationInterfaces.c"
 	}
-	goto __finally85;
-	__catch85_configuration_error:
+	goto __finally86;
+	__catch86_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp6_ = NULL;
 		gchar* _tmp7_ = NULL;
-#line 455 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 482 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 455 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 482 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 458 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 485 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp6_ = err;
-#line 458 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 485 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp6_);
-#line 460 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 487 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp7_ = g_strdup ("");
-#line 460 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 487 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp7_;
-#line 460 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 487 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 460 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 487 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 2448 "ConfigurationInterfaces.c"
+#line 2635 "ConfigurationInterfaces.c"
 	}
-	__finally85:
-#line 455 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally86:
+#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 455 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 482 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
-#line 455 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 482 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return NULL;
-#line 2457 "ConfigurationInterfaces.c"
+#line 2644 "ConfigurationInterfaces.c"
 }
 
 
 gchar* configuration_facade_get_desktop_background (ConfigurationFacade* self) {
-#line 454 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 481 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), NULL);
-#line 454 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 481 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_desktop_background (self);
-#line 2466 "ConfigurationInterfaces.c"
+#line 2653 "ConfigurationInterfaces.c"
 }
 
 
 static void configuration_facade_real_set_desktop_background (ConfigurationFacade* self, const gchar* filename) {
 	GError * _inner_error_ = NULL;
-#line 464 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 491 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (filename != NULL);
-#line 2474 "ConfigurationInterfaces.c"
+#line 2661 "ConfigurationInterfaces.c"
 	{
 		ConfigurationEngine* _tmp0_ = NULL;
 		ConfigurationEngine* _tmp1_ = NULL;
 		const gchar* _tmp2_ = NULL;
 		ConfigurationEngine* _tmp3_ = NULL;
 		ConfigurationEngine* _tmp4_ = NULL;
-#line 466 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 493 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = configuration_facade_get_engine (self);
-#line 466 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 493 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = _tmp0_;
-#line 466 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 493 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = filename;
-#line 466 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 493 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_engine_set_string_property (_tmp1_, CONFIGURABLE_PROPERTY_DESKTOP_BACKGROUND_FILE, _tmp2_, &_inner_error_);
-#line 466 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 493 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp1_);
-#line 466 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 493 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 466 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 493 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 2495 "ConfigurationInterfaces.c"
-				goto __catch86_configuration_error;
+#line 2682 "ConfigurationInterfaces.c"
+				goto __catch87_configuration_error;
 			}
-#line 466 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#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);
-#line 466 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 493 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 466 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 493 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 2504 "ConfigurationInterfaces.c"
+#line 2691 "ConfigurationInterfaces.c"
 		}
-#line 468 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 495 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = configuration_facade_get_engine (self);
-#line 468 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 495 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp4_ = _tmp3_;
-#line 468 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 495 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_engine_set_string_property (_tmp4_, CONFIGURABLE_PROPERTY_DESKTOP_BACKGROUND_MODE, "zoom", &_inner_error_);
-#line 468 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 495 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp4_);
-#line 468 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 495 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 468 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 495 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 2518 "ConfigurationInterfaces.c"
-				goto __catch86_configuration_error;
+#line 2705 "ConfigurationInterfaces.c"
+				goto __catch87_configuration_error;
 			}
-#line 468 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#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);
-#line 468 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 495 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 468 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 495 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 2527 "ConfigurationInterfaces.c"
+#line 2714 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally86;
-	__catch86_configuration_error:
+	goto __finally87;
+	__catch87_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp5_ = NULL;
-#line 465 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 492 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 465 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 492 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 471 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 498 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp5_ = err;
-#line 471 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 498 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp5_);
-#line 465 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 492 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 2545 "ConfigurationInterfaces.c"
+#line 2732 "ConfigurationInterfaces.c"
 	}
-	__finally86:
-#line 465 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally87:
+#line 492 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 465 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 492 "/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 465 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 492 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		g_clear_error (&_inner_error_);
-#line 465 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 492 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 2556 "ConfigurationInterfaces.c"
+#line 2743 "ConfigurationInterfaces.c"
 	}
 }
 
 
 void configuration_facade_set_desktop_background (ConfigurationFacade* self, const gchar* filename) {
-#line 464 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 491 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
-#line 464 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 491 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_desktop_background (self, filename);
-#line 2566 "ConfigurationInterfaces.c"
+#line 2753 "ConfigurationInterfaces.c"
 }
 
 
@@ -2581,186 +2768,186 @@ static gchar* configuration_facade_real_get_screensaver (ConfigurationFacade* se
 		gchar* _tmp3_ = NULL;
 		gchar* _tmp4_ = NULL;
 		gchar* _tmp5_ = NULL;
-#line 480 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 507 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = configuration_facade_get_engine (self);
-#line 480 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 507 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = _tmp1_;
-#line 480 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 507 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = configuration_engine_get_string_property (_tmp2_, CONFIGURABLE_PROPERTY_SCREENSAVER_FILE, &_inner_error_);
-#line 480 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 507 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp4_ = _tmp3_;
-#line 480 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 507 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp2_);
-#line 480 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 507 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = _tmp4_;
-#line 480 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 507 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 480 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 507 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 2596 "ConfigurationInterfaces.c"
-				goto __catch87_configuration_error;
+#line 2783 "ConfigurationInterfaces.c"
+				goto __catch88_configuration_error;
 			}
-#line 480 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#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);
-#line 480 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 507 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 480 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 507 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return NULL;
-#line 2605 "ConfigurationInterfaces.c"
+#line 2792 "ConfigurationInterfaces.c"
 		}
-#line 480 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 507 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp5_ = _tmp0_;
-#line 480 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 507 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = NULL;
-#line 480 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 507 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp5_;
-#line 480 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 507 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_free0 (_tmp0_);
-#line 480 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 507 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 2617 "ConfigurationInterfaces.c"
+#line 2804 "ConfigurationInterfaces.c"
 	}
-	goto __finally87;
-	__catch87_configuration_error:
+	goto __finally88;
+	__catch88_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp6_ = NULL;
 		gchar* _tmp7_ = NULL;
-#line 479 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 506 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 479 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 506 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 482 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 509 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp6_ = err;
-#line 482 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 509 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp6_);
-#line 484 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 511 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp7_ = g_strdup ("");
-#line 484 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 511 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp7_;
-#line 484 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 511 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 484 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 511 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 2641 "ConfigurationInterfaces.c"
+#line 2828 "ConfigurationInterfaces.c"
 	}
-	__finally87:
-#line 479 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally88:
+#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 479 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 506 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
-#line 479 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 506 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return NULL;
-#line 2650 "ConfigurationInterfaces.c"
+#line 2837 "ConfigurationInterfaces.c"
 }
 
 
 gchar* configuration_facade_get_screensaver (ConfigurationFacade* self) {
-#line 478 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 505 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), NULL);
-#line 478 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 505 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_screensaver (self);
-#line 2659 "ConfigurationInterfaces.c"
+#line 2846 "ConfigurationInterfaces.c"
 }
 
 
 static void configuration_facade_real_set_screensaver (ConfigurationFacade* self, const gchar* filename) {
 	GError * _inner_error_ = NULL;
-#line 488 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 515 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (filename != NULL);
-#line 2667 "ConfigurationInterfaces.c"
+#line 2854 "ConfigurationInterfaces.c"
 	{
 		ConfigurationEngine* _tmp0_ = NULL;
 		ConfigurationEngine* _tmp1_ = NULL;
 		const gchar* _tmp2_ = NULL;
 		ConfigurationEngine* _tmp3_ = NULL;
 		ConfigurationEngine* _tmp4_ = NULL;
-#line 490 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 517 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = configuration_facade_get_engine (self);
-#line 490 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 517 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = _tmp0_;
-#line 490 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 517 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = filename;
-#line 490 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 517 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_engine_set_string_property (_tmp1_, CONFIGURABLE_PROPERTY_SCREENSAVER_FILE, _tmp2_, &_inner_error_);
-#line 490 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 517 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp1_);
-#line 490 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 517 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 490 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 517 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 2688 "ConfigurationInterfaces.c"
-				goto __catch88_configuration_error;
+#line 2875 "ConfigurationInterfaces.c"
+				goto __catch89_configuration_error;
 			}
-#line 490 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#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);
-#line 490 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 517 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 490 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 517 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 2697 "ConfigurationInterfaces.c"
+#line 2884 "ConfigurationInterfaces.c"
 		}
-#line 492 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 519 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = configuration_facade_get_engine (self);
-#line 492 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 519 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp4_ = _tmp3_;
-#line 492 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 519 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_engine_set_string_property (_tmp4_, CONFIGURABLE_PROPERTY_SCREENSAVER_MODE, "zoom", &_inner_error_);
-#line 492 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 519 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp4_);
-#line 492 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 519 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 492 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 519 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 2711 "ConfigurationInterfaces.c"
-				goto __catch88_configuration_error;
+#line 2898 "ConfigurationInterfaces.c"
+				goto __catch89_configuration_error;
 			}
-#line 492 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#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);
-#line 492 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 519 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 492 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 519 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 2720 "ConfigurationInterfaces.c"
+#line 2907 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally88;
-	__catch88_configuration_error:
+	goto __finally89;
+	__catch89_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp5_ = NULL;
-#line 489 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 516 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 489 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 516 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 495 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 522 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp5_ = err;
-#line 495 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 522 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp5_);
-#line 489 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 516 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 2738 "ConfigurationInterfaces.c"
+#line 2925 "ConfigurationInterfaces.c"
 	}
-	__finally88:
-#line 489 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally89:
+#line 516 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 489 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 516 "/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 489 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 516 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		g_clear_error (&_inner_error_);
-#line 489 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 516 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 2749 "ConfigurationInterfaces.c"
+#line 2936 "ConfigurationInterfaces.c"
 	}
 }
 
 
 void configuration_facade_set_screensaver (ConfigurationFacade* self, const gchar* filename) {
-#line 488 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 515 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
-#line 488 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 515 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_screensaver (self, filename);
-#line 2759 "ConfigurationInterfaces.c"
+#line 2946 "ConfigurationInterfaces.c"
 }
 
 
@@ -2775,94 +2962,94 @@ static gchar* configuration_facade_real_get_directory_pattern (ConfigurationFaca
 		gchar* _tmp3_ = NULL;
 		const gchar* _tmp4_ = NULL;
 		gchar* _tmp5_ = NULL;
-#line 504 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 531 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = configuration_facade_get_engine (self);
-#line 504 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 531 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = _tmp0_;
-#line 504 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 531 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = configuration_engine_get_string_property (_tmp1_, CONFIGURABLE_PROPERTY_DIRECTORY_PATTERN, &_inner_error_);
-#line 504 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 531 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = _tmp2_;
-#line 504 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 531 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp1_);
-#line 504 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 531 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		s = _tmp3_;
-#line 504 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 531 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 504 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 531 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 2790 "ConfigurationInterfaces.c"
-				goto __catch89_configuration_error;
+#line 2977 "ConfigurationInterfaces.c"
+				goto __catch90_configuration_error;
 			}
-#line 504 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#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);
-#line 504 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 531 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 504 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 531 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return NULL;
-#line 2799 "ConfigurationInterfaces.c"
+#line 2986 "ConfigurationInterfaces.c"
 		}
-#line 505 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 532 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (g_strcmp0 (s, "") == 0) {
-#line 505 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 532 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			_tmp4_ = NULL;
-#line 2805 "ConfigurationInterfaces.c"
+#line 2992 "ConfigurationInterfaces.c"
 		} else {
-#line 505 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 532 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			_tmp4_ = s;
-#line 2809 "ConfigurationInterfaces.c"
+#line 2996 "ConfigurationInterfaces.c"
 		}
-#line 505 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 532 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp5_ = g_strdup (_tmp4_);
-#line 505 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 532 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp5_;
-#line 505 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 532 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_free0 (s);
-#line 505 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 532 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 2819 "ConfigurationInterfaces.c"
+#line 3006 "ConfigurationInterfaces.c"
 	}
-	goto __finally89;
-	__catch89_configuration_error:
+	goto __finally90;
+	__catch90_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp6_ = NULL;
 		gchar* _tmp7_ = NULL;
-#line 503 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 530 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 503 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 530 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 507 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 534 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp6_ = err;
-#line 507 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 534 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp6_);
-#line 509 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 536 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp7_ = g_strdup ("");
-#line 509 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 536 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp7_;
-#line 509 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 536 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 509 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 536 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 2843 "ConfigurationInterfaces.c"
+#line 3030 "ConfigurationInterfaces.c"
 	}
-	__finally89:
-#line 503 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally90:
+#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 503 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 530 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
-#line 503 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 530 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return NULL;
-#line 2852 "ConfigurationInterfaces.c"
+#line 3039 "ConfigurationInterfaces.c"
 }
 
 
 gchar* configuration_facade_get_directory_pattern (ConfigurationFacade* self) {
-#line 502 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 529 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), NULL);
-#line 502 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 529 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_directory_pattern (self);
-#line 2861 "ConfigurationInterfaces.c"
+#line 3048 "ConfigurationInterfaces.c"
 }
 
 
@@ -2873,77 +3060,77 @@ static void configuration_facade_real_set_directory_pattern (ConfigurationFacade
 		ConfigurationEngine* _tmp1_ = NULL;
 		ConfigurationEngine* _tmp2_ = NULL;
 		const gchar* _tmp3_ = NULL;
-#line 515 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 542 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = s;
-#line 515 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 542 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (_tmp0_ == NULL) {
-#line 516 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 543 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			s = "";
-#line 2878 "ConfigurationInterfaces.c"
+#line 3065 "ConfigurationInterfaces.c"
 		}
-#line 518 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 545 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = configuration_facade_get_engine (self);
-#line 518 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 545 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = _tmp1_;
-#line 518 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 545 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = s;
-#line 518 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 545 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_engine_set_string_property (_tmp2_, CONFIGURABLE_PROPERTY_DIRECTORY_PATTERN, _tmp3_, &_inner_error_);
-#line 518 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 545 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp2_);
-#line 518 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 545 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 518 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 545 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 2894 "ConfigurationInterfaces.c"
-				goto __catch90_configuration_error;
+#line 3081 "ConfigurationInterfaces.c"
+				goto __catch91_configuration_error;
 			}
-#line 518 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#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);
-#line 518 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 545 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 518 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 545 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 2903 "ConfigurationInterfaces.c"
+#line 3090 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally90;
-	__catch90_configuration_error:
+	goto __finally91;
+	__catch91_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp4_ = NULL;
-#line 514 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 541 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 514 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 541 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 520 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 547 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp4_ = err;
-#line 520 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 547 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp4_);
-#line 514 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 541 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 2921 "ConfigurationInterfaces.c"
+#line 3108 "ConfigurationInterfaces.c"
 	}
-	__finally90:
-#line 514 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally91:
+#line 541 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 514 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 541 "/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 514 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 541 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		g_clear_error (&_inner_error_);
-#line 514 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 541 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 2932 "ConfigurationInterfaces.c"
+#line 3119 "ConfigurationInterfaces.c"
 	}
 }
 
 
 void configuration_facade_set_directory_pattern (ConfigurationFacade* self, const gchar* s) {
-#line 513 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 540 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
-#line 513 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 540 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_directory_pattern (self, s);
-#line 2942 "ConfigurationInterfaces.c"
+#line 3129 "ConfigurationInterfaces.c"
 }
 
 
@@ -2957,161 +3144,161 @@ static gchar* configuration_facade_real_get_directory_pattern_custom (Configurat
 		gchar* _tmp3_ = NULL;
 		gchar* _tmp4_ = NULL;
 		gchar* _tmp5_ = NULL;
-#line 529 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 556 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = configuration_facade_get_engine (self);
-#line 529 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 556 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = _tmp1_;
-#line 529 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 556 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = configuration_engine_get_string_property (_tmp2_, CONFIGURABLE_PROPERTY_DIRECTORY_PATTERN_CUSTOM, &_inner_error_);
-#line 529 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 556 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp4_ = _tmp3_;
-#line 529 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 556 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp2_);
-#line 529 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 556 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = _tmp4_;
-#line 529 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 556 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 529 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 556 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 2972 "ConfigurationInterfaces.c"
-				goto __catch91_configuration_error;
+#line 3159 "ConfigurationInterfaces.c"
+				goto __catch92_configuration_error;
 			}
-#line 529 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#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);
-#line 529 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 556 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 529 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 556 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return NULL;
-#line 2981 "ConfigurationInterfaces.c"
+#line 3168 "ConfigurationInterfaces.c"
 		}
-#line 529 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 556 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp5_ = _tmp0_;
-#line 529 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 556 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = NULL;
-#line 529 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 556 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp5_;
-#line 529 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 556 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_free0 (_tmp0_);
-#line 529 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 556 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 2993 "ConfigurationInterfaces.c"
+#line 3180 "ConfigurationInterfaces.c"
 	}
-	goto __finally91;
-	__catch91_configuration_error:
+	goto __finally92;
+	__catch92_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp6_ = NULL;
 		gchar* _tmp7_ = NULL;
-#line 528 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 555 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 528 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 555 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 531 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 558 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp6_ = err;
-#line 531 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 558 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp6_);
-#line 533 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 560 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp7_ = g_strdup ("");
-#line 533 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 560 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp7_;
-#line 533 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 560 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 533 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 560 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 3017 "ConfigurationInterfaces.c"
+#line 3204 "ConfigurationInterfaces.c"
 	}
-	__finally91:
-#line 528 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally92:
+#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 528 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 555 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
-#line 528 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 555 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return NULL;
-#line 3026 "ConfigurationInterfaces.c"
+#line 3213 "ConfigurationInterfaces.c"
 }
 
 
 gchar* configuration_facade_get_directory_pattern_custom (ConfigurationFacade* self) {
-#line 527 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 554 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), NULL);
-#line 527 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 554 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_directory_pattern_custom (self);
-#line 3035 "ConfigurationInterfaces.c"
+#line 3222 "ConfigurationInterfaces.c"
 }
 
 
 static void configuration_facade_real_set_directory_pattern_custom (ConfigurationFacade* self, const gchar* s) {
 	GError * _inner_error_ = NULL;
-#line 537 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 564 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (s != NULL);
-#line 3043 "ConfigurationInterfaces.c"
+#line 3230 "ConfigurationInterfaces.c"
 	{
 		ConfigurationEngine* _tmp0_ = NULL;
 		ConfigurationEngine* _tmp1_ = NULL;
 		const gchar* _tmp2_ = NULL;
-#line 539 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 566 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = configuration_facade_get_engine (self);
-#line 539 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 566 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = _tmp0_;
-#line 539 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 566 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = s;
-#line 539 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 566 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_engine_set_string_property (_tmp1_, CONFIGURABLE_PROPERTY_DIRECTORY_PATTERN_CUSTOM, _tmp2_, &_inner_error_);
-#line 539 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 566 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp1_);
-#line 539 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 566 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 539 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 566 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 3062 "ConfigurationInterfaces.c"
-				goto __catch92_configuration_error;
+#line 3249 "ConfigurationInterfaces.c"
+				goto __catch93_configuration_error;
 			}
-#line 539 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#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);
-#line 539 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 566 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 539 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 566 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 3071 "ConfigurationInterfaces.c"
+#line 3258 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally92;
-	__catch92_configuration_error:
+	goto __finally93;
+	__catch93_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
-#line 538 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 565 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 538 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 565 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 541 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 568 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = err;
-#line 541 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 568 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp3_);
-#line 538 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 565 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 3089 "ConfigurationInterfaces.c"
+#line 3276 "ConfigurationInterfaces.c"
 	}
-	__finally92:
-#line 538 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally93:
+#line 565 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 538 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 565 "/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 538 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 565 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		g_clear_error (&_inner_error_);
-#line 538 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 565 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 3100 "ConfigurationInterfaces.c"
+#line 3287 "ConfigurationInterfaces.c"
 	}
 }
 
 
 void configuration_facade_set_directory_pattern_custom (ConfigurationFacade* self, const gchar* s) {
-#line 537 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 564 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
-#line 537 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 564 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_directory_pattern_custom (self, s);
-#line 3110 "ConfigurationInterfaces.c"
+#line 3297 "ConfigurationInterfaces.c"
 }
 
 
@@ -3119,11 +3306,11 @@ static void configuration_facade_real_get_direct_window_state (ConfigurationFaca
 	gboolean _vala_maximize = FALSE;
 	Dimensions _vala_dimensions = {0};
 	GError * _inner_error_ = NULL;
-#line 549 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 576 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_vala_maximize = FALSE;
-#line 550 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 577 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	dimensions_init (&_vala_dimensions, 1024, 768);
-#line 3122 "ConfigurationInterfaces.c"
+#line 3309 "ConfigurationInterfaces.c"
 	{
 		gboolean _tmp0_ = FALSE;
 		ConfigurationEngine* _tmp1_ = NULL;
@@ -3142,154 +3329,154 @@ static void configuration_facade_real_get_direct_window_state (ConfigurationFaca
 		gint _tmp12_ = 0;
 		gint _tmp13_ = 0;
 		gint _tmp14_ = 0;
-#line 552 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 579 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = configuration_facade_get_engine (self);
-#line 552 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 579 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = _tmp1_;
-#line 552 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 579 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = configuration_engine_get_bool_property (_tmp2_, CONFIGURABLE_PROPERTY_DIRECT_WINDOW_MAXIMIZE, &_inner_error_);
-#line 552 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 579 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp4_ = _tmp3_;
-#line 552 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 579 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp2_);
-#line 552 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 579 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = _tmp4_;
-#line 552 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 579 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 552 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 579 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 3157 "ConfigurationInterfaces.c"
-				goto __catch93_configuration_error;
+#line 3344 "ConfigurationInterfaces.c"
+				goto __catch94_configuration_error;
 			}
-#line 552 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#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);
-#line 552 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 579 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 552 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 579 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 3166 "ConfigurationInterfaces.c"
+#line 3353 "ConfigurationInterfaces.c"
 		}
-#line 552 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 579 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_vala_maximize = _tmp0_;
-#line 553 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 580 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp5_ = configuration_facade_get_engine (self);
-#line 553 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 580 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp6_ = _tmp5_;
-#line 553 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 580 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp7_ = configuration_engine_get_int_property (_tmp6_, CONFIGURABLE_PROPERTY_DIRECT_WINDOW_WIDTH, &_inner_error_);
-#line 553 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 580 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp8_ = _tmp7_;
-#line 553 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 580 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp6_);
-#line 553 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 580 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		w = _tmp8_;
-#line 553 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 580 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 553 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 580 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 3186 "ConfigurationInterfaces.c"
-				goto __catch93_configuration_error;
+#line 3373 "ConfigurationInterfaces.c"
+				goto __catch94_configuration_error;
 			}
-#line 553 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#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);
-#line 553 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 580 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 553 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 580 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 3195 "ConfigurationInterfaces.c"
+#line 3382 "ConfigurationInterfaces.c"
 		}
-#line 554 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 581 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp9_ = configuration_facade_get_engine (self);
-#line 554 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 581 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp10_ = _tmp9_;
-#line 554 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 581 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp11_ = configuration_engine_get_int_property (_tmp10_, CONFIGURABLE_PROPERTY_DIRECT_WINDOW_HEIGHT, &_inner_error_);
-#line 554 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 581 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp12_ = _tmp11_;
-#line 554 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 581 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp10_);
-#line 554 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 581 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		h = _tmp12_;
-#line 554 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 581 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 554 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 581 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 3213 "ConfigurationInterfaces.c"
-				goto __catch93_configuration_error;
+#line 3400 "ConfigurationInterfaces.c"
+				goto __catch94_configuration_error;
 			}
-#line 554 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#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);
-#line 554 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 581 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 554 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 581 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 3222 "ConfigurationInterfaces.c"
+#line 3409 "ConfigurationInterfaces.c"
 		}
-#line 555 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 582 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp13_ = w;
-#line 555 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 582 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp14_ = h;
-#line 555 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 582 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		dimensions_init (&_vala_dimensions, _tmp13_, _tmp14_);
-#line 3230 "ConfigurationInterfaces.c"
+#line 3417 "ConfigurationInterfaces.c"
 	}
-	goto __finally93;
-	__catch93_configuration_error:
+	goto __finally94;
+	__catch94_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp15_ = NULL;
-#line 551 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 578 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 551 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 578 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 557 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 584 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp15_ = err;
-#line 557 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 584 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp15_);
-#line 551 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 578 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 3247 "ConfigurationInterfaces.c"
+#line 3434 "ConfigurationInterfaces.c"
 	}
-	__finally93:
-#line 551 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally94:
+#line 578 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 551 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 578 "/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 551 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 578 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		g_clear_error (&_inner_error_);
-#line 551 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 578 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 3258 "ConfigurationInterfaces.c"
+#line 3445 "ConfigurationInterfaces.c"
 	}
-#line 548 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 575 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (maximize) {
-#line 548 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 575 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		*maximize = _vala_maximize;
-#line 3264 "ConfigurationInterfaces.c"
+#line 3451 "ConfigurationInterfaces.c"
 	}
-#line 548 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 575 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (dimensions) {
-#line 548 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 575 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		*dimensions = _vala_dimensions;
-#line 3270 "ConfigurationInterfaces.c"
+#line 3457 "ConfigurationInterfaces.c"
 	}
 }
 
 
 void configuration_facade_get_direct_window_state (ConfigurationFacade* self, gboolean* maximize, Dimensions* dimensions) {
-#line 548 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 575 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
-#line 548 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 575 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->get_direct_window_state (self, maximize, dimensions);
-#line 3280 "ConfigurationInterfaces.c"
+#line 3467 "ConfigurationInterfaces.c"
 }
 
 
 static void configuration_facade_real_set_direct_window_state (ConfigurationFacade* self, gboolean maximize, Dimensions* dimensions) {
 	GError * _inner_error_ = NULL;
-#line 561 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 588 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (dimensions != NULL);
-#line 3288 "ConfigurationInterfaces.c"
+#line 3475 "ConfigurationInterfaces.c"
 	{
 		ConfigurationEngine* _tmp0_ = NULL;
 		ConfigurationEngine* _tmp1_ = NULL;
@@ -3302,123 +3489,123 @@ static void configuration_facade_real_set_direct_window_state (ConfigurationFaca
 		ConfigurationEngine* _tmp8_ = NULL;
 		Dimensions _tmp9_ = {0};
 		gint _tmp10_ = 0;
-#line 563 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 590 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = configuration_facade_get_engine (self);
-#line 563 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 590 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = _tmp0_;
-#line 563 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 590 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = maximize;
-#line 563 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 590 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_engine_set_bool_property (_tmp1_, CONFIGURABLE_PROPERTY_DIRECT_WINDOW_MAXIMIZE, _tmp2_, &_inner_error_);
-#line 563 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 590 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp1_);
-#line 563 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 590 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 563 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 590 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 3315 "ConfigurationInterfaces.c"
-				goto __catch94_configuration_error;
+#line 3502 "ConfigurationInterfaces.c"
+				goto __catch95_configuration_error;
 			}
-#line 563 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#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);
-#line 563 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 590 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 563 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 590 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 3324 "ConfigurationInterfaces.c"
+#line 3511 "ConfigurationInterfaces.c"
 		}
-#line 564 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 591 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = configuration_facade_get_engine (self);
-#line 564 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 591 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp4_ = _tmp3_;
-#line 564 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 591 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp5_ = *dimensions;
-#line 564 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 591 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp6_ = _tmp5_.width;
-#line 564 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 591 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_engine_set_int_property (_tmp4_, CONFIGURABLE_PROPERTY_DIRECT_WINDOW_WIDTH, _tmp6_, &_inner_error_);
-#line 564 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 591 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp4_);
-#line 564 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 591 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 564 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 591 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 3342 "ConfigurationInterfaces.c"
-				goto __catch94_configuration_error;
+#line 3529 "ConfigurationInterfaces.c"
+				goto __catch95_configuration_error;
 			}
-#line 564 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#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);
-#line 564 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 591 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 564 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 591 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 3351 "ConfigurationInterfaces.c"
+#line 3538 "ConfigurationInterfaces.c"
 		}
-#line 566 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 593 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp7_ = configuration_facade_get_engine (self);
-#line 566 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 593 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp8_ = _tmp7_;
-#line 566 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 593 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp9_ = *dimensions;
-#line 566 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 593 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp10_ = _tmp9_.height;
-#line 566 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 593 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_engine_set_int_property (_tmp8_, CONFIGURABLE_PROPERTY_DIRECT_WINDOW_HEIGHT, _tmp10_, &_inner_error_);
-#line 566 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 593 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp8_);
-#line 566 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 593 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 566 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 593 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 3369 "ConfigurationInterfaces.c"
-				goto __catch94_configuration_error;
+#line 3556 "ConfigurationInterfaces.c"
+				goto __catch95_configuration_error;
 			}
-#line 566 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#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);
-#line 566 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 593 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 566 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 593 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 3378 "ConfigurationInterfaces.c"
+#line 3565 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally94;
-	__catch94_configuration_error:
+	goto __finally95;
+	__catch95_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp11_ = NULL;
-#line 562 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 589 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 562 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 589 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 569 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 596 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp11_ = err;
-#line 569 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 596 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp11_);
-#line 562 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 589 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 3396 "ConfigurationInterfaces.c"
+#line 3583 "ConfigurationInterfaces.c"
 	}
-	__finally94:
-#line 562 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally95:
+#line 589 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 562 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 589 "/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 562 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 589 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		g_clear_error (&_inner_error_);
-#line 562 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 589 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 3407 "ConfigurationInterfaces.c"
+#line 3594 "ConfigurationInterfaces.c"
 	}
 }
 
 
 void configuration_facade_set_direct_window_state (ConfigurationFacade* self, gboolean maximize, Dimensions* dimensions) {
-#line 561 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 588 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
-#line 561 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 588 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_direct_window_state (self, maximize, dimensions);
-#line 3417 "ConfigurationInterfaces.c"
+#line 3604 "ConfigurationInterfaces.c"
 }
 
 
@@ -3431,77 +3618,77 @@ static gboolean configuration_facade_real_get_display_basic_properties (Configur
 		ConfigurationEngine* _tmp2_ = NULL;
 		gboolean _tmp3_ = FALSE;
 		gboolean _tmp4_ = FALSE;
-#line 578 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 605 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = configuration_facade_get_engine (self);
-#line 578 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 605 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = _tmp1_;
-#line 578 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 605 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = configuration_engine_get_bool_property (_tmp2_, CONFIGURABLE_PROPERTY_DISPLAY_BASIC_PROPERTIES, &_inner_error_);
-#line 578 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 605 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp4_ = _tmp3_;
-#line 578 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 605 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp2_);
-#line 578 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 605 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = _tmp4_;
-#line 578 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 605 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 578 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 605 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 3446 "ConfigurationInterfaces.c"
-				goto __catch95_configuration_error;
+#line 3633 "ConfigurationInterfaces.c"
+				goto __catch96_configuration_error;
 			}
-#line 578 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#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);
-#line 578 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 605 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 578 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 605 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return FALSE;
-#line 3455 "ConfigurationInterfaces.c"
+#line 3642 "ConfigurationInterfaces.c"
 		}
-#line 578 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 605 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp0_;
-#line 578 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 605 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 3461 "ConfigurationInterfaces.c"
+#line 3648 "ConfigurationInterfaces.c"
 	}
-	goto __finally95;
-	__catch95_configuration_error:
+	goto __finally96;
+	__catch96_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp5_ = NULL;
-#line 577 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 604 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 577 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 604 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 580 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 607 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp5_ = err;
-#line 580 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 607 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp5_);
-#line 582 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 609 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = TRUE;
-#line 582 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 609 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 582 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 609 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 3482 "ConfigurationInterfaces.c"
+#line 3669 "ConfigurationInterfaces.c"
 	}
-	__finally95:
-#line 577 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally96:
+#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 577 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 604 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
-#line 577 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 604 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return FALSE;
-#line 3491 "ConfigurationInterfaces.c"
+#line 3678 "ConfigurationInterfaces.c"
 }
 
 
 gboolean configuration_facade_get_display_basic_properties (ConfigurationFacade* self) {
-#line 576 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 603 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), FALSE);
-#line 576 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 603 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_display_basic_properties (self);
-#line 3500 "ConfigurationInterfaces.c"
+#line 3687 "ConfigurationInterfaces.c"
 }
 
 
@@ -3511,69 +3698,69 @@ static void configuration_facade_real_set_display_basic_properties (Configuratio
 		ConfigurationEngine* _tmp0_ = NULL;
 		ConfigurationEngine* _tmp1_ = NULL;
 		gboolean _tmp2_ = FALSE;
-#line 588 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 615 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = configuration_facade_get_engine (self);
-#line 588 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 615 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = _tmp0_;
-#line 588 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 615 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = display;
-#line 588 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 615 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_engine_set_bool_property (_tmp1_, CONFIGURABLE_PROPERTY_DISPLAY_BASIC_PROPERTIES, _tmp2_, &_inner_error_);
-#line 588 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 615 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp1_);
-#line 588 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 615 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 588 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 615 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 3524 "ConfigurationInterfaces.c"
-				goto __catch96_configuration_error;
+#line 3711 "ConfigurationInterfaces.c"
+				goto __catch97_configuration_error;
 			}
-#line 588 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#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);
-#line 588 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 615 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 588 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 615 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 3533 "ConfigurationInterfaces.c"
+#line 3720 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally96;
-	__catch96_configuration_error:
+	goto __finally97;
+	__catch97_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
-#line 587 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 614 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 587 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 614 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 590 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 617 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = err;
-#line 590 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 617 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp3_);
-#line 587 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 614 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 3551 "ConfigurationInterfaces.c"
+#line 3738 "ConfigurationInterfaces.c"
 	}
-	__finally96:
-#line 587 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally97:
+#line 614 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 587 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 614 "/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 587 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 614 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		g_clear_error (&_inner_error_);
-#line 587 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 614 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 3562 "ConfigurationInterfaces.c"
+#line 3749 "ConfigurationInterfaces.c"
 	}
 }
 
 
 void configuration_facade_set_display_basic_properties (ConfigurationFacade* self, gboolean display) {
-#line 586 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 613 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
-#line 586 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 613 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_display_basic_properties (self, display);
-#line 3572 "ConfigurationInterfaces.c"
+#line 3759 "ConfigurationInterfaces.c"
 }
 
 
@@ -3586,77 +3773,77 @@ static gboolean configuration_facade_real_get_display_extended_properties (Confi
 		ConfigurationEngine* _tmp2_ = NULL;
 		gboolean _tmp3_ = FALSE;
 		gboolean _tmp4_ = FALSE;
-#line 599 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 626 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = configuration_facade_get_engine (self);
-#line 599 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 626 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = _tmp1_;
-#line 599 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 626 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = configuration_engine_get_bool_property (_tmp2_, CONFIGURABLE_PROPERTY_DISPLAY_EXTENDED_PROPERTIES, &_inner_error_);
-#line 599 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 626 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp4_ = _tmp3_;
-#line 599 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 626 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp2_);
-#line 599 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 626 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = _tmp4_;
-#line 599 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 626 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 599 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 626 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 3601 "ConfigurationInterfaces.c"
-				goto __catch97_configuration_error;
+#line 3788 "ConfigurationInterfaces.c"
+				goto __catch98_configuration_error;
 			}
-#line 599 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#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);
-#line 599 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 626 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 599 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 626 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return FALSE;
-#line 3610 "ConfigurationInterfaces.c"
+#line 3797 "ConfigurationInterfaces.c"
 		}
-#line 599 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 626 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp0_;
-#line 599 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 626 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 3616 "ConfigurationInterfaces.c"
+#line 3803 "ConfigurationInterfaces.c"
 	}
-	goto __finally97;
-	__catch97_configuration_error:
+	goto __finally98;
+	__catch98_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp5_ = NULL;
-#line 598 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 625 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 598 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 625 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 601 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 628 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp5_ = err;
-#line 601 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 628 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp5_);
-#line 603 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 630 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = FALSE;
-#line 603 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 630 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 603 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 630 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 3637 "ConfigurationInterfaces.c"
+#line 3824 "ConfigurationInterfaces.c"
 	}
-	__finally97:
-#line 598 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally98:
+#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 598 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 625 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
-#line 598 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 625 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return FALSE;
-#line 3646 "ConfigurationInterfaces.c"
+#line 3833 "ConfigurationInterfaces.c"
 }
 
 
 gboolean configuration_facade_get_display_extended_properties (ConfigurationFacade* self) {
-#line 597 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 624 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), FALSE);
-#line 597 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 624 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_display_extended_properties (self);
-#line 3655 "ConfigurationInterfaces.c"
+#line 3842 "ConfigurationInterfaces.c"
 }
 
 
@@ -3666,69 +3853,69 @@ static void configuration_facade_real_set_display_extended_properties (Configura
 		ConfigurationEngine* _tmp0_ = NULL;
 		ConfigurationEngine* _tmp1_ = NULL;
 		gboolean _tmp2_ = FALSE;
-#line 609 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 636 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = configuration_facade_get_engine (self);
-#line 609 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 636 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = _tmp0_;
-#line 609 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 636 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = display;
-#line 609 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 636 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_engine_set_bool_property (_tmp1_, CONFIGURABLE_PROPERTY_DISPLAY_EXTENDED_PROPERTIES, _tmp2_, &_inner_error_);
-#line 609 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 636 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp1_);
-#line 609 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 636 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 609 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 636 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 3679 "ConfigurationInterfaces.c"
-				goto __catch98_configuration_error;
+#line 3866 "ConfigurationInterfaces.c"
+				goto __catch99_configuration_error;
 			}
-#line 609 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#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);
-#line 609 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 636 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 609 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 636 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 3688 "ConfigurationInterfaces.c"
+#line 3875 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally98;
-	__catch98_configuration_error:
+	goto __finally99;
+	__catch99_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
-#line 608 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 635 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 608 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 635 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 612 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 639 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = err;
-#line 612 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 639 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp3_);
-#line 608 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 635 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 3706 "ConfigurationInterfaces.c"
+#line 3893 "ConfigurationInterfaces.c"
 	}
-	__finally98:
-#line 608 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally99:
+#line 635 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 608 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 635 "/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 608 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 635 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		g_clear_error (&_inner_error_);
-#line 608 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 635 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 3717 "ConfigurationInterfaces.c"
+#line 3904 "ConfigurationInterfaces.c"
 	}
 }
 
 
 void configuration_facade_set_display_extended_properties (ConfigurationFacade* self, gboolean display) {
-#line 607 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 634 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
-#line 607 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 634 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_display_extended_properties (self, display);
-#line 3727 "ConfigurationInterfaces.c"
+#line 3914 "ConfigurationInterfaces.c"
 }
 
 
@@ -3741,77 +3928,77 @@ static gboolean configuration_facade_real_get_display_sidebar (ConfigurationFaca
 		ConfigurationEngine* _tmp2_ = NULL;
 		gboolean _tmp3_ = FALSE;
 		gboolean _tmp4_ = FALSE;
-#line 621 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 648 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = configuration_facade_get_engine (self);
-#line 621 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 648 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = _tmp1_;
-#line 621 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 648 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = configuration_engine_get_bool_property (_tmp2_, CONFIGURABLE_PROPERTY_DISPLAY_SIDEBAR, &_inner_error_);
-#line 621 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 648 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp4_ = _tmp3_;
-#line 621 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 648 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp2_);
-#line 621 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 648 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = _tmp4_;
-#line 621 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 648 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 621 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 648 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 3756 "ConfigurationInterfaces.c"
-				goto __catch99_configuration_error;
+#line 3943 "ConfigurationInterfaces.c"
+				goto __catch100_configuration_error;
 			}
-#line 621 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#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);
-#line 621 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 648 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 621 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 648 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return FALSE;
-#line 3765 "ConfigurationInterfaces.c"
+#line 3952 "ConfigurationInterfaces.c"
 		}
-#line 621 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 648 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp0_;
-#line 621 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 648 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 3771 "ConfigurationInterfaces.c"
+#line 3958 "ConfigurationInterfaces.c"
 	}
-	goto __finally99;
-	__catch99_configuration_error:
+	goto __finally100;
+	__catch100_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp5_ = NULL;
-#line 620 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 647 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 620 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 647 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 623 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 650 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp5_ = err;
-#line 623 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 650 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp5_);
-#line 625 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 652 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = FALSE;
-#line 625 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 652 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 625 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 652 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 3792 "ConfigurationInterfaces.c"
+#line 3979 "ConfigurationInterfaces.c"
 	}
-	__finally99:
-#line 620 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally100:
+#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 620 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 647 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
-#line 620 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 647 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return FALSE;
-#line 3801 "ConfigurationInterfaces.c"
+#line 3988 "ConfigurationInterfaces.c"
 }
 
 
 gboolean configuration_facade_get_display_sidebar (ConfigurationFacade* self) {
-#line 619 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 646 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), FALSE);
-#line 619 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 646 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_display_sidebar (self);
-#line 3810 "ConfigurationInterfaces.c"
+#line 3997 "ConfigurationInterfaces.c"
 }
 
 
@@ -3821,69 +4008,69 @@ static void configuration_facade_real_set_display_sidebar (ConfigurationFacade*
 		ConfigurationEngine* _tmp0_ = NULL;
 		ConfigurationEngine* _tmp1_ = NULL;
 		gboolean _tmp2_ = FALSE;
-#line 631 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 658 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = configuration_facade_get_engine (self);
-#line 631 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 658 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = _tmp0_;
-#line 631 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 658 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = display;
-#line 631 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 658 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_engine_set_bool_property (_tmp1_, CONFIGURABLE_PROPERTY_DISPLAY_SIDEBAR, _tmp2_, &_inner_error_);
-#line 631 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 658 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp1_);
-#line 631 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 658 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 631 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 658 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 3834 "ConfigurationInterfaces.c"
-				goto __catch100_configuration_error;
+#line 4021 "ConfigurationInterfaces.c"
+				goto __catch101_configuration_error;
 			}
-#line 631 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#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);
-#line 631 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 658 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 631 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 658 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 3843 "ConfigurationInterfaces.c"
+#line 4030 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally100;
-	__catch100_configuration_error:
+	goto __finally101;
+	__catch101_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
-#line 630 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 657 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 630 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 657 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 633 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 660 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = err;
-#line 633 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 660 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp3_);
-#line 630 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 657 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 3861 "ConfigurationInterfaces.c"
+#line 4048 "ConfigurationInterfaces.c"
 	}
-	__finally100:
-#line 630 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally101:
+#line 657 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 630 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 657 "/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 630 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 657 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		g_clear_error (&_inner_error_);
-#line 630 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 657 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 3872 "ConfigurationInterfaces.c"
+#line 4059 "ConfigurationInterfaces.c"
 	}
 }
 
 
 void configuration_facade_set_display_sidebar (ConfigurationFacade* self, gboolean display) {
-#line 629 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 656 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
-#line 629 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 656 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_display_sidebar (self, display);
-#line 3882 "ConfigurationInterfaces.c"
+#line 4069 "ConfigurationInterfaces.c"
 }
 
 
@@ -3896,77 +4083,77 @@ static gboolean configuration_facade_real_get_display_toolbar (ConfigurationFaca
 		ConfigurationEngine* _tmp2_ = NULL;
 		gboolean _tmp3_ = FALSE;
 		gboolean _tmp4_ = FALSE;
-#line 643 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 670 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = configuration_facade_get_engine (self);
-#line 643 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 670 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = _tmp1_;
-#line 643 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 670 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = configuration_engine_get_bool_property (_tmp2_, CONFIGURABLE_PROPERTY_DISPLAY_TOOLBAR, &_inner_error_);
-#line 643 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 670 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp4_ = _tmp3_;
-#line 643 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 670 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp2_);
-#line 643 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 670 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = _tmp4_;
-#line 643 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 670 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 643 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 670 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 3911 "ConfigurationInterfaces.c"
-				goto __catch101_configuration_error;
+#line 4098 "ConfigurationInterfaces.c"
+				goto __catch102_configuration_error;
 			}
-#line 643 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#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);
-#line 643 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 670 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 643 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 670 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return FALSE;
-#line 3920 "ConfigurationInterfaces.c"
+#line 4107 "ConfigurationInterfaces.c"
 		}
-#line 643 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 670 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp0_;
-#line 643 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 670 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 3926 "ConfigurationInterfaces.c"
+#line 4113 "ConfigurationInterfaces.c"
 	}
-	goto __finally101;
-	__catch101_configuration_error:
+	goto __finally102;
+	__catch102_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp5_ = NULL;
-#line 642 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 669 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 642 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 669 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 645 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 672 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp5_ = err;
-#line 645 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 672 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp5_);
-#line 647 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 674 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = FALSE;
-#line 647 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 674 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 647 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 674 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 3947 "ConfigurationInterfaces.c"
+#line 4134 "ConfigurationInterfaces.c"
 	}
-	__finally101:
-#line 642 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally102:
+#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 642 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 669 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
-#line 642 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 669 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return FALSE;
-#line 3956 "ConfigurationInterfaces.c"
+#line 4143 "ConfigurationInterfaces.c"
 }
 
 
 gboolean configuration_facade_get_display_toolbar (ConfigurationFacade* self) {
-#line 641 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 668 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), FALSE);
-#line 641 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 668 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_display_toolbar (self);
-#line 3965 "ConfigurationInterfaces.c"
+#line 4152 "ConfigurationInterfaces.c"
 }
 
 
@@ -3976,69 +4163,69 @@ static void configuration_facade_real_set_display_toolbar (ConfigurationFacade*
 		ConfigurationEngine* _tmp0_ = NULL;
 		ConfigurationEngine* _tmp1_ = NULL;
 		gboolean _tmp2_ = FALSE;
-#line 653 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 680 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = configuration_facade_get_engine (self);
-#line 653 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 680 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = _tmp0_;
-#line 653 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 680 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = display;
-#line 653 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 680 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_engine_set_bool_property (_tmp1_, CONFIGURABLE_PROPERTY_DISPLAY_TOOLBAR, _tmp2_, &_inner_error_);
-#line 653 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 680 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp1_);
-#line 653 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 680 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 653 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 680 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 3989 "ConfigurationInterfaces.c"
-				goto __catch102_configuration_error;
+#line 4176 "ConfigurationInterfaces.c"
+				goto __catch103_configuration_error;
 			}
-#line 653 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#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);
-#line 653 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 680 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 653 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 680 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 3998 "ConfigurationInterfaces.c"
+#line 4185 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally102;
-	__catch102_configuration_error:
+	goto __finally103;
+	__catch103_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
-#line 652 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 679 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 652 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 679 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 655 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 682 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = err;
-#line 655 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 682 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp3_);
-#line 652 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 679 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 4016 "ConfigurationInterfaces.c"
+#line 4203 "ConfigurationInterfaces.c"
 	}
-	__finally102:
-#line 652 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally103:
+#line 679 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 652 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 679 "/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 652 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 679 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		g_clear_error (&_inner_error_);
-#line 652 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 679 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 4027 "ConfigurationInterfaces.c"
+#line 4214 "ConfigurationInterfaces.c"
 	}
 }
 
 
 void configuration_facade_set_display_toolbar (ConfigurationFacade* self, gboolean display) {
-#line 651 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 678 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
-#line 651 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 678 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_display_toolbar (self, display);
-#line 4037 "ConfigurationInterfaces.c"
+#line 4224 "ConfigurationInterfaces.c"
 }
 
 
@@ -4051,77 +4238,77 @@ static gboolean configuration_facade_real_get_display_search_bar (ConfigurationF
 		ConfigurationEngine* _tmp2_ = NULL;
 		gboolean _tmp3_ = FALSE;
 		gboolean _tmp4_ = FALSE;
-#line 664 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 691 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = configuration_facade_get_engine (self);
-#line 664 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 691 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = _tmp1_;
-#line 664 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 691 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = configuration_engine_get_bool_property (_tmp2_, CONFIGURABLE_PROPERTY_DISPLAY_SEARCH_BAR, &_inner_error_);
-#line 664 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 691 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp4_ = _tmp3_;
-#line 664 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 691 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp2_);
-#line 664 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 691 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = _tmp4_;
-#line 664 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 691 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 664 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 691 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 4066 "ConfigurationInterfaces.c"
-				goto __catch103_configuration_error;
+#line 4253 "ConfigurationInterfaces.c"
+				goto __catch104_configuration_error;
 			}
-#line 664 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#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);
-#line 664 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 691 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 664 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 691 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return FALSE;
-#line 4075 "ConfigurationInterfaces.c"
+#line 4262 "ConfigurationInterfaces.c"
 		}
-#line 664 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 691 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp0_;
-#line 664 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 691 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 4081 "ConfigurationInterfaces.c"
+#line 4268 "ConfigurationInterfaces.c"
 	}
-	goto __finally103;
-	__catch103_configuration_error:
+	goto __finally104;
+	__catch104_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp5_ = NULL;
-#line 663 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 690 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 663 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 690 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 666 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 693 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp5_ = err;
-#line 666 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 693 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp5_);
-#line 668 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 695 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = FALSE;
-#line 668 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 695 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 668 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 695 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 4102 "ConfigurationInterfaces.c"
+#line 4289 "ConfigurationInterfaces.c"
 	}
-	__finally103:
-#line 663 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally104:
+#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 663 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 690 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
-#line 663 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 690 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return FALSE;
-#line 4111 "ConfigurationInterfaces.c"
+#line 4298 "ConfigurationInterfaces.c"
 }
 
 
 gboolean configuration_facade_get_display_search_bar (ConfigurationFacade* self) {
-#line 662 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 689 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), FALSE);
-#line 662 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 689 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_display_search_bar (self);
-#line 4120 "ConfigurationInterfaces.c"
+#line 4307 "ConfigurationInterfaces.c"
 }
 
 
@@ -4131,69 +4318,69 @@ static void configuration_facade_real_set_display_search_bar (ConfigurationFacad
 		ConfigurationEngine* _tmp0_ = NULL;
 		ConfigurationEngine* _tmp1_ = NULL;
 		gboolean _tmp2_ = FALSE;
-#line 674 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 701 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = configuration_facade_get_engine (self);
-#line 674 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 701 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = _tmp0_;
-#line 674 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 701 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = display;
-#line 674 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 701 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_engine_set_bool_property (_tmp1_, CONFIGURABLE_PROPERTY_DISPLAY_SEARCH_BAR, _tmp2_, &_inner_error_);
-#line 674 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 701 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp1_);
-#line 674 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 701 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 674 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 701 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 4144 "ConfigurationInterfaces.c"
-				goto __catch104_configuration_error;
+#line 4331 "ConfigurationInterfaces.c"
+				goto __catch105_configuration_error;
 			}
-#line 674 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#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);
-#line 674 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 701 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 674 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 701 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 4153 "ConfigurationInterfaces.c"
+#line 4340 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally104;
-	__catch104_configuration_error:
+	goto __finally105;
+	__catch105_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
-#line 673 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 700 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 673 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 700 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 676 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 703 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = err;
-#line 676 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 703 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp3_);
-#line 673 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 700 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 4171 "ConfigurationInterfaces.c"
+#line 4358 "ConfigurationInterfaces.c"
 	}
-	__finally104:
-#line 673 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally105:
+#line 700 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 673 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 700 "/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 673 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 700 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		g_clear_error (&_inner_error_);
-#line 673 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 700 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 4182 "ConfigurationInterfaces.c"
+#line 4369 "ConfigurationInterfaces.c"
 	}
 }
 
 
 void configuration_facade_set_display_search_bar (ConfigurationFacade* self, gboolean display) {
-#line 672 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 699 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
-#line 672 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 699 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_display_search_bar (self, display);
-#line 4192 "ConfigurationInterfaces.c"
+#line 4379 "ConfigurationInterfaces.c"
 }
 
 
@@ -4206,77 +4393,77 @@ static gboolean configuration_facade_real_get_display_photo_ratings (Configurati
 		ConfigurationEngine* _tmp2_ = NULL;
 		gboolean _tmp3_ = FALSE;
 		gboolean _tmp4_ = FALSE;
-#line 685 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 712 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = configuration_facade_get_engine (self);
-#line 685 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 712 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = _tmp1_;
-#line 685 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 712 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = configuration_engine_get_bool_property (_tmp2_, CONFIGURABLE_PROPERTY_DISPLAY_PHOTO_RATINGS, &_inner_error_);
-#line 685 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 712 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp4_ = _tmp3_;
-#line 685 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 712 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp2_);
-#line 685 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 712 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = _tmp4_;
-#line 685 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 712 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 685 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 712 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 4221 "ConfigurationInterfaces.c"
-				goto __catch105_configuration_error;
+#line 4408 "ConfigurationInterfaces.c"
+				goto __catch106_configuration_error;
 			}
-#line 685 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#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);
-#line 685 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 712 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 685 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 712 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return FALSE;
-#line 4230 "ConfigurationInterfaces.c"
+#line 4417 "ConfigurationInterfaces.c"
 		}
-#line 685 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 712 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp0_;
-#line 685 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 712 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 4236 "ConfigurationInterfaces.c"
+#line 4423 "ConfigurationInterfaces.c"
 	}
-	goto __finally105;
-	__catch105_configuration_error:
+	goto __finally106;
+	__catch106_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp5_ = NULL;
-#line 684 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 711 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 684 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 711 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 687 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 714 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp5_ = err;
-#line 687 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 714 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp5_);
-#line 689 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 716 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = TRUE;
-#line 689 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 716 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 689 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 716 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 4257 "ConfigurationInterfaces.c"
+#line 4444 "ConfigurationInterfaces.c"
 	}
-	__finally105:
-#line 684 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally106:
+#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 684 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 711 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
-#line 684 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 711 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return FALSE;
-#line 4266 "ConfigurationInterfaces.c"
+#line 4453 "ConfigurationInterfaces.c"
 }
 
 
 gboolean configuration_facade_get_display_photo_ratings (ConfigurationFacade* self) {
-#line 683 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 710 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), FALSE);
-#line 683 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 710 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_display_photo_ratings (self);
-#line 4275 "ConfigurationInterfaces.c"
+#line 4462 "ConfigurationInterfaces.c"
 }
 
 
@@ -4286,69 +4473,69 @@ static void configuration_facade_real_set_display_photo_ratings (ConfigurationFa
 		ConfigurationEngine* _tmp0_ = NULL;
 		ConfigurationEngine* _tmp1_ = NULL;
 		gboolean _tmp2_ = FALSE;
-#line 695 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 722 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = configuration_facade_get_engine (self);
-#line 695 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 722 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = _tmp0_;
-#line 695 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 722 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = display;
-#line 695 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 722 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_engine_set_bool_property (_tmp1_, CONFIGURABLE_PROPERTY_DISPLAY_PHOTO_RATINGS, _tmp2_, &_inner_error_);
-#line 695 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 722 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp1_);
-#line 695 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 722 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 695 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 722 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 4299 "ConfigurationInterfaces.c"
-				goto __catch106_configuration_error;
+#line 4486 "ConfigurationInterfaces.c"
+				goto __catch107_configuration_error;
 			}
-#line 695 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#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);
-#line 695 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 722 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 695 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 722 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 4308 "ConfigurationInterfaces.c"
+#line 4495 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally106;
-	__catch106_configuration_error:
+	goto __finally107;
+	__catch107_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
-#line 694 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 721 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 694 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 721 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 697 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 724 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = err;
-#line 697 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 724 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp3_);
-#line 694 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 721 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 4326 "ConfigurationInterfaces.c"
+#line 4513 "ConfigurationInterfaces.c"
 	}
-	__finally106:
-#line 694 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally107:
+#line 721 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 694 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 721 "/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 694 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 721 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		g_clear_error (&_inner_error_);
-#line 694 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 721 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 4337 "ConfigurationInterfaces.c"
+#line 4524 "ConfigurationInterfaces.c"
 	}
 }
 
 
 void configuration_facade_set_display_photo_ratings (ConfigurationFacade* self, gboolean display) {
-#line 693 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 720 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
-#line 693 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 720 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_display_photo_ratings (self, display);
-#line 4347 "ConfigurationInterfaces.c"
+#line 4534 "ConfigurationInterfaces.c"
 }
 
 
@@ -4361,77 +4548,77 @@ static gboolean configuration_facade_real_get_display_photo_tags (ConfigurationF
 		ConfigurationEngine* _tmp2_ = NULL;
 		gboolean _tmp3_ = FALSE;
 		gboolean _tmp4_ = FALSE;
-#line 706 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 733 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = configuration_facade_get_engine (self);
-#line 706 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 733 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = _tmp1_;
-#line 706 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 733 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = configuration_engine_get_bool_property (_tmp2_, CONFIGURABLE_PROPERTY_DISPLAY_PHOTO_TAGS, &_inner_error_);
-#line 706 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 733 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp4_ = _tmp3_;
-#line 706 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 733 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp2_);
-#line 706 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 733 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = _tmp4_;
-#line 706 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 733 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 706 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 733 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 4376 "ConfigurationInterfaces.c"
-				goto __catch107_configuration_error;
+#line 4563 "ConfigurationInterfaces.c"
+				goto __catch108_configuration_error;
 			}
-#line 706 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#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);
-#line 706 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 733 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 706 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 733 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return FALSE;
-#line 4385 "ConfigurationInterfaces.c"
+#line 4572 "ConfigurationInterfaces.c"
 		}
-#line 706 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 733 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp0_;
-#line 706 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 733 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 4391 "ConfigurationInterfaces.c"
+#line 4578 "ConfigurationInterfaces.c"
 	}
-	goto __finally107;
-	__catch107_configuration_error:
+	goto __finally108;
+	__catch108_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp5_ = NULL;
-#line 705 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 732 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 705 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 732 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 708 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 735 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp5_ = err;
-#line 708 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 735 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp5_);
-#line 710 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 737 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = TRUE;
-#line 710 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 737 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 710 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 737 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 4412 "ConfigurationInterfaces.c"
+#line 4599 "ConfigurationInterfaces.c"
 	}
-	__finally107:
-#line 705 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally108:
+#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 705 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 732 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
-#line 705 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 732 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return FALSE;
-#line 4421 "ConfigurationInterfaces.c"
+#line 4608 "ConfigurationInterfaces.c"
 }
 
 
 gboolean configuration_facade_get_display_photo_tags (ConfigurationFacade* self) {
-#line 704 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 731 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), FALSE);
-#line 704 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 731 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_display_photo_tags (self);
-#line 4430 "ConfigurationInterfaces.c"
+#line 4617 "ConfigurationInterfaces.c"
 }
 
 
@@ -4441,69 +4628,69 @@ static void configuration_facade_real_set_display_photo_tags (ConfigurationFacad
 		ConfigurationEngine* _tmp0_ = NULL;
 		ConfigurationEngine* _tmp1_ = NULL;
 		gboolean _tmp2_ = FALSE;
-#line 716 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 743 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = configuration_facade_get_engine (self);
-#line 716 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 743 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = _tmp0_;
-#line 716 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 743 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = display;
-#line 716 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 743 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_engine_set_bool_property (_tmp1_, CONFIGURABLE_PROPERTY_DISPLAY_PHOTO_TAGS, _tmp2_, &_inner_error_);
-#line 716 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 743 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp1_);
-#line 716 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 743 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 716 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 743 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 4454 "ConfigurationInterfaces.c"
-				goto __catch108_configuration_error;
+#line 4641 "ConfigurationInterfaces.c"
+				goto __catch109_configuration_error;
 			}
-#line 716 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#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);
-#line 716 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 743 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 716 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 743 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 4463 "ConfigurationInterfaces.c"
+#line 4650 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally108;
-	__catch108_configuration_error:
+	goto __finally109;
+	__catch109_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
-#line 715 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 742 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 715 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 742 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 718 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 745 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = err;
-#line 718 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 745 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp3_);
-#line 715 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 742 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 4481 "ConfigurationInterfaces.c"
+#line 4668 "ConfigurationInterfaces.c"
 	}
-	__finally108:
-#line 715 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally109:
+#line 742 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 715 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 742 "/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 715 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 742 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		g_clear_error (&_inner_error_);
-#line 715 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 742 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 4492 "ConfigurationInterfaces.c"
+#line 4679 "ConfigurationInterfaces.c"
 	}
 }
 
 
 void configuration_facade_set_display_photo_tags (ConfigurationFacade* self, gboolean display) {
-#line 714 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 741 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
-#line 714 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 741 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_display_photo_tags (self, display);
-#line 4502 "ConfigurationInterfaces.c"
+#line 4689 "ConfigurationInterfaces.c"
 }
 
 
@@ -4516,77 +4703,77 @@ static gboolean configuration_facade_real_get_display_photo_titles (Configuratio
 		ConfigurationEngine* _tmp2_ = NULL;
 		gboolean _tmp3_ = FALSE;
 		gboolean _tmp4_ = FALSE;
-#line 727 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 754 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = configuration_facade_get_engine (self);
-#line 727 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 754 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = _tmp1_;
-#line 727 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 754 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = configuration_engine_get_bool_property (_tmp2_, CONFIGURABLE_PROPERTY_DISPLAY_PHOTO_TITLES, &_inner_error_);
-#line 727 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 754 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp4_ = _tmp3_;
-#line 727 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 754 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp2_);
-#line 727 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 754 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = _tmp4_;
-#line 727 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 754 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 727 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 754 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 4531 "ConfigurationInterfaces.c"
-				goto __catch109_configuration_error;
+#line 4718 "ConfigurationInterfaces.c"
+				goto __catch110_configuration_error;
 			}
-#line 727 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#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);
-#line 727 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 754 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 727 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 754 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return FALSE;
-#line 4540 "ConfigurationInterfaces.c"
+#line 4727 "ConfigurationInterfaces.c"
 		}
-#line 727 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 754 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp0_;
-#line 727 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 754 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 4546 "ConfigurationInterfaces.c"
+#line 4733 "ConfigurationInterfaces.c"
 	}
-	goto __finally109;
-	__catch109_configuration_error:
+	goto __finally110;
+	__catch110_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp5_ = NULL;
-#line 726 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 753 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 726 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 753 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 729 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 756 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp5_ = err;
-#line 729 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 756 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp5_);
-#line 731 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 758 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = FALSE;
-#line 731 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 758 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 731 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 758 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 4567 "ConfigurationInterfaces.c"
+#line 4754 "ConfigurationInterfaces.c"
 	}
-	__finally109:
-#line 726 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally110:
+#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 726 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 753 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
-#line 726 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 753 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return FALSE;
-#line 4576 "ConfigurationInterfaces.c"
+#line 4763 "ConfigurationInterfaces.c"
 }
 
 
 gboolean configuration_facade_get_display_photo_titles (ConfigurationFacade* self) {
-#line 725 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 752 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), FALSE);
-#line 725 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 752 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_display_photo_titles (self);
-#line 4585 "ConfigurationInterfaces.c"
+#line 4772 "ConfigurationInterfaces.c"
 }
 
 
@@ -4596,69 +4783,69 @@ static void configuration_facade_real_set_display_photo_titles (ConfigurationFac
 		ConfigurationEngine* _tmp0_ = NULL;
 		ConfigurationEngine* _tmp1_ = NULL;
 		gboolean _tmp2_ = FALSE;
-#line 737 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 764 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = configuration_facade_get_engine (self);
-#line 737 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 764 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = _tmp0_;
-#line 737 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 764 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = display;
-#line 737 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 764 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_engine_set_bool_property (_tmp1_, CONFIGURABLE_PROPERTY_DISPLAY_PHOTO_TITLES, _tmp2_, &_inner_error_);
-#line 737 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 764 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp1_);
-#line 737 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 764 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 737 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 764 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 4609 "ConfigurationInterfaces.c"
-				goto __catch110_configuration_error;
+#line 4796 "ConfigurationInterfaces.c"
+				goto __catch111_configuration_error;
 			}
-#line 737 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#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);
-#line 737 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 764 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 737 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 764 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 4618 "ConfigurationInterfaces.c"
+#line 4805 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally110;
-	__catch110_configuration_error:
+	goto __finally111;
+	__catch111_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
-#line 736 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 763 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 736 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 763 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 739 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 766 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = err;
-#line 739 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 766 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp3_);
-#line 736 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 763 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 4636 "ConfigurationInterfaces.c"
+#line 4823 "ConfigurationInterfaces.c"
 	}
-	__finally110:
-#line 736 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally111:
+#line 763 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 736 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 763 "/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 736 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 763 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		g_clear_error (&_inner_error_);
-#line 736 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 763 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 4647 "ConfigurationInterfaces.c"
+#line 4834 "ConfigurationInterfaces.c"
 	}
 }
 
 
 void configuration_facade_set_display_photo_titles (ConfigurationFacade* self, gboolean display) {
-#line 735 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 762 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
-#line 735 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 762 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_display_photo_titles (self, display);
-#line 4657 "ConfigurationInterfaces.c"
+#line 4844 "ConfigurationInterfaces.c"
 }
 
 
@@ -4671,77 +4858,77 @@ static gboolean configuration_facade_real_get_display_photo_comments (Configurat
 		ConfigurationEngine* _tmp2_ = NULL;
 		gboolean _tmp3_ = FALSE;
 		gboolean _tmp4_ = FALSE;
-#line 748 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 775 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = configuration_facade_get_engine (self);
-#line 748 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 775 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = _tmp1_;
-#line 748 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 775 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = configuration_engine_get_bool_property (_tmp2_, CONFIGURABLE_PROPERTY_DISPLAY_PHOTO_COMMENTS, &_inner_error_);
-#line 748 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 775 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp4_ = _tmp3_;
-#line 748 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 775 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp2_);
-#line 748 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 775 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = _tmp4_;
-#line 748 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 775 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 748 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 775 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 4686 "ConfigurationInterfaces.c"
-				goto __catch111_configuration_error;
+#line 4873 "ConfigurationInterfaces.c"
+				goto __catch112_configuration_error;
 			}
-#line 748 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#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);
-#line 748 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 775 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 748 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 775 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return FALSE;
-#line 4695 "ConfigurationInterfaces.c"
+#line 4882 "ConfigurationInterfaces.c"
 		}
-#line 748 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 775 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp0_;
-#line 748 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 775 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 4701 "ConfigurationInterfaces.c"
+#line 4888 "ConfigurationInterfaces.c"
 	}
-	goto __finally111;
-	__catch111_configuration_error:
+	goto __finally112;
+	__catch112_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp5_ = NULL;
-#line 747 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 774 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 747 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 774 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 750 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 777 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp5_ = err;
-#line 750 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 777 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp5_);
-#line 752 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 779 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = FALSE;
-#line 752 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 779 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 752 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 779 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 4722 "ConfigurationInterfaces.c"
+#line 4909 "ConfigurationInterfaces.c"
 	}
-	__finally111:
-#line 747 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally112:
+#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 747 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 774 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
-#line 747 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 774 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return FALSE;
-#line 4731 "ConfigurationInterfaces.c"
+#line 4918 "ConfigurationInterfaces.c"
 }
 
 
 gboolean configuration_facade_get_display_photo_comments (ConfigurationFacade* self) {
-#line 746 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 773 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), FALSE);
-#line 746 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 773 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_display_photo_comments (self);
-#line 4740 "ConfigurationInterfaces.c"
+#line 4927 "ConfigurationInterfaces.c"
 }
 
 
@@ -4751,69 +4938,69 @@ static void configuration_facade_real_set_display_photo_comments (ConfigurationF
 		ConfigurationEngine* _tmp0_ = NULL;
 		ConfigurationEngine* _tmp1_ = NULL;
 		gboolean _tmp2_ = FALSE;
-#line 758 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 785 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = configuration_facade_get_engine (self);
-#line 758 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 785 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = _tmp0_;
-#line 758 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 785 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = display;
-#line 758 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 785 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_engine_set_bool_property (_tmp1_, CONFIGURABLE_PROPERTY_DISPLAY_PHOTO_COMMENTS, _tmp2_, &_inner_error_);
-#line 758 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 785 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp1_);
-#line 758 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 785 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 758 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 785 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 4764 "ConfigurationInterfaces.c"
-				goto __catch112_configuration_error;
+#line 4951 "ConfigurationInterfaces.c"
+				goto __catch113_configuration_error;
 			}
-#line 758 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#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);
-#line 758 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 785 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 758 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 785 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 4773 "ConfigurationInterfaces.c"
+#line 4960 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally112;
-	__catch112_configuration_error:
+	goto __finally113;
+	__catch113_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
-#line 757 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 784 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 757 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 784 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 760 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 787 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = err;
-#line 760 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 787 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp3_);
-#line 757 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 784 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 4791 "ConfigurationInterfaces.c"
+#line 4978 "ConfigurationInterfaces.c"
 	}
-	__finally112:
-#line 757 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally113:
+#line 784 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 757 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 784 "/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 757 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 784 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		g_clear_error (&_inner_error_);
-#line 757 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 784 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 4802 "ConfigurationInterfaces.c"
+#line 4989 "ConfigurationInterfaces.c"
 	}
 }
 
 
 void configuration_facade_set_display_photo_comments (ConfigurationFacade* self, gboolean display) {
-#line 756 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 783 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
-#line 756 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 783 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_display_photo_comments (self, display);
-#line 4812 "ConfigurationInterfaces.c"
+#line 4999 "ConfigurationInterfaces.c"
 }
 
 
@@ -4826,77 +5013,77 @@ static gboolean configuration_facade_real_get_display_event_comments (Configurat
 		ConfigurationEngine* _tmp2_ = NULL;
 		gboolean _tmp3_ = FALSE;
 		gboolean _tmp4_ = FALSE;
-#line 769 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 796 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = configuration_facade_get_engine (self);
-#line 769 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 796 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = _tmp1_;
-#line 769 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 796 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = configuration_engine_get_bool_property (_tmp2_, CONFIGURABLE_PROPERTY_DISPLAY_EVENT_COMMENTS, &_inner_error_);
-#line 769 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 796 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp4_ = _tmp3_;
-#line 769 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 796 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp2_);
-#line 769 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 796 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = _tmp4_;
-#line 769 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 796 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 769 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 796 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 4841 "ConfigurationInterfaces.c"
-				goto __catch113_configuration_error;
+#line 5028 "ConfigurationInterfaces.c"
+				goto __catch114_configuration_error;
 			}
-#line 769 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#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);
-#line 769 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 796 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 769 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 796 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return FALSE;
-#line 4850 "ConfigurationInterfaces.c"
+#line 5037 "ConfigurationInterfaces.c"
 		}
-#line 769 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 796 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp0_;
-#line 769 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 796 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 4856 "ConfigurationInterfaces.c"
+#line 5043 "ConfigurationInterfaces.c"
 	}
-	goto __finally113;
-	__catch113_configuration_error:
+	goto __finally114;
+	__catch114_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp5_ = NULL;
-#line 768 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 795 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 768 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 795 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 771 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 798 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp5_ = err;
-#line 771 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 798 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp5_);
-#line 773 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 800 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = FALSE;
-#line 773 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 800 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 773 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 800 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 4877 "ConfigurationInterfaces.c"
+#line 5064 "ConfigurationInterfaces.c"
 	}
-	__finally113:
-#line 768 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally114:
+#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 768 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 795 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
-#line 768 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 795 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return FALSE;
-#line 4886 "ConfigurationInterfaces.c"
+#line 5073 "ConfigurationInterfaces.c"
 }
 
 
 gboolean configuration_facade_get_display_event_comments (ConfigurationFacade* self) {
-#line 767 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 794 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), FALSE);
-#line 767 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 794 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_display_event_comments (self);
-#line 4895 "ConfigurationInterfaces.c"
+#line 5082 "ConfigurationInterfaces.c"
 }
 
 
@@ -4906,69 +5093,69 @@ static void configuration_facade_real_set_display_event_comments (ConfigurationF
 		ConfigurationEngine* _tmp0_ = NULL;
 		ConfigurationEngine* _tmp1_ = NULL;
 		gboolean _tmp2_ = FALSE;
-#line 779 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 806 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = configuration_facade_get_engine (self);
-#line 779 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 806 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = _tmp0_;
-#line 779 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 806 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = display;
-#line 779 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 806 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_engine_set_bool_property (_tmp1_, CONFIGURABLE_PROPERTY_DISPLAY_EVENT_COMMENTS, _tmp2_, &_inner_error_);
-#line 779 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 806 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp1_);
-#line 779 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 806 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 779 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 806 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 4919 "ConfigurationInterfaces.c"
-				goto __catch114_configuration_error;
+#line 5106 "ConfigurationInterfaces.c"
+				goto __catch115_configuration_error;
 			}
-#line 779 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#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);
-#line 779 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 806 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 779 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 806 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 4928 "ConfigurationInterfaces.c"
+#line 5115 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally114;
-	__catch114_configuration_error:
+	goto __finally115;
+	__catch115_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
-#line 778 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 805 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 778 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 805 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 781 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 808 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = err;
-#line 781 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 808 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp3_);
-#line 778 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 805 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 4946 "ConfigurationInterfaces.c"
+#line 5133 "ConfigurationInterfaces.c"
 	}
-	__finally114:
-#line 778 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally115:
+#line 805 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 778 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 805 "/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 778 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 805 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		g_clear_error (&_inner_error_);
-#line 778 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 805 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 4957 "ConfigurationInterfaces.c"
+#line 5144 "ConfigurationInterfaces.c"
 	}
 }
 
 
 void configuration_facade_set_display_event_comments (ConfigurationFacade* self, gboolean display) {
-#line 777 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 804 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
-#line 777 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 804 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_display_event_comments (self, display);
-#line 4967 "ConfigurationInterfaces.c"
+#line 5154 "ConfigurationInterfaces.c"
 }
 
 
@@ -4976,11 +5163,11 @@ static void configuration_facade_real_get_event_photos_sort (ConfigurationFacade
 	gboolean _vala_sort_order = FALSE;
 	gint _vala_sort_by = 0;
 	GError * _inner_error_ = NULL;
-#line 789 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 816 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_vala_sort_order = FALSE;
-#line 790 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 817 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_vala_sort_by = 2;
-#line 4979 "ConfigurationInterfaces.c"
+#line 5166 "ConfigurationInterfaces.c"
 	{
 		gboolean _tmp0_ = FALSE;
 		ConfigurationEngine* _tmp1_ = NULL;
@@ -4992,115 +5179,115 @@ static void configuration_facade_real_get_event_photos_sort (ConfigurationFacade
 		ConfigurationEngine* _tmp7_ = NULL;
 		gint _tmp8_ = 0;
 		gint _tmp9_ = 0;
-#line 792 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 819 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = configuration_facade_get_engine (self);
-#line 792 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 819 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = _tmp1_;
-#line 792 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 819 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = configuration_engine_get_bool_property (_tmp2_, CONFIGURABLE_PROPERTY_EVENT_PHOTOS_SORT_ASCENDING, &_inner_error_);
-#line 792 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 819 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp4_ = _tmp3_;
-#line 792 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 819 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp2_);
-#line 792 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 819 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = _tmp4_;
-#line 792 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 819 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 792 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 819 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 5007 "ConfigurationInterfaces.c"
-				goto __catch115_configuration_error;
+#line 5194 "ConfigurationInterfaces.c"
+				goto __catch116_configuration_error;
 			}
-#line 792 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#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);
-#line 792 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 819 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 792 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 819 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 5016 "ConfigurationInterfaces.c"
+#line 5203 "ConfigurationInterfaces.c"
 		}
-#line 792 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 819 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_vala_sort_order = _tmp0_;
-#line 794 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 821 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp6_ = configuration_facade_get_engine (self);
-#line 794 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 821 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp7_ = _tmp6_;
-#line 794 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 821 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp8_ = configuration_engine_get_int_property (_tmp7_, CONFIGURABLE_PROPERTY_EVENT_PHOTOS_SORT_BY, &_inner_error_);
-#line 794 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 821 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp9_ = _tmp8_;
-#line 794 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 821 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp7_);
-#line 794 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 821 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp5_ = _tmp9_;
-#line 794 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 821 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 794 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 821 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 5036 "ConfigurationInterfaces.c"
-				goto __catch115_configuration_error;
+#line 5223 "ConfigurationInterfaces.c"
+				goto __catch116_configuration_error;
 			}
-#line 794 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#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);
-#line 794 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 821 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 794 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 821 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 5045 "ConfigurationInterfaces.c"
+#line 5232 "ConfigurationInterfaces.c"
 		}
-#line 794 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 821 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_vala_sort_by = _tmp5_;
-#line 5049 "ConfigurationInterfaces.c"
+#line 5236 "ConfigurationInterfaces.c"
 	}
-	goto __finally115;
-	__catch115_configuration_error:
+	goto __finally116;
+	__catch116_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp10_ = NULL;
-#line 791 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 818 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 791 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 818 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 796 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 823 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp10_ = err;
-#line 796 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 823 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp10_);
-#line 791 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 818 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 5066 "ConfigurationInterfaces.c"
+#line 5253 "ConfigurationInterfaces.c"
 	}
-	__finally115:
-#line 791 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally116:
+#line 818 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 791 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 818 "/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 791 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 818 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		g_clear_error (&_inner_error_);
-#line 791 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 818 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 5077 "ConfigurationInterfaces.c"
+#line 5264 "ConfigurationInterfaces.c"
 	}
-#line 788 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 815 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (sort_order) {
-#line 788 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 815 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		*sort_order = _vala_sort_order;
-#line 5083 "ConfigurationInterfaces.c"
+#line 5270 "ConfigurationInterfaces.c"
 	}
-#line 788 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 815 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (sort_by) {
-#line 788 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 815 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		*sort_by = _vala_sort_by;
-#line 5089 "ConfigurationInterfaces.c"
+#line 5276 "ConfigurationInterfaces.c"
 	}
 }
 
 
 void configuration_facade_get_event_photos_sort (ConfigurationFacade* self, gboolean* sort_order, gint* sort_by) {
-#line 788 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 815 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
-#line 788 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#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 5099 "ConfigurationInterfaces.c"
+#line 5286 "ConfigurationInterfaces.c"
 }
 
 
@@ -5113,94 +5300,94 @@ static void configuration_facade_real_set_event_photos_sort (ConfigurationFacade
 		ConfigurationEngine* _tmp3_ = NULL;
 		ConfigurationEngine* _tmp4_ = NULL;
 		gint _tmp5_ = 0;
-#line 802 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 829 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = configuration_facade_get_engine (self);
-#line 802 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 829 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = _tmp0_;
-#line 802 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 829 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = sort_order;
-#line 802 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 829 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_engine_set_bool_property (_tmp1_, CONFIGURABLE_PROPERTY_EVENT_PHOTOS_SORT_ASCENDING, _tmp2_, &_inner_error_);
-#line 802 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 829 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp1_);
-#line 802 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 829 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 802 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 829 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 5126 "ConfigurationInterfaces.c"
-				goto __catch116_configuration_error;
+#line 5313 "ConfigurationInterfaces.c"
+				goto __catch117_configuration_error;
 			}
-#line 802 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#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);
-#line 802 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 829 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 802 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 829 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 5135 "ConfigurationInterfaces.c"
+#line 5322 "ConfigurationInterfaces.c"
 		}
-#line 804 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 831 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = configuration_facade_get_engine (self);
-#line 804 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 831 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp4_ = _tmp3_;
-#line 804 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 831 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp5_ = sort_by;
-#line 804 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 831 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_engine_set_int_property (_tmp4_, CONFIGURABLE_PROPERTY_EVENT_PHOTOS_SORT_BY, _tmp5_, &_inner_error_);
-#line 804 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 831 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp4_);
-#line 804 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 831 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 804 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 831 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 5151 "ConfigurationInterfaces.c"
-				goto __catch116_configuration_error;
+#line 5338 "ConfigurationInterfaces.c"
+				goto __catch117_configuration_error;
 			}
-#line 804 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#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);
-#line 804 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 831 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 804 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 831 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 5160 "ConfigurationInterfaces.c"
+#line 5347 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally116;
-	__catch116_configuration_error:
+	goto __finally117;
+	__catch117_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp6_ = NULL;
-#line 801 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 828 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 801 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 828 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 807 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 834 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp6_ = err;
-#line 807 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 834 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp6_);
-#line 801 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 828 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 5178 "ConfigurationInterfaces.c"
+#line 5365 "ConfigurationInterfaces.c"
 	}
-	__finally116:
-#line 801 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally117:
+#line 828 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 801 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 828 "/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 801 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 828 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		g_clear_error (&_inner_error_);
-#line 801 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 828 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 5189 "ConfigurationInterfaces.c"
+#line 5376 "ConfigurationInterfaces.c"
 	}
 }
 
 
 void configuration_facade_set_event_photos_sort (ConfigurationFacade* self, gboolean sort_order, gint sort_by) {
-#line 800 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 827 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
-#line 800 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#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 5199 "ConfigurationInterfaces.c"
+#line 5386 "ConfigurationInterfaces.c"
 }
 
 
@@ -5213,77 +5400,77 @@ static gboolean configuration_facade_real_get_events_sort_ascending (Configurati
 		ConfigurationEngine* _tmp2_ = NULL;
 		gboolean _tmp3_ = FALSE;
 		gboolean _tmp4_ = FALSE;
-#line 816 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 843 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = configuration_facade_get_engine (self);
-#line 816 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 843 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = _tmp1_;
-#line 816 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 843 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = configuration_engine_get_bool_property (_tmp2_, CONFIGURABLE_PROPERTY_EVENTS_SORT_ASCENDING, &_inner_error_);
-#line 816 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 843 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp4_ = _tmp3_;
-#line 816 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 843 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp2_);
-#line 816 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 843 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = _tmp4_;
-#line 816 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 843 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 816 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 843 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 5228 "ConfigurationInterfaces.c"
-				goto __catch117_configuration_error;
+#line 5415 "ConfigurationInterfaces.c"
+				goto __catch118_configuration_error;
 			}
-#line 816 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#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);
-#line 816 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 843 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 816 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 843 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return FALSE;
-#line 5237 "ConfigurationInterfaces.c"
+#line 5424 "ConfigurationInterfaces.c"
 		}
-#line 816 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 843 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp0_;
-#line 816 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 843 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 5243 "ConfigurationInterfaces.c"
+#line 5430 "ConfigurationInterfaces.c"
 	}
-	goto __finally117;
-	__catch117_configuration_error:
+	goto __finally118;
+	__catch118_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp5_ = NULL;
-#line 815 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 842 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 815 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 842 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 818 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 845 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp5_ = err;
-#line 818 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 845 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp5_);
-#line 820 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 847 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = FALSE;
-#line 820 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 847 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 820 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 847 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 5264 "ConfigurationInterfaces.c"
+#line 5451 "ConfigurationInterfaces.c"
 	}
-	__finally117:
-#line 815 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally118:
+#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 815 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 842 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
-#line 815 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 842 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return FALSE;
-#line 5273 "ConfigurationInterfaces.c"
+#line 5460 "ConfigurationInterfaces.c"
 }
 
 
 gboolean configuration_facade_get_events_sort_ascending (ConfigurationFacade* self) {
-#line 814 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 841 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), FALSE);
-#line 814 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 841 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_events_sort_ascending (self);
-#line 5282 "ConfigurationInterfaces.c"
+#line 5469 "ConfigurationInterfaces.c"
 }
 
 
@@ -5293,71 +5480,71 @@ static void configuration_facade_real_set_events_sort_ascending (ConfigurationFa
 		ConfigurationEngine* _tmp0_ = NULL;
 		ConfigurationEngine* _tmp1_ = NULL;
 		gboolean _tmp2_ = FALSE;
-#line 826 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 853 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = configuration_facade_get_engine (self);
-#line 826 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 853 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = _tmp0_;
-#line 826 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 853 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = sort;
-#line 826 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 853 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_engine_set_bool_property (_tmp1_, CONFIGURABLE_PROPERTY_EVENTS_SORT_ASCENDING, _tmp2_, &_inner_error_);
-#line 826 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 853 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp1_);
-#line 826 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 853 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 826 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 853 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 5306 "ConfigurationInterfaces.c"
-				goto __catch118_configuration_error;
+#line 5493 "ConfigurationInterfaces.c"
+				goto __catch119_configuration_error;
 			}
-#line 826 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#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);
-#line 826 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 853 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 826 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 853 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 5315 "ConfigurationInterfaces.c"
+#line 5502 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally118;
-	__catch118_configuration_error:
+	goto __finally119;
+	__catch119_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
-#line 825 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 852 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 825 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 852 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 828 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 855 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = err;
-#line 828 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 855 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp3_);
-#line 829 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 856 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 829 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 856 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 5335 "ConfigurationInterfaces.c"
+#line 5522 "ConfigurationInterfaces.c"
 	}
-	__finally118:
-#line 825 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally119:
+#line 852 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 825 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 852 "/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 825 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 852 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		g_clear_error (&_inner_error_);
-#line 825 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 852 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 5346 "ConfigurationInterfaces.c"
+#line 5533 "ConfigurationInterfaces.c"
 	}
 }
 
 
 void configuration_facade_set_events_sort_ascending (ConfigurationFacade* self, gboolean sort) {
-#line 824 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 851 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
-#line 824 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 851 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_events_sort_ascending (self, sort);
-#line 5356 "ConfigurationInterfaces.c"
+#line 5543 "ConfigurationInterfaces.c"
 }
 
 
@@ -5371,163 +5558,163 @@ static gchar* configuration_facade_real_get_external_photo_app (ConfigurationFac
 		gchar* _tmp3_ = NULL;
 		gchar* _tmp4_ = NULL;
 		gchar* _tmp5_ = NULL;
-#line 838 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 865 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = configuration_facade_get_engine (self);
-#line 838 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 865 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = _tmp1_;
-#line 838 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 865 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = configuration_engine_get_string_property (_tmp2_, CONFIGURABLE_PROPERTY_EXTERNAL_PHOTO_APP, &_inner_error_);
-#line 838 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 865 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp4_ = _tmp3_;
-#line 838 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 865 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp2_);
-#line 838 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 865 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = _tmp4_;
-#line 838 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 865 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 838 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 865 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 5386 "ConfigurationInterfaces.c"
-				goto __catch119_configuration_error;
+#line 5573 "ConfigurationInterfaces.c"
+				goto __catch120_configuration_error;
 			}
-#line 838 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#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);
-#line 838 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 865 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 838 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 865 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return NULL;
-#line 5395 "ConfigurationInterfaces.c"
+#line 5582 "ConfigurationInterfaces.c"
 		}
-#line 838 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 865 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp5_ = _tmp0_;
-#line 838 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 865 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = NULL;
-#line 838 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 865 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp5_;
-#line 838 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 865 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_free0 (_tmp0_);
-#line 838 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 865 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 5407 "ConfigurationInterfaces.c"
+#line 5594 "ConfigurationInterfaces.c"
 	}
-	goto __finally119;
-	__catch119_configuration_error:
+	goto __finally120;
+	__catch120_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp6_ = NULL;
 		gchar* _tmp7_ = NULL;
-#line 837 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 864 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 837 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 864 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 840 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 867 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp6_ = err;
-#line 840 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 867 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp6_);
-#line 842 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 869 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp7_ = g_strdup ("");
-#line 842 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 869 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp7_;
-#line 842 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 869 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 842 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 869 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 5431 "ConfigurationInterfaces.c"
+#line 5618 "ConfigurationInterfaces.c"
 	}
-	__finally119:
-#line 837 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally120:
+#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 837 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 864 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
-#line 837 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 864 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return NULL;
-#line 5440 "ConfigurationInterfaces.c"
+#line 5627 "ConfigurationInterfaces.c"
 }
 
 
 gchar* configuration_facade_get_external_photo_app (ConfigurationFacade* self) {
-#line 836 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 863 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), NULL);
-#line 836 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 863 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_external_photo_app (self);
-#line 5449 "ConfigurationInterfaces.c"
+#line 5636 "ConfigurationInterfaces.c"
 }
 
 
 static void configuration_facade_real_set_external_photo_app (ConfigurationFacade* self, const gchar* external_photo_app) {
 	GError * _inner_error_ = NULL;
-#line 846 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 873 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (external_photo_app != NULL);
-#line 5457 "ConfigurationInterfaces.c"
+#line 5644 "ConfigurationInterfaces.c"
 	{
 		ConfigurationEngine* _tmp0_ = NULL;
 		ConfigurationEngine* _tmp1_ = NULL;
 		const gchar* _tmp2_ = NULL;
-#line 848 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 875 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = configuration_facade_get_engine (self);
-#line 848 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 875 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = _tmp0_;
-#line 848 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 875 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = external_photo_app;
-#line 848 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 875 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_engine_set_string_property (_tmp1_, CONFIGURABLE_PROPERTY_EXTERNAL_PHOTO_APP, _tmp2_, &_inner_error_);
-#line 848 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 875 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp1_);
-#line 848 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 875 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 848 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 875 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 5476 "ConfigurationInterfaces.c"
-				goto __catch120_configuration_error;
+#line 5663 "ConfigurationInterfaces.c"
+				goto __catch121_configuration_error;
 			}
-#line 848 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#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);
-#line 848 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 875 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 848 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 875 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 5485 "ConfigurationInterfaces.c"
+#line 5672 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally120;
-	__catch120_configuration_error:
+	goto __finally121;
+	__catch121_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
-#line 847 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 874 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 847 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 874 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 851 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 878 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = err;
-#line 851 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 878 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp3_);
-#line 852 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 879 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 852 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 879 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 5505 "ConfigurationInterfaces.c"
+#line 5692 "ConfigurationInterfaces.c"
 	}
-	__finally120:
-#line 847 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally121:
+#line 874 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 847 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 874 "/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 847 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 874 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		g_clear_error (&_inner_error_);
-#line 847 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 874 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 5516 "ConfigurationInterfaces.c"
+#line 5703 "ConfigurationInterfaces.c"
 	}
 }
 
 
 void configuration_facade_set_external_photo_app (ConfigurationFacade* self, const gchar* external_photo_app) {
-#line 846 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 873 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
-#line 846 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 873 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_external_photo_app (self, external_photo_app);
-#line 5526 "ConfigurationInterfaces.c"
+#line 5713 "ConfigurationInterfaces.c"
 }
 
 
@@ -5541,163 +5728,1111 @@ static gchar* configuration_facade_real_get_external_raw_app (ConfigurationFacad
 		gchar* _tmp3_ = NULL;
 		gchar* _tmp4_ = NULL;
 		gchar* _tmp5_ = NULL;
-#line 861 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 888 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = configuration_facade_get_engine (self);
-#line 861 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 888 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = _tmp1_;
-#line 861 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 888 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = configuration_engine_get_string_property (_tmp2_, CONFIGURABLE_PROPERTY_EXTERNAL_RAW_APP, &_inner_error_);
-#line 861 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 888 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp4_ = _tmp3_;
-#line 861 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 888 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp2_);
-#line 861 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 888 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = _tmp4_;
-#line 861 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 888 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 861 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 888 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 5556 "ConfigurationInterfaces.c"
-				goto __catch121_configuration_error;
+#line 5743 "ConfigurationInterfaces.c"
+				goto __catch122_configuration_error;
 			}
-#line 861 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#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);
-#line 861 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 888 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 861 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 888 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return NULL;
-#line 5565 "ConfigurationInterfaces.c"
+#line 5752 "ConfigurationInterfaces.c"
 		}
-#line 861 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 888 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp5_ = _tmp0_;
-#line 861 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 888 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = NULL;
-#line 861 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 888 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp5_;
-#line 861 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 888 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_free0 (_tmp0_);
-#line 861 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 888 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 5577 "ConfigurationInterfaces.c"
+#line 5764 "ConfigurationInterfaces.c"
 	}
-	goto __finally121;
-	__catch121_configuration_error:
+	goto __finally122;
+	__catch122_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp6_ = NULL;
 		gchar* _tmp7_ = NULL;
-#line 860 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 887 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 860 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 887 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 863 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 890 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp6_ = err;
-#line 863 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 890 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp6_);
-#line 865 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 892 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp7_ = g_strdup ("");
-#line 865 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 892 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp7_;
-#line 865 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 892 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 865 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 892 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 5601 "ConfigurationInterfaces.c"
+#line 5788 "ConfigurationInterfaces.c"
 	}
-	__finally121:
-#line 860 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally122:
+#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 860 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 887 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
-#line 860 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 887 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return NULL;
-#line 5610 "ConfigurationInterfaces.c"
+#line 5797 "ConfigurationInterfaces.c"
 }
 
 
 gchar* configuration_facade_get_external_raw_app (ConfigurationFacade* self) {
-#line 859 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 886 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), NULL);
-#line 859 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 886 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_external_raw_app (self);
-#line 5619 "ConfigurationInterfaces.c"
+#line 5806 "ConfigurationInterfaces.c"
 }
 
 
 static void configuration_facade_real_set_external_raw_app (ConfigurationFacade* self, const gchar* external_raw_app) {
 	GError * _inner_error_ = NULL;
-#line 869 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 896 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (external_raw_app != NULL);
-#line 5627 "ConfigurationInterfaces.c"
+#line 5814 "ConfigurationInterfaces.c"
 	{
 		ConfigurationEngine* _tmp0_ = NULL;
 		ConfigurationEngine* _tmp1_ = NULL;
 		const gchar* _tmp2_ = NULL;
-#line 871 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 898 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = configuration_facade_get_engine (self);
-#line 871 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 898 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = _tmp0_;
-#line 871 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 898 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = external_raw_app;
-#line 871 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 898 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_engine_set_string_property (_tmp1_, CONFIGURABLE_PROPERTY_EXTERNAL_RAW_APP, _tmp2_, &_inner_error_);
-#line 871 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 898 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp1_);
-#line 871 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 898 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 871 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 898 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 5646 "ConfigurationInterfaces.c"
-				goto __catch122_configuration_error;
+#line 5833 "ConfigurationInterfaces.c"
+				goto __catch123_configuration_error;
 			}
-#line 871 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#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);
-#line 871 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 898 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 871 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 898 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 5655 "ConfigurationInterfaces.c"
+#line 5842 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally122;
-	__catch122_configuration_error:
+	goto __finally123;
+	__catch123_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
-#line 870 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 897 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 870 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 897 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 874 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 901 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = err;
-#line 874 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 901 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp3_);
-#line 875 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 902 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 875 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 902 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 5675 "ConfigurationInterfaces.c"
+#line 5862 "ConfigurationInterfaces.c"
 	}
-	__finally122:
-#line 870 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally123:
+#line 897 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 870 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 897 "/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 870 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 897 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		g_clear_error (&_inner_error_);
-#line 870 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 897 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 5686 "ConfigurationInterfaces.c"
+#line 5873 "ConfigurationInterfaces.c"
 	}
 }
 
 
 void configuration_facade_set_external_raw_app (ConfigurationFacade* self, const gchar* external_raw_app) {
-#line 869 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 896 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
-#line 869 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 896 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_external_raw_app (self, external_raw_app);
-#line 5696 "ConfigurationInterfaces.c"
+#line 5883 "ConfigurationInterfaces.c"
+}
+
+
+static ScaleConstraint configuration_facade_real_get_export_constraint (ConfigurationFacade* self) {
+	ScaleConstraint result = 0;
+	GError * _inner_error_ = NULL;
+	{
+		gint _tmp0_ = 0;
+		ConfigurationEngine* _tmp1_ = NULL;
+		ConfigurationEngine* _tmp2_ = NULL;
+		gint _tmp3_ = 0;
+		gint _tmp4_ = 0;
+#line 911 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		_tmp1_ = configuration_facade_get_engine (self);
+#line 911 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		_tmp2_ = _tmp1_;
+#line 911 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		_tmp3_ = configuration_engine_get_enum_property (_tmp2_, CONFIGURABLE_PROPERTY_EXPORT_CONSTRAINT, &_inner_error_);
+#line 911 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		_tmp4_ = _tmp3_;
+#line 911 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		_g_object_unref0 (_tmp2_);
+#line 911 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		_tmp0_ = _tmp4_;
+#line 911 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		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 __catch124_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);
+#line 911 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+			g_clear_error (&_inner_error_);
+#line 911 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+			return 0;
+#line 5921 "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"
+	}
+	goto __finally124;
+	__catch124_configuration_error:
+	{
+		GError* err = NULL;
+		GError* _tmp5_ = NULL;
+#line 910 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		err = _inner_error_;
+#line 910 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		_inner_error_ = NULL;
+#line 913 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		_tmp5_ = err;
+#line 913 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		configuration_facade_on_configuration_error (self, _tmp5_);
+#line 915 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		result = 0;
+#line 915 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		_g_error_free0 (err);
+#line 915 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		return result;
+#line 5948 "ConfigurationInterfaces.c"
+	}
+	__finally124:
+#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"
+}
+
+
+ScaleConstraint configuration_facade_get_export_constraint (ConfigurationFacade* self) {
+#line 909 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	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"
+}
+
+
+static void configuration_facade_real_set_export_constraint (ConfigurationFacade* self, ScaleConstraint constraint) {
+	GError * _inner_error_ = NULL;
+	{
+		ConfigurationEngine* _tmp0_ = NULL;
+		ConfigurationEngine* _tmp1_ = NULL;
+		ScaleConstraint _tmp2_ = 0;
+#line 921 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		_tmp0_ = configuration_facade_get_engine (self);
+#line 921 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		_tmp1_ = _tmp0_;
+#line 921 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		_tmp2_ = constraint;
+#line 921 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		configuration_engine_set_enum_property (_tmp1_, CONFIGURABLE_PROPERTY_EXPORT_CONSTRAINT, (gint) _tmp2_, &_inner_error_);
+#line 921 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		_g_object_unref0 (_tmp1_);
+#line 921 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		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 __catch125_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);
+#line 921 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+			g_clear_error (&_inner_error_);
+#line 921 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+			return;
+#line 5999 "ConfigurationInterfaces.c"
+		}
+	}
+	goto __finally125;
+	__catch125_configuration_error:
+	{
+		GError* err = NULL;
+		GError* _tmp3_ = NULL;
+#line 920 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		err = _inner_error_;
+#line 920 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		_inner_error_ = NULL;
+#line 923 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		_tmp3_ = err;
+#line 923 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		configuration_facade_on_configuration_error (self, _tmp3_);
+#line 924 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		_g_error_free0 (err);
+#line 924 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		return;
+#line 6019 "ConfigurationInterfaces.c"
+	}
+	__finally125:
+#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"
+		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
+#line 920 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		g_clear_error (&_inner_error_);
+#line 920 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		return;
+#line 6030 "ConfigurationInterfaces.c"
+	}
+}
+
+
+void configuration_facade_set_export_constraint (ConfigurationFacade* self, ScaleConstraint constraint) {
+#line 919 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	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"
+}
+
+
+static ExportFormatMode configuration_facade_real_get_export_export_format_mode (ConfigurationFacade* self) {
+	ExportFormatMode result = 0;
+	GError * _inner_error_ = NULL;
+	{
+		gint _tmp0_ = 0;
+		ConfigurationEngine* _tmp1_ = NULL;
+		ConfigurationEngine* _tmp2_ = NULL;
+		gint _tmp3_ = 0;
+		gint _tmp4_ = 0;
+#line 930 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		_tmp1_ = configuration_facade_get_engine (self);
+#line 930 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		_tmp2_ = _tmp1_;
+#line 930 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		_tmp3_ = configuration_engine_get_enum_property (_tmp2_, CONFIGURABLE_PROPERTY_EXPORT_EXPORT_FORMAT_MODE, &_inner_error_);
+#line 930 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		_tmp4_ = _tmp3_;
+#line 930 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		_g_object_unref0 (_tmp2_);
+#line 930 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		_tmp0_ = _tmp4_;
+#line 930 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		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 __catch126_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);
+#line 930 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+			g_clear_error (&_inner_error_);
+#line 930 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+			return 0;
+#line 6078 "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"
+	}
+	goto __finally126;
+	__catch126_configuration_error:
+	{
+		GError* err = NULL;
+		GError* _tmp5_ = NULL;
+#line 929 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		err = _inner_error_;
+#line 929 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		_inner_error_ = NULL;
+#line 932 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		_tmp5_ = err;
+#line 932 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		configuration_facade_on_configuration_error (self, _tmp5_);
+#line 934 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		result = 0;
+#line 934 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		_g_error_free0 (err);
+#line 934 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		return result;
+#line 6105 "ConfigurationInterfaces.c"
+	}
+	__finally126:
+#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"
+}
+
+
+ExportFormatMode configuration_facade_get_export_export_format_mode (ConfigurationFacade* self) {
+#line 928 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	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"
+}
+
+
+static void configuration_facade_real_set_export_export_format_mode (ConfigurationFacade* self, ExportFormatMode export_format_mode) {
+	GError * _inner_error_ = NULL;
+	{
+		ConfigurationEngine* _tmp0_ = NULL;
+		ConfigurationEngine* _tmp1_ = NULL;
+		ExportFormatMode _tmp2_ = 0;
+#line 940 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		_tmp0_ = configuration_facade_get_engine (self);
+#line 940 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		_tmp1_ = _tmp0_;
+#line 940 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		_tmp2_ = export_format_mode;
+#line 940 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		configuration_engine_set_enum_property (_tmp1_, CONFIGURABLE_PROPERTY_EXPORT_EXPORT_FORMAT_MODE, (gint) _tmp2_, &_inner_error_);
+#line 940 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		_g_object_unref0 (_tmp1_);
+#line 940 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		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 __catch127_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);
+#line 940 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+			g_clear_error (&_inner_error_);
+#line 940 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+			return;
+#line 6156 "ConfigurationInterfaces.c"
+		}
+	}
+	goto __finally127;
+	__catch127_configuration_error:
+	{
+		GError* err = NULL;
+		GError* _tmp3_ = NULL;
+#line 939 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		err = _inner_error_;
+#line 939 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		_inner_error_ = NULL;
+#line 942 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		_tmp3_ = err;
+#line 942 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		configuration_facade_on_configuration_error (self, _tmp3_);
+#line 943 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		_g_error_free0 (err);
+#line 943 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		return;
+#line 6176 "ConfigurationInterfaces.c"
+	}
+	__finally127:
+#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"
+		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
+#line 939 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		g_clear_error (&_inner_error_);
+#line 939 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		return;
+#line 6187 "ConfigurationInterfaces.c"
+	}
+}
+
+
+void configuration_facade_set_export_export_format_mode (ConfigurationFacade* self, ExportFormatMode export_format_mode) {
+#line 938 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	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"
+}
+
+
+static gboolean configuration_facade_real_get_export_export_metadata (ConfigurationFacade* self) {
+	gboolean result = FALSE;
+	GError * _inner_error_ = NULL;
+	{
+		gboolean _tmp0_ = FALSE;
+		ConfigurationEngine* _tmp1_ = NULL;
+		ConfigurationEngine* _tmp2_ = NULL;
+		gboolean _tmp3_ = FALSE;
+		gboolean _tmp4_ = FALSE;
+#line 949 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		_tmp1_ = configuration_facade_get_engine (self);
+#line 949 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		_tmp2_ = _tmp1_;
+#line 949 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		_tmp3_ = configuration_engine_get_bool_property (_tmp2_, CONFIGURABLE_PROPERTY_EXPORT_EXPORT_METADATA, &_inner_error_);
+#line 949 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		_tmp4_ = _tmp3_;
+#line 949 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		_g_object_unref0 (_tmp2_);
+#line 949 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		_tmp0_ = _tmp4_;
+#line 949 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		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 __catch128_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);
+#line 949 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+			g_clear_error (&_inner_error_);
+#line 949 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+			return FALSE;
+#line 6235 "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"
+	}
+	goto __finally128;
+	__catch128_configuration_error:
+	{
+		GError* err = NULL;
+		GError* _tmp5_ = NULL;
+#line 948 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		err = _inner_error_;
+#line 948 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		_inner_error_ = NULL;
+#line 951 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		_tmp5_ = err;
+#line 951 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		configuration_facade_on_configuration_error (self, _tmp5_);
+#line 953 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		result = FALSE;
+#line 953 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		_g_error_free0 (err);
+#line 953 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		return result;
+#line 6262 "ConfigurationInterfaces.c"
+	}
+	__finally128:
+#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"
+}
+
+
+gboolean configuration_facade_get_export_export_metadata (ConfigurationFacade* self) {
+#line 947 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	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"
+}
+
+
+static void configuration_facade_real_set_export_export_metadata (ConfigurationFacade* self, gboolean export_metadata) {
+	GError * _inner_error_ = NULL;
+	{
+		ConfigurationEngine* _tmp0_ = NULL;
+		ConfigurationEngine* _tmp1_ = NULL;
+		gboolean _tmp2_ = FALSE;
+#line 959 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		_tmp0_ = configuration_facade_get_engine (self);
+#line 959 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		_tmp1_ = _tmp0_;
+#line 959 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		_tmp2_ = export_metadata;
+#line 959 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		configuration_engine_set_bool_property (_tmp1_, CONFIGURABLE_PROPERTY_EXPORT_EXPORT_METADATA, _tmp2_, &_inner_error_);
+#line 959 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		_g_object_unref0 (_tmp1_);
+#line 959 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		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 __catch129_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);
+#line 959 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+			g_clear_error (&_inner_error_);
+#line 959 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+			return;
+#line 6313 "ConfigurationInterfaces.c"
+		}
+	}
+	goto __finally129;
+	__catch129_configuration_error:
+	{
+		GError* err = NULL;
+		GError* _tmp3_ = NULL;
+#line 958 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		err = _inner_error_;
+#line 958 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		_inner_error_ = NULL;
+#line 961 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		_tmp3_ = err;
+#line 961 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		configuration_facade_on_configuration_error (self, _tmp3_);
+#line 962 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		_g_error_free0 (err);
+#line 962 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		return;
+#line 6333 "ConfigurationInterfaces.c"
+	}
+	__finally129:
+#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"
+		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
+#line 958 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		g_clear_error (&_inner_error_);
+#line 958 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		return;
+#line 6344 "ConfigurationInterfaces.c"
+	}
+}
+
+
+void configuration_facade_set_export_export_metadata (ConfigurationFacade* self, gboolean export_metadata) {
+#line 957 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	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"
+}
+
+
+static PhotoFileFormat configuration_facade_real_get_export_photo_file_format (ConfigurationFacade* self) {
+	PhotoFileFormat result = 0;
+	GError * _inner_error_ = NULL;
+	{
+		gint _tmp0_ = 0;
+		ConfigurationEngine* _tmp1_ = NULL;
+		ConfigurationEngine* _tmp2_ = NULL;
+		gint _tmp3_ = 0;
+		gint _tmp4_ = 0;
+		PhotoFileFormat _tmp5_ = 0;
+#line 968 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		_tmp1_ = configuration_facade_get_engine (self);
+#line 968 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		_tmp2_ = _tmp1_;
+#line 968 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		_tmp3_ = configuration_engine_get_enum_property (_tmp2_, CONFIGURABLE_PROPERTY_EXPORT_PHOTO_FILE_FORMAT, &_inner_error_);
+#line 968 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		_tmp4_ = _tmp3_;
+#line 968 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		_g_object_unref0 (_tmp2_);
+#line 968 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		_tmp0_ = _tmp4_;
+#line 968 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		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 __catch130_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);
+#line 968 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+			g_clear_error (&_inner_error_);
+#line 968 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+			return 0;
+#line 6393 "ConfigurationInterfaces.c"
+		}
+#line 968 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		_tmp5_ = photo_file_format_unserialize (_tmp0_);
+#line 968 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		result = _tmp5_;
+#line 968 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		return result;
+#line 6401 "ConfigurationInterfaces.c"
+	}
+	goto __finally130;
+	__catch130_configuration_error:
+	{
+		GError* err = NULL;
+		GError* _tmp6_ = NULL;
+#line 967 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		err = _inner_error_;
+#line 967 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		_inner_error_ = NULL;
+#line 970 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		_tmp6_ = err;
+#line 970 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		configuration_facade_on_configuration_error (self, _tmp6_);
+#line 972 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		result = 0;
+#line 972 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		_g_error_free0 (err);
+#line 972 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		return result;
+#line 6422 "ConfigurationInterfaces.c"
+	}
+	__finally130:
+#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"
+}
+
+
+PhotoFileFormat configuration_facade_get_export_photo_file_format (ConfigurationFacade* self) {
+#line 966 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	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"
+}
+
+
+static void configuration_facade_real_set_export_photo_file_format (ConfigurationFacade* self, PhotoFileFormat photo_file_format) {
+	GError * _inner_error_ = NULL;
+	{
+		ConfigurationEngine* _tmp0_ = NULL;
+		ConfigurationEngine* _tmp1_ = NULL;
+		PhotoFileFormat _tmp2_ = 0;
+		gint _tmp3_ = 0;
+#line 978 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		_tmp0_ = configuration_facade_get_engine (self);
+#line 978 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		_tmp1_ = _tmp0_;
+#line 978 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		_tmp2_ = photo_file_format;
+#line 978 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		_tmp3_ = photo_file_format_serialize (_tmp2_);
+#line 978 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		configuration_engine_set_enum_property (_tmp1_, CONFIGURABLE_PROPERTY_EXPORT_PHOTO_FILE_FORMAT, _tmp3_, &_inner_error_);
+#line 978 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		_g_object_unref0 (_tmp1_);
+#line 978 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		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 __catch131_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);
+#line 978 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+			g_clear_error (&_inner_error_);
+#line 978 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+			return;
+#line 6476 "ConfigurationInterfaces.c"
+		}
+	}
+	goto __finally131;
+	__catch131_configuration_error:
+	{
+		GError* err = NULL;
+		GError* _tmp4_ = NULL;
+#line 977 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		err = _inner_error_;
+#line 977 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		_inner_error_ = NULL;
+#line 980 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		_tmp4_ = err;
+#line 980 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		configuration_facade_on_configuration_error (self, _tmp4_);
+#line 981 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		_g_error_free0 (err);
+#line 981 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		return;
+#line 6496 "ConfigurationInterfaces.c"
+	}
+	__finally131:
+#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"
+		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
+#line 977 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		g_clear_error (&_inner_error_);
+#line 977 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		return;
+#line 6507 "ConfigurationInterfaces.c"
+	}
+}
+
+
+void configuration_facade_set_export_photo_file_format (ConfigurationFacade* self, PhotoFileFormat photo_file_format) {
+#line 976 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	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"
+}
+
+
+static JpegQuality configuration_facade_real_get_export_quality (ConfigurationFacade* self) {
+	JpegQuality result = 0;
+	GError * _inner_error_ = NULL;
+	{
+		gint _tmp0_ = 0;
+		ConfigurationEngine* _tmp1_ = NULL;
+		ConfigurationEngine* _tmp2_ = NULL;
+		gint _tmp3_ = 0;
+		gint _tmp4_ = 0;
+#line 987 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		_tmp1_ = configuration_facade_get_engine (self);
+#line 987 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		_tmp2_ = _tmp1_;
+#line 987 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		_tmp3_ = configuration_engine_get_enum_property (_tmp2_, CONFIGURABLE_PROPERTY_EXPORT_QUALITY, &_inner_error_);
+#line 987 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		_tmp4_ = _tmp3_;
+#line 987 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		_g_object_unref0 (_tmp2_);
+#line 987 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		_tmp0_ = _tmp4_;
+#line 987 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		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 __catch132_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);
+#line 987 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+			g_clear_error (&_inner_error_);
+#line 987 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+			return 0;
+#line 6555 "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"
+	}
+	goto __finally132;
+	__catch132_configuration_error:
+	{
+		GError* err = NULL;
+		GError* _tmp5_ = NULL;
+#line 986 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		err = _inner_error_;
+#line 986 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		_inner_error_ = NULL;
+#line 989 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		_tmp5_ = err;
+#line 989 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		configuration_facade_on_configuration_error (self, _tmp5_);
+#line 991 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		result = 0;
+#line 991 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		_g_error_free0 (err);
+#line 991 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		return result;
+#line 6582 "ConfigurationInterfaces.c"
+	}
+	__finally132:
+#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"
+}
+
+
+JpegQuality configuration_facade_get_export_quality (ConfigurationFacade* self) {
+#line 985 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	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"
+}
+
+
+static void configuration_facade_real_set_export_quality (ConfigurationFacade* self, JpegQuality quality) {
+	GError * _inner_error_ = NULL;
+	{
+		ConfigurationEngine* _tmp0_ = NULL;
+		ConfigurationEngine* _tmp1_ = NULL;
+		JpegQuality _tmp2_ = 0;
+#line 997 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		_tmp0_ = configuration_facade_get_engine (self);
+#line 997 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		_tmp1_ = _tmp0_;
+#line 997 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		_tmp2_ = quality;
+#line 997 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		configuration_engine_set_enum_property (_tmp1_, CONFIGURABLE_PROPERTY_EXPORT_QUALITY, (gint) _tmp2_, &_inner_error_);
+#line 997 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		_g_object_unref0 (_tmp1_);
+#line 997 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		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 __catch133_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);
+#line 997 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+			g_clear_error (&_inner_error_);
+#line 997 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+			return;
+#line 6633 "ConfigurationInterfaces.c"
+		}
+	}
+	goto __finally133;
+	__catch133_configuration_error:
+	{
+		GError* err = NULL;
+		GError* _tmp3_ = NULL;
+#line 996 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		err = _inner_error_;
+#line 996 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		_inner_error_ = NULL;
+#line 999 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		_tmp3_ = err;
+#line 999 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		configuration_facade_on_configuration_error (self, _tmp3_);
+#line 1000 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		_g_error_free0 (err);
+#line 1000 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		return;
+#line 6653 "ConfigurationInterfaces.c"
+	}
+	__finally133:
+#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"
+		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
+#line 996 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		g_clear_error (&_inner_error_);
+#line 996 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		return;
+#line 6664 "ConfigurationInterfaces.c"
+	}
+}
+
+
+void configuration_facade_set_export_quality (ConfigurationFacade* self, JpegQuality quality) {
+#line 995 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	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"
+}
+
+
+static gint configuration_facade_real_get_export_scale (ConfigurationFacade* self) {
+	gint result = 0;
+	GError * _inner_error_ = NULL;
+	{
+		gint _tmp0_ = 0;
+		ConfigurationEngine* _tmp1_ = NULL;
+		ConfigurationEngine* _tmp2_ = NULL;
+		gint _tmp3_ = 0;
+		gint _tmp4_ = 0;
+#line 1006 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		_tmp1_ = configuration_facade_get_engine (self);
+#line 1006 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		_tmp2_ = _tmp1_;
+#line 1006 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		_tmp3_ = configuration_engine_get_int_property (_tmp2_, CONFIGURABLE_PROPERTY_EXPORT_SCALE, &_inner_error_);
+#line 1006 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		_tmp4_ = _tmp3_;
+#line 1006 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		_g_object_unref0 (_tmp2_);
+#line 1006 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		_tmp0_ = _tmp4_;
+#line 1006 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		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 __catch134_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);
+#line 1006 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+			g_clear_error (&_inner_error_);
+#line 1006 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+			return 0;
+#line 6712 "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"
+	}
+	goto __finally134;
+	__catch134_configuration_error:
+	{
+		GError* err = NULL;
+		GError* _tmp5_ = NULL;
+#line 1005 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		err = _inner_error_;
+#line 1005 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		_inner_error_ = NULL;
+#line 1008 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		_tmp5_ = err;
+#line 1008 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		configuration_facade_on_configuration_error (self, _tmp5_);
+#line 1010 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		result = 0;
+#line 1010 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		_g_error_free0 (err);
+#line 1010 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		return result;
+#line 6739 "ConfigurationInterfaces.c"
+	}
+	__finally134:
+#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"
+}
+
+
+gint configuration_facade_get_export_scale (ConfigurationFacade* self) {
+#line 1004 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	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"
+}
+
+
+static void configuration_facade_real_set_export_scale (ConfigurationFacade* self, gint scale) {
+	GError * _inner_error_ = NULL;
+	{
+		ConfigurationEngine* _tmp0_ = NULL;
+		ConfigurationEngine* _tmp1_ = NULL;
+		gint _tmp2_ = 0;
+#line 1016 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		_tmp0_ = configuration_facade_get_engine (self);
+#line 1016 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		_tmp1_ = _tmp0_;
+#line 1016 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		_tmp2_ = scale;
+#line 1016 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		configuration_engine_set_int_property (_tmp1_, CONFIGURABLE_PROPERTY_EXPORT_SCALE, _tmp2_, &_inner_error_);
+#line 1016 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		_g_object_unref0 (_tmp1_);
+#line 1016 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		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 __catch135_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);
+#line 1016 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+			g_clear_error (&_inner_error_);
+#line 1016 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+			return;
+#line 6790 "ConfigurationInterfaces.c"
+		}
+	}
+	goto __finally135;
+	__catch135_configuration_error:
+	{
+		GError* err = NULL;
+		GError* _tmp3_ = NULL;
+#line 1015 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		err = _inner_error_;
+#line 1015 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		_inner_error_ = NULL;
+#line 1018 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		_tmp3_ = err;
+#line 1018 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		configuration_facade_on_configuration_error (self, _tmp3_);
+#line 1019 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		_g_error_free0 (err);
+#line 1019 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		return;
+#line 6810 "ConfigurationInterfaces.c"
+	}
+	__finally135:
+#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"
+		g_critical ("file %s: line %d: uncaught 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/config/ConfigurationInterfaces.vala"
+		g_clear_error (&_inner_error_);
+#line 1015 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		return;
+#line 6821 "ConfigurationInterfaces.c"
+	}
+}
+
+
+void configuration_facade_set_export_scale (ConfigurationFacade* self, gint scale) {
+#line 1014 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	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"
 }
 
 
@@ -5711,81 +6846,81 @@ static RawDeveloper configuration_facade_real_get_default_raw_developer (Configu
 		gchar* _tmp3_ = NULL;
 		gchar* _tmp4_ = NULL;
 		RawDeveloper _tmp5_ = 0;
-#line 884 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1028 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = configuration_facade_get_engine (self);
-#line 884 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1028 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = _tmp1_;
-#line 884 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1028 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = configuration_engine_get_string_property (_tmp2_, CONFIGURABLE_PROPERTY_RAW_DEVELOPER_DEFAULT, &_inner_error_);
-#line 884 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1028 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp4_ = _tmp3_;
-#line 884 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1028 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp2_);
-#line 884 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1028 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = _tmp4_;
-#line 884 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1028 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 884 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1028 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 5726 "ConfigurationInterfaces.c"
-				goto __catch123_configuration_error;
+#line 6861 "ConfigurationInterfaces.c"
+				goto __catch136_configuration_error;
 			}
-#line 884 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#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);
-#line 884 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1028 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 884 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1028 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return 0;
-#line 5735 "ConfigurationInterfaces.c"
+#line 6870 "ConfigurationInterfaces.c"
 		}
-#line 884 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1028 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp5_ = raw_developer_from_string (_tmp0_);
-#line 884 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1028 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp5_;
-#line 884 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1028 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_free0 (_tmp0_);
-#line 884 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1028 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 5745 "ConfigurationInterfaces.c"
+#line 6880 "ConfigurationInterfaces.c"
 	}
-	goto __finally123;
-	__catch123_configuration_error:
+	goto __finally136;
+	__catch136_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp6_ = NULL;
-#line 883 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1027 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 883 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1027 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 887 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1031 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp6_ = err;
-#line 887 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1031 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp6_);
-#line 889 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1033 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = RAW_DEVELOPER_CAMERA;
-#line 889 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1033 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 889 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1033 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 5766 "ConfigurationInterfaces.c"
+#line 6901 "ConfigurationInterfaces.c"
 	}
-	__finally123:
-#line 883 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally136:
+#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 883 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1027 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
-#line 883 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1027 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return 0;
-#line 5775 "ConfigurationInterfaces.c"
+#line 6910 "ConfigurationInterfaces.c"
 }
 
 
 RawDeveloper configuration_facade_get_default_raw_developer (ConfigurationFacade* self) {
-#line 882 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1026 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), 0);
-#line 882 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1026 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_default_raw_developer (self);
-#line 5784 "ConfigurationInterfaces.c"
+#line 6919 "ConfigurationInterfaces.c"
 }
 
 
@@ -5797,77 +6932,77 @@ static void configuration_facade_real_set_default_raw_developer (ConfigurationFa
 		RawDeveloper _tmp2_ = 0;
 		gchar* _tmp3_ = NULL;
 		gchar* _tmp4_ = NULL;
-#line 895 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1039 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = configuration_facade_get_engine (self);
-#line 895 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1039 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = _tmp0_;
-#line 895 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1039 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = d;
-#line 895 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1039 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = raw_developer_to_string (_tmp2_);
-#line 895 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1039 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp4_ = _tmp3_;
-#line 895 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1039 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_engine_set_string_property (_tmp1_, CONFIGURABLE_PROPERTY_RAW_DEVELOPER_DEFAULT, _tmp4_, &_inner_error_);
-#line 895 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1039 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_free0 (_tmp4_);
-#line 895 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1039 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp1_);
-#line 895 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1039 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 895 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1039 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 5816 "ConfigurationInterfaces.c"
-				goto __catch124_configuration_error;
+#line 6951 "ConfigurationInterfaces.c"
+				goto __catch137_configuration_error;
 			}
-#line 895 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#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);
-#line 895 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1039 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 895 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1039 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 5825 "ConfigurationInterfaces.c"
+#line 6960 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally124;
-	__catch124_configuration_error:
+	goto __finally137;
+	__catch137_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp5_ = NULL;
-#line 894 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1038 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 894 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1038 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 898 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1042 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp5_ = err;
-#line 898 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1042 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp5_);
-#line 899 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1043 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 899 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1043 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 5845 "ConfigurationInterfaces.c"
+#line 6980 "ConfigurationInterfaces.c"
 	}
-	__finally124:
-#line 894 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally137:
+#line 1038 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 894 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1038 "/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 894 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1038 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		g_clear_error (&_inner_error_);
-#line 894 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1038 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 5856 "ConfigurationInterfaces.c"
+#line 6991 "ConfigurationInterfaces.c"
 	}
 }
 
 
 void configuration_facade_set_default_raw_developer (ConfigurationFacade* self, RawDeveloper d) {
-#line 893 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1037 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
-#line 893 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1037 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_default_raw_developer (self, d);
-#line 5866 "ConfigurationInterfaces.c"
+#line 7001 "ConfigurationInterfaces.c"
 }
 
 
@@ -5880,77 +7015,77 @@ static gboolean configuration_facade_real_get_hide_photos_already_imported (Conf
 		ConfigurationEngine* _tmp2_ = NULL;
 		gboolean _tmp3_ = FALSE;
 		gboolean _tmp4_ = FALSE;
-#line 908 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1052 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = configuration_facade_get_engine (self);
-#line 908 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1052 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = _tmp1_;
-#line 908 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1052 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = configuration_engine_get_bool_property (_tmp2_, CONFIGURABLE_PROPERTY_HIDE_PHOTOS_ALREADY_IMPORTED, &_inner_error_);
-#line 908 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1052 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp4_ = _tmp3_;
-#line 908 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1052 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp2_);
-#line 908 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1052 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = _tmp4_;
-#line 908 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1052 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 908 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1052 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 5895 "ConfigurationInterfaces.c"
-				goto __catch125_configuration_error;
+#line 7030 "ConfigurationInterfaces.c"
+				goto __catch138_configuration_error;
 			}
-#line 908 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#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);
-#line 908 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1052 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 908 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1052 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return FALSE;
-#line 5904 "ConfigurationInterfaces.c"
+#line 7039 "ConfigurationInterfaces.c"
 		}
-#line 908 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1052 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp0_;
-#line 908 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1052 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 5910 "ConfigurationInterfaces.c"
+#line 7045 "ConfigurationInterfaces.c"
 	}
-	goto __finally125;
-	__catch125_configuration_error:
+	goto __finally138;
+	__catch138_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp5_ = NULL;
-#line 907 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1051 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 907 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1051 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 910 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1054 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp5_ = err;
-#line 910 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1054 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp5_);
-#line 912 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1056 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = TRUE;
-#line 912 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1056 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 912 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1056 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 5931 "ConfigurationInterfaces.c"
+#line 7066 "ConfigurationInterfaces.c"
 	}
-	__finally125:
-#line 907 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally138:
+#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 907 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1051 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
-#line 907 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1051 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return FALSE;
-#line 5940 "ConfigurationInterfaces.c"
+#line 7075 "ConfigurationInterfaces.c"
 }
 
 
 gboolean configuration_facade_get_hide_photos_already_imported (ConfigurationFacade* self) {
-#line 906 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1050 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), FALSE);
-#line 906 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1050 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_hide_photos_already_imported (self);
-#line 5949 "ConfigurationInterfaces.c"
+#line 7084 "ConfigurationInterfaces.c"
 }
 
 
@@ -5960,69 +7095,69 @@ static void configuration_facade_real_set_hide_photos_already_imported (Configur
 		ConfigurationEngine* _tmp0_ = NULL;
 		ConfigurationEngine* _tmp1_ = NULL;
 		gboolean _tmp2_ = FALSE;
-#line 918 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1062 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = configuration_facade_get_engine (self);
-#line 918 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1062 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = _tmp0_;
-#line 918 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1062 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = hide_imported;
-#line 918 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1062 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_engine_set_bool_property (_tmp1_, CONFIGURABLE_PROPERTY_HIDE_PHOTOS_ALREADY_IMPORTED, _tmp2_, &_inner_error_);
-#line 918 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1062 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp1_);
-#line 918 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1062 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 918 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1062 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 5973 "ConfigurationInterfaces.c"
-				goto __catch126_configuration_error;
+#line 7108 "ConfigurationInterfaces.c"
+				goto __catch139_configuration_error;
 			}
-#line 918 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#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);
-#line 918 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1062 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 918 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1062 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 5982 "ConfigurationInterfaces.c"
+#line 7117 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally126;
-	__catch126_configuration_error:
+	goto __finally139;
+	__catch139_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
-#line 917 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1061 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 917 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1061 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 920 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1064 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = err;
-#line 920 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1064 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp3_);
-#line 917 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1061 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 6000 "ConfigurationInterfaces.c"
+#line 7135 "ConfigurationInterfaces.c"
 	}
-	__finally126:
-#line 917 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally139:
+#line 1061 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 917 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1061 "/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 917 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1061 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		g_clear_error (&_inner_error_);
-#line 917 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1061 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 6011 "ConfigurationInterfaces.c"
+#line 7146 "ConfigurationInterfaces.c"
 	}
 }
 
 
 void configuration_facade_set_hide_photos_already_imported (ConfigurationFacade* self, gboolean hide_imported) {
-#line 916 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1060 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
-#line 916 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1060 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_hide_photos_already_imported (self, hide_imported);
-#line 6021 "ConfigurationInterfaces.c"
+#line 7156 "ConfigurationInterfaces.c"
 }
 
 
@@ -6036,161 +7171,161 @@ static gchar* configuration_facade_real_get_import_dir (ConfigurationFacade* sel
 		gchar* _tmp3_ = NULL;
 		gchar* _tmp4_ = NULL;
 		gchar* _tmp5_ = NULL;
-#line 929 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1073 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = configuration_facade_get_engine (self);
-#line 929 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1073 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = _tmp1_;
-#line 929 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1073 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = configuration_engine_get_string_property (_tmp2_, CONFIGURABLE_PROPERTY_IMPORT_DIR, &_inner_error_);
-#line 929 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1073 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp4_ = _tmp3_;
-#line 929 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1073 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp2_);
-#line 929 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1073 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = _tmp4_;
-#line 929 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1073 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 929 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1073 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 6051 "ConfigurationInterfaces.c"
-				goto __catch127_configuration_error;
+#line 7186 "ConfigurationInterfaces.c"
+				goto __catch140_configuration_error;
 			}
-#line 929 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#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);
-#line 929 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1073 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 929 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1073 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return NULL;
-#line 6060 "ConfigurationInterfaces.c"
+#line 7195 "ConfigurationInterfaces.c"
 		}
-#line 929 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1073 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp5_ = _tmp0_;
-#line 929 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1073 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = NULL;
-#line 929 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1073 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp5_;
-#line 929 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1073 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_free0 (_tmp0_);
-#line 929 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1073 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 6072 "ConfigurationInterfaces.c"
+#line 7207 "ConfigurationInterfaces.c"
 	}
-	goto __finally127;
-	__catch127_configuration_error:
+	goto __finally140;
+	__catch140_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp6_ = NULL;
 		gchar* _tmp7_ = NULL;
-#line 928 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1072 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 928 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1072 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 931 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1075 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp6_ = err;
-#line 931 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1075 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp6_);
-#line 933 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1077 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp7_ = g_strdup ("");
-#line 933 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1077 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp7_;
-#line 933 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1077 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 933 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1077 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 6096 "ConfigurationInterfaces.c"
+#line 7231 "ConfigurationInterfaces.c"
 	}
-	__finally127:
-#line 928 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally140:
+#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 928 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1072 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
-#line 928 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1072 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return NULL;
-#line 6105 "ConfigurationInterfaces.c"
+#line 7240 "ConfigurationInterfaces.c"
 }
 
 
 gchar* configuration_facade_get_import_dir (ConfigurationFacade* self) {
-#line 927 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1071 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), NULL);
-#line 927 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1071 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_import_dir (self);
-#line 6114 "ConfigurationInterfaces.c"
+#line 7249 "ConfigurationInterfaces.c"
 }
 
 
 static void configuration_facade_real_set_import_dir (ConfigurationFacade* self, const gchar* import_dir) {
 	GError * _inner_error_ = NULL;
-#line 937 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1081 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (import_dir != NULL);
-#line 6122 "ConfigurationInterfaces.c"
+#line 7257 "ConfigurationInterfaces.c"
 	{
 		ConfigurationEngine* _tmp0_ = NULL;
 		ConfigurationEngine* _tmp1_ = NULL;
 		const gchar* _tmp2_ = NULL;
-#line 939 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1083 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = configuration_facade_get_engine (self);
-#line 939 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1083 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = _tmp0_;
-#line 939 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1083 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = import_dir;
-#line 939 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1083 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_engine_set_string_property (_tmp1_, CONFIGURABLE_PROPERTY_IMPORT_DIR, _tmp2_, &_inner_error_);
-#line 939 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1083 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp1_);
-#line 939 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1083 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 939 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1083 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 6141 "ConfigurationInterfaces.c"
-				goto __catch128_configuration_error;
+#line 7276 "ConfigurationInterfaces.c"
+				goto __catch141_configuration_error;
 			}
-#line 939 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#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);
-#line 939 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1083 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 939 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1083 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 6150 "ConfigurationInterfaces.c"
+#line 7285 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally128;
-	__catch128_configuration_error:
+	goto __finally141;
+	__catch141_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
-#line 938 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1082 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 938 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1082 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 941 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1085 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = err;
-#line 941 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1085 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp3_);
-#line 938 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1082 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 6168 "ConfigurationInterfaces.c"
+#line 7303 "ConfigurationInterfaces.c"
 	}
-	__finally128:
-#line 938 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally141:
+#line 1082 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 938 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1082 "/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 938 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1082 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		g_clear_error (&_inner_error_);
-#line 938 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1082 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 6179 "ConfigurationInterfaces.c"
+#line 7314 "ConfigurationInterfaces.c"
 	}
 }
 
 
 void configuration_facade_set_import_dir (ConfigurationFacade* self, const gchar* import_dir) {
-#line 937 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1081 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
-#line 937 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1081 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_import_dir (self, import_dir);
-#line 6189 "ConfigurationInterfaces.c"
+#line 7324 "ConfigurationInterfaces.c"
 }
 
 
@@ -6203,77 +7338,77 @@ static gboolean configuration_facade_real_get_keep_relativity (ConfigurationFaca
 		ConfigurationEngine* _tmp2_ = NULL;
 		gboolean _tmp3_ = FALSE;
 		gboolean _tmp4_ = FALSE;
-#line 950 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1094 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = configuration_facade_get_engine (self);
-#line 950 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1094 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = _tmp1_;
-#line 950 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1094 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = configuration_engine_get_bool_property (_tmp2_, CONFIGURABLE_PROPERTY_KEEP_RELATIVITY, &_inner_error_);
-#line 950 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1094 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp4_ = _tmp3_;
-#line 950 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1094 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp2_);
-#line 950 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1094 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = _tmp4_;
-#line 950 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1094 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 950 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1094 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 6218 "ConfigurationInterfaces.c"
-				goto __catch129_configuration_error;
+#line 7353 "ConfigurationInterfaces.c"
+				goto __catch142_configuration_error;
 			}
-#line 950 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#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);
-#line 950 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1094 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 950 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1094 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return FALSE;
-#line 6227 "ConfigurationInterfaces.c"
+#line 7362 "ConfigurationInterfaces.c"
 		}
-#line 950 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1094 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp0_;
-#line 950 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1094 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 6233 "ConfigurationInterfaces.c"
+#line 7368 "ConfigurationInterfaces.c"
 	}
-	goto __finally129;
-	__catch129_configuration_error:
+	goto __finally142;
+	__catch142_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp5_ = NULL;
-#line 949 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1093 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 949 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1093 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 952 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1096 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp5_ = err;
-#line 952 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1096 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp5_);
-#line 954 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1098 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = TRUE;
-#line 954 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1098 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 954 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1098 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 6254 "ConfigurationInterfaces.c"
+#line 7389 "ConfigurationInterfaces.c"
 	}
-	__finally129:
-#line 949 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally142:
+#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 949 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1093 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
-#line 949 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1093 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return FALSE;
-#line 6263 "ConfigurationInterfaces.c"
+#line 7398 "ConfigurationInterfaces.c"
 }
 
 
 gboolean configuration_facade_get_keep_relativity (ConfigurationFacade* self) {
-#line 948 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1092 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), FALSE);
-#line 948 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1092 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_keep_relativity (self);
-#line 6272 "ConfigurationInterfaces.c"
+#line 7407 "ConfigurationInterfaces.c"
 }
 
 
@@ -6283,69 +7418,69 @@ static void configuration_facade_real_set_keep_relativity (ConfigurationFacade*
 		ConfigurationEngine* _tmp0_ = NULL;
 		ConfigurationEngine* _tmp1_ = NULL;
 		gboolean _tmp2_ = FALSE;
-#line 960 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1104 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = configuration_facade_get_engine (self);
-#line 960 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1104 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = _tmp0_;
-#line 960 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1104 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = keep_relativity;
-#line 960 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1104 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_engine_set_bool_property (_tmp1_, CONFIGURABLE_PROPERTY_KEEP_RELATIVITY, _tmp2_, &_inner_error_);
-#line 960 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1104 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp1_);
-#line 960 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1104 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 960 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1104 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 6296 "ConfigurationInterfaces.c"
-				goto __catch130_configuration_error;
+#line 7431 "ConfigurationInterfaces.c"
+				goto __catch143_configuration_error;
 			}
-#line 960 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#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);
-#line 960 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1104 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 960 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1104 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 6305 "ConfigurationInterfaces.c"
+#line 7440 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally130;
-	__catch130_configuration_error:
+	goto __finally143;
+	__catch143_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
-#line 959 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1103 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 959 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1103 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 962 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1106 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = err;
-#line 962 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1106 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp3_);
-#line 959 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1103 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 6323 "ConfigurationInterfaces.c"
+#line 7458 "ConfigurationInterfaces.c"
 	}
-	__finally130:
-#line 959 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally143:
+#line 1103 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 959 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1103 "/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 959 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1103 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		g_clear_error (&_inner_error_);
-#line 959 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1103 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 6334 "ConfigurationInterfaces.c"
+#line 7469 "ConfigurationInterfaces.c"
 	}
 }
 
 
 void configuration_facade_set_keep_relativity (ConfigurationFacade* self, gboolean keep_relativity) {
-#line 958 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1102 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
-#line 958 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1102 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_keep_relativity (self, keep_relativity);
-#line 6344 "ConfigurationInterfaces.c"
+#line 7479 "ConfigurationInterfaces.c"
 }
 
 
@@ -6358,77 +7493,77 @@ static gboolean configuration_facade_real_get_pin_toolbar_state (ConfigurationFa
 		ConfigurationEngine* _tmp2_ = NULL;
 		gboolean _tmp3_ = FALSE;
 		gboolean _tmp4_ = FALSE;
-#line 971 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1115 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = configuration_facade_get_engine (self);
-#line 971 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1115 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = _tmp1_;
-#line 971 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1115 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = configuration_engine_get_bool_property (_tmp2_, CONFIGURABLE_PROPERTY_PIN_TOOLBAR_STATE, &_inner_error_);
-#line 971 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1115 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp4_ = _tmp3_;
-#line 971 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1115 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp2_);
-#line 971 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1115 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = _tmp4_;
-#line 971 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1115 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 971 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1115 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 6373 "ConfigurationInterfaces.c"
-				goto __catch131_configuration_error;
+#line 7508 "ConfigurationInterfaces.c"
+				goto __catch144_configuration_error;
 			}
-#line 971 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#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);
-#line 971 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1115 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 971 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1115 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return FALSE;
-#line 6382 "ConfigurationInterfaces.c"
+#line 7517 "ConfigurationInterfaces.c"
 		}
-#line 971 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1115 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp0_;
-#line 971 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1115 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 6388 "ConfigurationInterfaces.c"
+#line 7523 "ConfigurationInterfaces.c"
 	}
-	goto __finally131;
-	__catch131_configuration_error:
+	goto __finally144;
+	__catch144_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp5_ = NULL;
-#line 970 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1114 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 970 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1114 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 973 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1117 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp5_ = err;
-#line 973 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1117 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp5_);
-#line 974 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1118 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = FALSE;
-#line 974 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1118 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 974 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1118 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 6409 "ConfigurationInterfaces.c"
+#line 7544 "ConfigurationInterfaces.c"
 	}
-	__finally131:
-#line 970 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally144:
+#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 970 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1114 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
-#line 970 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1114 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return FALSE;
-#line 6418 "ConfigurationInterfaces.c"
+#line 7553 "ConfigurationInterfaces.c"
 }
 
 
 gboolean configuration_facade_get_pin_toolbar_state (ConfigurationFacade* self) {
-#line 969 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1113 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), FALSE);
-#line 969 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1113 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_pin_toolbar_state (self);
-#line 6427 "ConfigurationInterfaces.c"
+#line 7562 "ConfigurationInterfaces.c"
 }
 
 
@@ -6438,69 +7573,69 @@ static void configuration_facade_real_set_pin_toolbar_state (ConfigurationFacade
 		ConfigurationEngine* _tmp0_ = NULL;
 		ConfigurationEngine* _tmp1_ = NULL;
 		gboolean _tmp2_ = FALSE;
-#line 980 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1124 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = configuration_facade_get_engine (self);
-#line 980 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1124 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = _tmp0_;
-#line 980 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1124 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = state;
-#line 980 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1124 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_engine_set_bool_property (_tmp1_, CONFIGURABLE_PROPERTY_PIN_TOOLBAR_STATE, _tmp2_, &_inner_error_);
-#line 980 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1124 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp1_);
-#line 980 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1124 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 980 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1124 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 6451 "ConfigurationInterfaces.c"
-				goto __catch132_configuration_error;
+#line 7586 "ConfigurationInterfaces.c"
+				goto __catch145_configuration_error;
 			}
-#line 980 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#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);
-#line 980 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1124 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 980 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1124 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 6460 "ConfigurationInterfaces.c"
+#line 7595 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally132;
-	__catch132_configuration_error:
+	goto __finally145;
+	__catch145_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
-#line 979 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1123 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 979 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1123 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 982 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1126 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = err;
-#line 982 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1126 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp3_);
-#line 979 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1123 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 6478 "ConfigurationInterfaces.c"
+#line 7613 "ConfigurationInterfaces.c"
 	}
-	__finally132:
-#line 979 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally145:
+#line 1123 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 979 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1123 "/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 979 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1123 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		g_clear_error (&_inner_error_);
-#line 979 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1123 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 6489 "ConfigurationInterfaces.c"
+#line 7624 "ConfigurationInterfaces.c"
 	}
 }
 
 
 void configuration_facade_set_pin_toolbar_state (ConfigurationFacade* self, gboolean state) {
-#line 978 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1122 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
-#line 978 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1122 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_pin_toolbar_state (self, state);
-#line 6499 "ConfigurationInterfaces.c"
+#line 7634 "ConfigurationInterfaces.c"
 }
 
 
@@ -6513,77 +7648,77 @@ static gint configuration_facade_real_get_last_crop_height (ConfigurationFacade*
 		ConfigurationEngine* _tmp2_ = NULL;
 		gint _tmp3_ = 0;
 		gint _tmp4_ = 0;
-#line 991 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1135 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = configuration_facade_get_engine (self);
-#line 991 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1135 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = _tmp1_;
-#line 991 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1135 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = configuration_engine_get_int_property (_tmp2_, CONFIGURABLE_PROPERTY_LAST_CROP_HEIGHT, &_inner_error_);
-#line 991 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1135 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp4_ = _tmp3_;
-#line 991 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1135 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp2_);
-#line 991 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1135 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = _tmp4_;
-#line 991 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1135 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 991 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1135 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 6528 "ConfigurationInterfaces.c"
-				goto __catch133_configuration_error;
+#line 7663 "ConfigurationInterfaces.c"
+				goto __catch146_configuration_error;
 			}
-#line 991 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#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);
-#line 991 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1135 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 991 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1135 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return 0;
-#line 6537 "ConfigurationInterfaces.c"
+#line 7672 "ConfigurationInterfaces.c"
 		}
-#line 991 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1135 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp0_;
-#line 991 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1135 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 6543 "ConfigurationInterfaces.c"
+#line 7678 "ConfigurationInterfaces.c"
 	}
-	goto __finally133;
-	__catch133_configuration_error:
+	goto __finally146;
+	__catch146_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp5_ = NULL;
-#line 990 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1134 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 990 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1134 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 993 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1137 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp5_ = err;
-#line 993 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1137 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp5_);
-#line 994 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1138 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = 1;
-#line 994 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1138 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 994 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1138 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 6564 "ConfigurationInterfaces.c"
+#line 7699 "ConfigurationInterfaces.c"
 	}
-	__finally133:
-#line 990 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally146:
+#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 990 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1134 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
-#line 990 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1134 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return 0;
-#line 6573 "ConfigurationInterfaces.c"
+#line 7708 "ConfigurationInterfaces.c"
 }
 
 
 gint configuration_facade_get_last_crop_height (ConfigurationFacade* self) {
-#line 989 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1133 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), 0);
-#line 989 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1133 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_last_crop_height (self);
-#line 6582 "ConfigurationInterfaces.c"
+#line 7717 "ConfigurationInterfaces.c"
 }
 
 
@@ -6593,69 +7728,69 @@ static void configuration_facade_real_set_last_crop_height (ConfigurationFacade*
 		ConfigurationEngine* _tmp0_ = NULL;
 		ConfigurationEngine* _tmp1_ = NULL;
 		gint _tmp2_ = 0;
-#line 1000 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1144 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = configuration_facade_get_engine (self);
-#line 1000 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1144 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = _tmp0_;
-#line 1000 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1144 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = choice;
-#line 1000 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1144 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_engine_set_int_property (_tmp1_, CONFIGURABLE_PROPERTY_LAST_CROP_HEIGHT, _tmp2_, &_inner_error_);
-#line 1000 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1144 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp1_);
-#line 1000 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1144 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1000 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1144 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 6606 "ConfigurationInterfaces.c"
-				goto __catch134_configuration_error;
+#line 7741 "ConfigurationInterfaces.c"
+				goto __catch147_configuration_error;
 			}
-#line 1000 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#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);
-#line 1000 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1144 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 1000 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1144 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 6615 "ConfigurationInterfaces.c"
+#line 7750 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally134;
-	__catch134_configuration_error:
+	goto __finally147;
+	__catch147_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
-#line 999 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1143 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 999 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1143 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 1002 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1146 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = err;
-#line 1002 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1146 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp3_);
-#line 999 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1143 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 6633 "ConfigurationInterfaces.c"
+#line 7768 "ConfigurationInterfaces.c"
 	}
-	__finally134:
-#line 999 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally147:
+#line 1143 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 999 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1143 "/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 999 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1143 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		g_clear_error (&_inner_error_);
-#line 999 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1143 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 6644 "ConfigurationInterfaces.c"
+#line 7779 "ConfigurationInterfaces.c"
 	}
 }
 
 
 void configuration_facade_set_last_crop_height (ConfigurationFacade* self, gint choice) {
-#line 998 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1142 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
-#line 998 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1142 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_last_crop_height (self, choice);
-#line 6654 "ConfigurationInterfaces.c"
+#line 7789 "ConfigurationInterfaces.c"
 }
 
 
@@ -6668,77 +7803,77 @@ static gint configuration_facade_real_get_last_crop_menu_choice (ConfigurationFa
 		ConfigurationEngine* _tmp2_ = NULL;
 		gint _tmp3_ = 0;
 		gint _tmp4_ = 0;
-#line 1011 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1155 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = configuration_facade_get_engine (self);
-#line 1011 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1155 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = _tmp1_;
-#line 1011 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1155 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = configuration_engine_get_int_property (_tmp2_, CONFIGURABLE_PROPERTY_LAST_CROP_MENU_CHOICE, &_inner_error_);
-#line 1011 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1155 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp4_ = _tmp3_;
-#line 1011 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1155 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp2_);
-#line 1011 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1155 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = _tmp4_;
-#line 1011 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1155 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1011 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1155 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 6683 "ConfigurationInterfaces.c"
-				goto __catch135_configuration_error;
+#line 7818 "ConfigurationInterfaces.c"
+				goto __catch148_configuration_error;
 			}
-#line 1011 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#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);
-#line 1011 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1155 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 1011 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1155 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return 0;
-#line 6692 "ConfigurationInterfaces.c"
+#line 7827 "ConfigurationInterfaces.c"
 		}
-#line 1011 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1155 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp0_;
-#line 1011 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1155 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 6698 "ConfigurationInterfaces.c"
+#line 7833 "ConfigurationInterfaces.c"
 	}
-	goto __finally135;
-	__catch135_configuration_error:
+	goto __finally148;
+	__catch148_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp5_ = NULL;
-#line 1010 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1154 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 1010 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1154 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 1013 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1157 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp5_ = err;
-#line 1013 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1157 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp5_);
-#line 1018 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1162 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = 0;
-#line 1018 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1162 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 1018 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1162 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 6719 "ConfigurationInterfaces.c"
+#line 7854 "ConfigurationInterfaces.c"
 	}
-	__finally135:
-#line 1010 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally148:
+#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 1010 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1154 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
-#line 1010 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1154 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return 0;
-#line 6728 "ConfigurationInterfaces.c"
+#line 7863 "ConfigurationInterfaces.c"
 }
 
 
 gint configuration_facade_get_last_crop_menu_choice (ConfigurationFacade* self) {
-#line 1009 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1153 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), 0);
-#line 1009 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1153 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_last_crop_menu_choice (self);
-#line 6737 "ConfigurationInterfaces.c"
+#line 7872 "ConfigurationInterfaces.c"
 }
 
 
@@ -6748,69 +7883,69 @@ static void configuration_facade_real_set_last_crop_menu_choice (ConfigurationFa
 		ConfigurationEngine* _tmp0_ = NULL;
 		ConfigurationEngine* _tmp1_ = NULL;
 		gint _tmp2_ = 0;
-#line 1024 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1168 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = configuration_facade_get_engine (self);
-#line 1024 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1168 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = _tmp0_;
-#line 1024 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1168 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = choice;
-#line 1024 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1168 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_engine_set_int_property (_tmp1_, CONFIGURABLE_PROPERTY_LAST_CROP_MENU_CHOICE, _tmp2_, &_inner_error_);
-#line 1024 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1168 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp1_);
-#line 1024 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1168 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1024 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1168 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 6761 "ConfigurationInterfaces.c"
-				goto __catch136_configuration_error;
+#line 7896 "ConfigurationInterfaces.c"
+				goto __catch149_configuration_error;
 			}
-#line 1024 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#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);
-#line 1024 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1168 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 1024 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1168 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 6770 "ConfigurationInterfaces.c"
+#line 7905 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally136;
-	__catch136_configuration_error:
+	goto __finally149;
+	__catch149_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
-#line 1023 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1167 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 1023 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1167 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 1026 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1170 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = err;
-#line 1026 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1170 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp3_);
-#line 1023 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1167 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 6788 "ConfigurationInterfaces.c"
+#line 7923 "ConfigurationInterfaces.c"
 	}
-	__finally136:
-#line 1023 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally149:
+#line 1167 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1023 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1167 "/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 1023 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1167 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		g_clear_error (&_inner_error_);
-#line 1023 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1167 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 6799 "ConfigurationInterfaces.c"
+#line 7934 "ConfigurationInterfaces.c"
 	}
 }
 
 
 void configuration_facade_set_last_crop_menu_choice (ConfigurationFacade* self, gint choice) {
-#line 1022 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1166 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
-#line 1022 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1166 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_last_crop_menu_choice (self, choice);
-#line 6809 "ConfigurationInterfaces.c"
+#line 7944 "ConfigurationInterfaces.c"
 }
 
 
@@ -6823,77 +7958,77 @@ static gint configuration_facade_real_get_last_crop_width (ConfigurationFacade*
 		ConfigurationEngine* _tmp2_ = NULL;
 		gint _tmp3_ = 0;
 		gint _tmp4_ = 0;
-#line 1035 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1179 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = configuration_facade_get_engine (self);
-#line 1035 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1179 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = _tmp1_;
-#line 1035 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1179 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = configuration_engine_get_int_property (_tmp2_, CONFIGURABLE_PROPERTY_LAST_CROP_WIDTH, &_inner_error_);
-#line 1035 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1179 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp4_ = _tmp3_;
-#line 1035 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1179 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp2_);
-#line 1035 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1179 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = _tmp4_;
-#line 1035 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1179 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1035 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1179 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 6838 "ConfigurationInterfaces.c"
-				goto __catch137_configuration_error;
+#line 7973 "ConfigurationInterfaces.c"
+				goto __catch150_configuration_error;
 			}
-#line 1035 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#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);
-#line 1035 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1179 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 1035 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1179 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return 0;
-#line 6847 "ConfigurationInterfaces.c"
+#line 7982 "ConfigurationInterfaces.c"
 		}
-#line 1035 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1179 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp0_;
-#line 1035 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1179 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 6853 "ConfigurationInterfaces.c"
+#line 7988 "ConfigurationInterfaces.c"
 	}
-	goto __finally137;
-	__catch137_configuration_error:
+	goto __finally150;
+	__catch150_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp5_ = NULL;
-#line 1034 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1178 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 1034 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1178 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 1037 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1181 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp5_ = err;
-#line 1037 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1181 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp5_);
-#line 1038 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1182 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = 1;
-#line 1038 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1182 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 1038 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1182 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 6874 "ConfigurationInterfaces.c"
+#line 8009 "ConfigurationInterfaces.c"
 	}
-	__finally137:
-#line 1034 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally150:
+#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 1034 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1178 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
-#line 1034 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1178 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return 0;
-#line 6883 "ConfigurationInterfaces.c"
+#line 8018 "ConfigurationInterfaces.c"
 }
 
 
 gint configuration_facade_get_last_crop_width (ConfigurationFacade* self) {
-#line 1033 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1177 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), 0);
-#line 1033 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1177 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_last_crop_width (self);
-#line 6892 "ConfigurationInterfaces.c"
+#line 8027 "ConfigurationInterfaces.c"
 }
 
 
@@ -6903,69 +8038,69 @@ static void configuration_facade_real_set_last_crop_width (ConfigurationFacade*
 		ConfigurationEngine* _tmp0_ = NULL;
 		ConfigurationEngine* _tmp1_ = NULL;
 		gint _tmp2_ = 0;
-#line 1044 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1188 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = configuration_facade_get_engine (self);
-#line 1044 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1188 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = _tmp0_;
-#line 1044 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1188 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = choice;
-#line 1044 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1188 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_engine_set_int_property (_tmp1_, CONFIGURABLE_PROPERTY_LAST_CROP_WIDTH, _tmp2_, &_inner_error_);
-#line 1044 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1188 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp1_);
-#line 1044 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1188 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1044 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1188 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 6916 "ConfigurationInterfaces.c"
-				goto __catch138_configuration_error;
+#line 8051 "ConfigurationInterfaces.c"
+				goto __catch151_configuration_error;
 			}
-#line 1044 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#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);
-#line 1044 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1188 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 1044 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1188 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 6925 "ConfigurationInterfaces.c"
+#line 8060 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally138;
-	__catch138_configuration_error:
+	goto __finally151;
+	__catch151_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
-#line 1043 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1187 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 1043 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1187 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 1046 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1190 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = err;
-#line 1046 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1190 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp3_);
-#line 1043 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1187 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 6943 "ConfigurationInterfaces.c"
+#line 8078 "ConfigurationInterfaces.c"
 	}
-	__finally138:
-#line 1043 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally151:
+#line 1187 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1043 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1187 "/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 1043 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1187 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		g_clear_error (&_inner_error_);
-#line 1043 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1187 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 6954 "ConfigurationInterfaces.c"
+#line 8089 "ConfigurationInterfaces.c"
 	}
 }
 
 
 void configuration_facade_set_last_crop_width (ConfigurationFacade* self, gint choice) {
-#line 1042 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1186 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
-#line 1042 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1186 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_last_crop_width (self, choice);
-#line 6964 "ConfigurationInterfaces.c"
+#line 8099 "ConfigurationInterfaces.c"
 }
 
 
@@ -6979,161 +8114,161 @@ static gchar* configuration_facade_real_get_last_used_service (ConfigurationFaca
 		gchar* _tmp3_ = NULL;
 		gchar* _tmp4_ = NULL;
 		gchar* _tmp5_ = NULL;
-#line 1055 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1199 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = configuration_facade_get_engine (self);
-#line 1055 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1199 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = _tmp1_;
-#line 1055 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1199 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = configuration_engine_get_string_property (_tmp2_, CONFIGURABLE_PROPERTY_LAST_USED_SERVICE, &_inner_error_);
-#line 1055 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1199 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp4_ = _tmp3_;
-#line 1055 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1199 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp2_);
-#line 1055 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1199 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = _tmp4_;
-#line 1055 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1199 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1055 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1199 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 6994 "ConfigurationInterfaces.c"
-				goto __catch139_configuration_error;
+#line 8129 "ConfigurationInterfaces.c"
+				goto __catch152_configuration_error;
 			}
-#line 1055 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#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);
-#line 1055 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1199 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 1055 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1199 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return NULL;
-#line 7003 "ConfigurationInterfaces.c"
+#line 8138 "ConfigurationInterfaces.c"
 		}
-#line 1055 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1199 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp5_ = _tmp0_;
-#line 1055 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1199 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = NULL;
-#line 1055 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1199 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp5_;
-#line 1055 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1199 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_free0 (_tmp0_);
-#line 1055 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1199 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 7015 "ConfigurationInterfaces.c"
+#line 8150 "ConfigurationInterfaces.c"
 	}
-	goto __finally139;
-	__catch139_configuration_error:
+	goto __finally152;
+	__catch152_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp6_ = NULL;
 		gchar* _tmp7_ = NULL;
-#line 1054 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1198 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 1054 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1198 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 1057 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1201 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp6_ = err;
-#line 1057 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1201 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp6_);
-#line 1062 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1206 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp7_ = g_strdup ("");
-#line 1062 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1206 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp7_;
-#line 1062 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1206 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 1062 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1206 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 7039 "ConfigurationInterfaces.c"
+#line 8174 "ConfigurationInterfaces.c"
 	}
-	__finally139:
-#line 1054 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally152:
+#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 1054 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1198 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
-#line 1054 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1198 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return NULL;
-#line 7048 "ConfigurationInterfaces.c"
+#line 8183 "ConfigurationInterfaces.c"
 }
 
 
 gchar* configuration_facade_get_last_used_service (ConfigurationFacade* self) {
-#line 1053 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1197 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), NULL);
-#line 1053 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1197 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_last_used_service (self);
-#line 7057 "ConfigurationInterfaces.c"
+#line 8192 "ConfigurationInterfaces.c"
 }
 
 
 static void configuration_facade_real_set_last_used_service (ConfigurationFacade* self, const gchar* service_name) {
 	GError * _inner_error_ = NULL;
-#line 1066 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1210 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (service_name != NULL);
-#line 7065 "ConfigurationInterfaces.c"
+#line 8200 "ConfigurationInterfaces.c"
 	{
 		ConfigurationEngine* _tmp0_ = NULL;
 		ConfigurationEngine* _tmp1_ = NULL;
 		const gchar* _tmp2_ = NULL;
-#line 1068 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1212 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = configuration_facade_get_engine (self);
-#line 1068 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1212 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = _tmp0_;
-#line 1068 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1212 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = service_name;
-#line 1068 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1212 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_engine_set_string_property (_tmp1_, CONFIGURABLE_PROPERTY_LAST_USED_SERVICE, _tmp2_, &_inner_error_);
-#line 1068 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1212 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp1_);
-#line 1068 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1212 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1068 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1212 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 7084 "ConfigurationInterfaces.c"
-				goto __catch140_configuration_error;
+#line 8219 "ConfigurationInterfaces.c"
+				goto __catch153_configuration_error;
 			}
-#line 1068 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#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);
-#line 1068 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1212 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 1068 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1212 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 7093 "ConfigurationInterfaces.c"
+#line 8228 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally140;
-	__catch140_configuration_error:
+	goto __finally153;
+	__catch153_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
-#line 1067 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1211 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 1067 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1211 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 1070 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1214 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = err;
-#line 1070 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1214 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp3_);
-#line 1067 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1211 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 7111 "ConfigurationInterfaces.c"
+#line 8246 "ConfigurationInterfaces.c"
 	}
-	__finally140:
-#line 1067 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally153:
+#line 1211 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1067 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1211 "/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 1067 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1211 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		g_clear_error (&_inner_error_);
-#line 1067 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1211 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 7122 "ConfigurationInterfaces.c"
+#line 8257 "ConfigurationInterfaces.c"
 	}
 }
 
 
 void configuration_facade_set_last_used_service (ConfigurationFacade* self, const gchar* service_name) {
-#line 1066 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1210 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
-#line 1066 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1210 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_last_used_service (self, service_name);
-#line 7132 "ConfigurationInterfaces.c"
+#line 8267 "ConfigurationInterfaces.c"
 }
 
 
@@ -7147,161 +8282,161 @@ static gchar* configuration_facade_real_get_last_used_dataimports_service (Confi
 		gchar* _tmp3_ = NULL;
 		gchar* _tmp4_ = NULL;
 		gchar* _tmp5_ = NULL;
-#line 1079 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1223 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = configuration_facade_get_engine (self);
-#line 1079 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1223 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = _tmp1_;
-#line 1079 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1223 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = configuration_engine_get_string_property (_tmp2_, CONFIGURABLE_PROPERTY_LAST_USED_DATAIMPORTS_SERVICE, &_inner_error_);
-#line 1079 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1223 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp4_ = _tmp3_;
-#line 1079 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1223 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp2_);
-#line 1079 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1223 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = _tmp4_;
-#line 1079 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1223 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1079 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1223 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 7162 "ConfigurationInterfaces.c"
-				goto __catch141_configuration_error;
+#line 8297 "ConfigurationInterfaces.c"
+				goto __catch154_configuration_error;
 			}
-#line 1079 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#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);
-#line 1079 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1223 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 1079 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1223 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return NULL;
-#line 7171 "ConfigurationInterfaces.c"
+#line 8306 "ConfigurationInterfaces.c"
 		}
-#line 1079 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1223 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp5_ = _tmp0_;
-#line 1079 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1223 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = NULL;
-#line 1079 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1223 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp5_;
-#line 1079 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1223 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_free0 (_tmp0_);
-#line 1079 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1223 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 7183 "ConfigurationInterfaces.c"
+#line 8318 "ConfigurationInterfaces.c"
 	}
-	goto __finally141;
-	__catch141_configuration_error:
+	goto __finally154;
+	__catch154_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp6_ = NULL;
 		gchar* _tmp7_ = NULL;
-#line 1078 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1222 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 1078 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1222 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 1081 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1225 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp6_ = err;
-#line 1081 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1225 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp6_);
-#line 1086 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1230 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp7_ = g_strdup ("");
-#line 1086 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1230 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp7_;
-#line 1086 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1230 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 1086 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1230 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 7207 "ConfigurationInterfaces.c"
+#line 8342 "ConfigurationInterfaces.c"
 	}
-	__finally141:
-#line 1078 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally154:
+#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 1078 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1222 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
-#line 1078 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1222 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return NULL;
-#line 7216 "ConfigurationInterfaces.c"
+#line 8351 "ConfigurationInterfaces.c"
 }
 
 
 gchar* configuration_facade_get_last_used_dataimports_service (ConfigurationFacade* self) {
-#line 1077 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1221 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), NULL);
-#line 1077 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1221 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_last_used_dataimports_service (self);
-#line 7225 "ConfigurationInterfaces.c"
+#line 8360 "ConfigurationInterfaces.c"
 }
 
 
 static void configuration_facade_real_set_last_used_dataimports_service (ConfigurationFacade* self, const gchar* service_name) {
 	GError * _inner_error_ = NULL;
-#line 1090 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1234 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (service_name != NULL);
-#line 7233 "ConfigurationInterfaces.c"
+#line 8368 "ConfigurationInterfaces.c"
 	{
 		ConfigurationEngine* _tmp0_ = NULL;
 		ConfigurationEngine* _tmp1_ = NULL;
 		const gchar* _tmp2_ = NULL;
-#line 1092 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1236 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = configuration_facade_get_engine (self);
-#line 1092 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1236 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = _tmp0_;
-#line 1092 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1236 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = service_name;
-#line 1092 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1236 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_engine_set_string_property (_tmp1_, CONFIGURABLE_PROPERTY_LAST_USED_DATAIMPORTS_SERVICE, _tmp2_, &_inner_error_);
-#line 1092 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1236 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp1_);
-#line 1092 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1236 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1092 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1236 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 7252 "ConfigurationInterfaces.c"
-				goto __catch142_configuration_error;
+#line 8387 "ConfigurationInterfaces.c"
+				goto __catch155_configuration_error;
 			}
-#line 1092 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#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);
-#line 1092 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1236 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 1092 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1236 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 7261 "ConfigurationInterfaces.c"
+#line 8396 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally142;
-	__catch142_configuration_error:
+	goto __finally155;
+	__catch155_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
-#line 1091 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1235 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 1091 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1235 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 1094 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1238 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = err;
-#line 1094 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1238 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp3_);
-#line 1091 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1235 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 7279 "ConfigurationInterfaces.c"
+#line 8414 "ConfigurationInterfaces.c"
 	}
-	__finally142:
-#line 1091 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally155:
+#line 1235 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1091 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1235 "/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 1091 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1235 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		g_clear_error (&_inner_error_);
-#line 1091 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1235 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 7290 "ConfigurationInterfaces.c"
+#line 8425 "ConfigurationInterfaces.c"
 	}
 }
 
 
 void configuration_facade_set_last_used_dataimports_service (ConfigurationFacade* self, const gchar* service_name) {
-#line 1090 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1234 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
-#line 1090 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1234 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_last_used_dataimports_service (self, service_name);
-#line 7300 "ConfigurationInterfaces.c"
+#line 8435 "ConfigurationInterfaces.c"
 }
 
 
@@ -7309,11 +8444,11 @@ static void configuration_facade_real_get_library_photos_sort (ConfigurationFaca
 	gboolean _vala_sort_order = FALSE;
 	gint _vala_sort_by = 0;
 	GError * _inner_error_ = NULL;
-#line 1102 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1246 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_vala_sort_order = FALSE;
-#line 1103 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1247 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_vala_sort_by = 2;
-#line 7312 "ConfigurationInterfaces.c"
+#line 8447 "ConfigurationInterfaces.c"
 	{
 		gboolean _tmp0_ = FALSE;
 		ConfigurationEngine* _tmp1_ = NULL;
@@ -7325,115 +8460,115 @@ static void configuration_facade_real_get_library_photos_sort (ConfigurationFaca
 		ConfigurationEngine* _tmp7_ = NULL;
 		gint _tmp8_ = 0;
 		gint _tmp9_ = 0;
-#line 1105 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1249 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = configuration_facade_get_engine (self);
-#line 1105 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1249 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = _tmp1_;
-#line 1105 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1249 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = configuration_engine_get_bool_property (_tmp2_, CONFIGURABLE_PROPERTY_LIBRARY_PHOTOS_SORT_ASCENDING, &_inner_error_);
-#line 1105 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1249 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp4_ = _tmp3_;
-#line 1105 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1249 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp2_);
-#line 1105 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1249 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = _tmp4_;
-#line 1105 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1249 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1105 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1249 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 7340 "ConfigurationInterfaces.c"
-				goto __catch143_configuration_error;
+#line 8475 "ConfigurationInterfaces.c"
+				goto __catch156_configuration_error;
 			}
-#line 1105 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#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);
-#line 1105 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1249 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 1105 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1249 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 7349 "ConfigurationInterfaces.c"
+#line 8484 "ConfigurationInterfaces.c"
 		}
-#line 1105 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1249 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_vala_sort_order = _tmp0_;
-#line 1107 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1251 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp6_ = configuration_facade_get_engine (self);
-#line 1107 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1251 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp7_ = _tmp6_;
-#line 1107 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1251 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp8_ = configuration_engine_get_int_property (_tmp7_, CONFIGURABLE_PROPERTY_LIBRARY_PHOTOS_SORT_BY, &_inner_error_);
-#line 1107 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1251 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp9_ = _tmp8_;
-#line 1107 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1251 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp7_);
-#line 1107 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1251 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp5_ = _tmp9_;
-#line 1107 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1251 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1107 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1251 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 7369 "ConfigurationInterfaces.c"
-				goto __catch143_configuration_error;
+#line 8504 "ConfigurationInterfaces.c"
+				goto __catch156_configuration_error;
 			}
-#line 1107 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#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);
-#line 1107 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1251 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 1107 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1251 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 7378 "ConfigurationInterfaces.c"
+#line 8513 "ConfigurationInterfaces.c"
 		}
-#line 1107 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1251 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_vala_sort_by = _tmp5_;
-#line 7382 "ConfigurationInterfaces.c"
+#line 8517 "ConfigurationInterfaces.c"
 	}
-	goto __finally143;
-	__catch143_configuration_error:
+	goto __finally156;
+	__catch156_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp10_ = NULL;
-#line 1104 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1248 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 1104 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1248 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 1109 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1253 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp10_ = err;
-#line 1109 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1253 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp10_);
-#line 1104 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1248 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 7399 "ConfigurationInterfaces.c"
+#line 8534 "ConfigurationInterfaces.c"
 	}
-	__finally143:
-#line 1104 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally156:
+#line 1248 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1104 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1248 "/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 1104 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1248 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		g_clear_error (&_inner_error_);
-#line 1104 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1248 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 7410 "ConfigurationInterfaces.c"
+#line 8545 "ConfigurationInterfaces.c"
 	}
-#line 1101 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1245 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (sort_order) {
-#line 1101 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1245 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		*sort_order = _vala_sort_order;
-#line 7416 "ConfigurationInterfaces.c"
+#line 8551 "ConfigurationInterfaces.c"
 	}
-#line 1101 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1245 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (sort_by) {
-#line 1101 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1245 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		*sort_by = _vala_sort_by;
-#line 7422 "ConfigurationInterfaces.c"
+#line 8557 "ConfigurationInterfaces.c"
 	}
 }
 
 
 void configuration_facade_get_library_photos_sort (ConfigurationFacade* self, gboolean* sort_order, gint* sort_by) {
-#line 1101 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1245 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
-#line 1101 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#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 7432 "ConfigurationInterfaces.c"
+#line 8567 "ConfigurationInterfaces.c"
 }
 
 
@@ -7446,94 +8581,94 @@ static void configuration_facade_real_set_library_photos_sort (ConfigurationFaca
 		ConfigurationEngine* _tmp3_ = NULL;
 		ConfigurationEngine* _tmp4_ = NULL;
 		gint _tmp5_ = 0;
-#line 1115 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1259 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = configuration_facade_get_engine (self);
-#line 1115 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1259 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = _tmp0_;
-#line 1115 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1259 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = sort_order;
-#line 1115 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1259 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_engine_set_bool_property (_tmp1_, CONFIGURABLE_PROPERTY_LIBRARY_PHOTOS_SORT_ASCENDING, _tmp2_, &_inner_error_);
-#line 1115 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1259 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp1_);
-#line 1115 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1259 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1115 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1259 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 7459 "ConfigurationInterfaces.c"
-				goto __catch144_configuration_error;
+#line 8594 "ConfigurationInterfaces.c"
+				goto __catch157_configuration_error;
 			}
-#line 1115 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#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);
-#line 1115 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1259 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 1115 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1259 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 7468 "ConfigurationInterfaces.c"
+#line 8603 "ConfigurationInterfaces.c"
 		}
-#line 1117 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1261 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = configuration_facade_get_engine (self);
-#line 1117 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1261 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp4_ = _tmp3_;
-#line 1117 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1261 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp5_ = sort_by;
-#line 1117 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1261 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_engine_set_int_property (_tmp4_, CONFIGURABLE_PROPERTY_LIBRARY_PHOTOS_SORT_BY, _tmp5_, &_inner_error_);
-#line 1117 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1261 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp4_);
-#line 1117 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1261 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1117 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1261 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 7484 "ConfigurationInterfaces.c"
-				goto __catch144_configuration_error;
+#line 8619 "ConfigurationInterfaces.c"
+				goto __catch157_configuration_error;
 			}
-#line 1117 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#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);
-#line 1117 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1261 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 1117 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1261 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 7493 "ConfigurationInterfaces.c"
+#line 8628 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally144;
-	__catch144_configuration_error:
+	goto __finally157;
+	__catch157_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp6_ = NULL;
-#line 1114 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1258 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 1114 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1258 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 1120 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1264 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp6_ = err;
-#line 1120 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1264 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp6_);
-#line 1114 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1258 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 7511 "ConfigurationInterfaces.c"
+#line 8646 "ConfigurationInterfaces.c"
 	}
-	__finally144:
-#line 1114 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally157:
+#line 1258 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1114 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1258 "/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"
+#line 1258 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		g_clear_error (&_inner_error_);
-#line 1114 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1258 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 7522 "ConfigurationInterfaces.c"
+#line 8657 "ConfigurationInterfaces.c"
 	}
 }
 
 
 void configuration_facade_set_library_photos_sort (ConfigurationFacade* self, gboolean sort_order, gint sort_by) {
-#line 1113 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1257 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
-#line 1113 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#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 7532 "ConfigurationInterfaces.c"
+#line 8667 "ConfigurationInterfaces.c"
 }
 
 
@@ -7541,11 +8676,11 @@ static void configuration_facade_real_get_library_window_state (ConfigurationFac
 	gboolean _vala_maximize = FALSE;
 	Dimensions _vala_dimensions = {0};
 	GError * _inner_error_ = NULL;
-#line 1128 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1272 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_vala_maximize = FALSE;
-#line 1129 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1273 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	dimensions_init (&_vala_dimensions, 1024, 768);
-#line 7544 "ConfigurationInterfaces.c"
+#line 8679 "ConfigurationInterfaces.c"
 	{
 		gboolean _tmp0_ = FALSE;
 		ConfigurationEngine* _tmp1_ = NULL;
@@ -7564,154 +8699,154 @@ static void configuration_facade_real_get_library_window_state (ConfigurationFac
 		gint _tmp12_ = 0;
 		gint _tmp13_ = 0;
 		gint _tmp14_ = 0;
-#line 1131 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1275 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = configuration_facade_get_engine (self);
-#line 1131 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1275 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = _tmp1_;
-#line 1131 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1275 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = configuration_engine_get_bool_property (_tmp2_, CONFIGURABLE_PROPERTY_LIBRARY_WINDOW_MAXIMIZE, &_inner_error_);
-#line 1131 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1275 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp4_ = _tmp3_;
-#line 1131 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1275 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp2_);
-#line 1131 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1275 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = _tmp4_;
-#line 1131 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1275 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1131 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1275 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 7579 "ConfigurationInterfaces.c"
-				goto __catch145_configuration_error;
+#line 8714 "ConfigurationInterfaces.c"
+				goto __catch158_configuration_error;
 			}
-#line 1131 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#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);
-#line 1131 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1275 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 1131 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1275 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 7588 "ConfigurationInterfaces.c"
+#line 8723 "ConfigurationInterfaces.c"
 		}
-#line 1131 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1275 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_vala_maximize = _tmp0_;
-#line 1132 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1276 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp5_ = configuration_facade_get_engine (self);
-#line 1132 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1276 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp6_ = _tmp5_;
-#line 1132 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1276 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp7_ = configuration_engine_get_int_property (_tmp6_, CONFIGURABLE_PROPERTY_LIBRARY_WINDOW_WIDTH, &_inner_error_);
-#line 1132 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1276 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp8_ = _tmp7_;
-#line 1132 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1276 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp6_);
-#line 1132 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1276 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		w = _tmp8_;
-#line 1132 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1276 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1132 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1276 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 7608 "ConfigurationInterfaces.c"
-				goto __catch145_configuration_error;
+#line 8743 "ConfigurationInterfaces.c"
+				goto __catch158_configuration_error;
 			}
-#line 1132 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#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);
-#line 1132 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1276 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 1132 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1276 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 7617 "ConfigurationInterfaces.c"
+#line 8752 "ConfigurationInterfaces.c"
 		}
-#line 1133 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1277 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp9_ = configuration_facade_get_engine (self);
-#line 1133 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1277 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp10_ = _tmp9_;
-#line 1133 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1277 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp11_ = configuration_engine_get_int_property (_tmp10_, CONFIGURABLE_PROPERTY_LIBRARY_WINDOW_HEIGHT, &_inner_error_);
-#line 1133 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1277 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp12_ = _tmp11_;
-#line 1133 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1277 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp10_);
-#line 1133 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1277 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		h = _tmp12_;
-#line 1133 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1277 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1133 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1277 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 7635 "ConfigurationInterfaces.c"
-				goto __catch145_configuration_error;
+#line 8770 "ConfigurationInterfaces.c"
+				goto __catch158_configuration_error;
 			}
-#line 1133 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#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);
-#line 1133 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1277 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 1133 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1277 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 7644 "ConfigurationInterfaces.c"
+#line 8779 "ConfigurationInterfaces.c"
 		}
-#line 1134 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1278 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp13_ = w;
-#line 1134 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1278 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp14_ = h;
-#line 1134 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1278 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		dimensions_init (&_vala_dimensions, _tmp13_, _tmp14_);
-#line 7652 "ConfigurationInterfaces.c"
+#line 8787 "ConfigurationInterfaces.c"
 	}
-	goto __finally145;
-	__catch145_configuration_error:
+	goto __finally158;
+	__catch158_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp15_ = NULL;
-#line 1130 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1274 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 1130 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1274 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 1136 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1280 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp15_ = err;
-#line 1136 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1280 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp15_);
-#line 1130 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1274 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 7669 "ConfigurationInterfaces.c"
+#line 8804 "ConfigurationInterfaces.c"
 	}
-	__finally145:
-#line 1130 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally158:
+#line 1274 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1130 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1274 "/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 1130 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1274 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		g_clear_error (&_inner_error_);
-#line 1130 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1274 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 7680 "ConfigurationInterfaces.c"
+#line 8815 "ConfigurationInterfaces.c"
 	}
-#line 1127 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1271 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (maximize) {
-#line 1127 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1271 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		*maximize = _vala_maximize;
-#line 7686 "ConfigurationInterfaces.c"
+#line 8821 "ConfigurationInterfaces.c"
 	}
-#line 1127 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1271 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (dimensions) {
-#line 1127 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1271 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		*dimensions = _vala_dimensions;
-#line 7692 "ConfigurationInterfaces.c"
+#line 8827 "ConfigurationInterfaces.c"
 	}
 }
 
 
 void configuration_facade_get_library_window_state (ConfigurationFacade* self, gboolean* maximize, Dimensions* dimensions) {
-#line 1127 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1271 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
-#line 1127 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1271 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->get_library_window_state (self, maximize, dimensions);
-#line 7702 "ConfigurationInterfaces.c"
+#line 8837 "ConfigurationInterfaces.c"
 }
 
 
 static void configuration_facade_real_set_library_window_state (ConfigurationFacade* self, gboolean maximize, Dimensions* dimensions) {
 	GError * _inner_error_ = NULL;
-#line 1140 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1284 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (dimensions != NULL);
-#line 7710 "ConfigurationInterfaces.c"
+#line 8845 "ConfigurationInterfaces.c"
 	{
 		ConfigurationEngine* _tmp0_ = NULL;
 		ConfigurationEngine* _tmp1_ = NULL;
@@ -7724,123 +8859,123 @@ static void configuration_facade_real_set_library_window_state (ConfigurationFac
 		ConfigurationEngine* _tmp8_ = NULL;
 		Dimensions _tmp9_ = {0};
 		gint _tmp10_ = 0;
-#line 1142 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1286 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = configuration_facade_get_engine (self);
-#line 1142 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1286 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = _tmp0_;
-#line 1142 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1286 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = maximize;
-#line 1142 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1286 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_engine_set_bool_property (_tmp1_, CONFIGURABLE_PROPERTY_LIBRARY_WINDOW_MAXIMIZE, _tmp2_, &_inner_error_);
-#line 1142 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1286 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp1_);
-#line 1142 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1286 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1142 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1286 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 7737 "ConfigurationInterfaces.c"
-				goto __catch146_configuration_error;
+#line 8872 "ConfigurationInterfaces.c"
+				goto __catch159_configuration_error;
 			}
-#line 1142 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#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);
-#line 1142 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1286 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 1142 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1286 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 7746 "ConfigurationInterfaces.c"
+#line 8881 "ConfigurationInterfaces.c"
 		}
-#line 1143 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1287 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = configuration_facade_get_engine (self);
-#line 1143 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1287 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp4_ = _tmp3_;
-#line 1143 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1287 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp5_ = *dimensions;
-#line 1143 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1287 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp6_ = _tmp5_.width;
-#line 1143 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1287 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_engine_set_int_property (_tmp4_, CONFIGURABLE_PROPERTY_LIBRARY_WINDOW_WIDTH, _tmp6_, &_inner_error_);
-#line 1143 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1287 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp4_);
-#line 1143 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1287 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1143 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1287 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 7764 "ConfigurationInterfaces.c"
-				goto __catch146_configuration_error;
+#line 8899 "ConfigurationInterfaces.c"
+				goto __catch159_configuration_error;
 			}
-#line 1143 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#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);
-#line 1143 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1287 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 1143 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1287 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 7773 "ConfigurationInterfaces.c"
+#line 8908 "ConfigurationInterfaces.c"
 		}
-#line 1145 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1289 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp7_ = configuration_facade_get_engine (self);
-#line 1145 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1289 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp8_ = _tmp7_;
-#line 1145 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1289 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp9_ = *dimensions;
-#line 1145 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1289 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp10_ = _tmp9_.height;
-#line 1145 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1289 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_engine_set_int_property (_tmp8_, CONFIGURABLE_PROPERTY_LIBRARY_WINDOW_HEIGHT, _tmp10_, &_inner_error_);
-#line 1145 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1289 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp8_);
-#line 1145 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1289 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1145 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1289 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 7791 "ConfigurationInterfaces.c"
-				goto __catch146_configuration_error;
+#line 8926 "ConfigurationInterfaces.c"
+				goto __catch159_configuration_error;
 			}
-#line 1145 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#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);
-#line 1145 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1289 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 1145 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1289 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 7800 "ConfigurationInterfaces.c"
+#line 8935 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally146;
-	__catch146_configuration_error:
+	goto __finally159;
+	__catch159_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp11_ = NULL;
-#line 1141 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1285 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 1141 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1285 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 1148 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1292 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp11_ = err;
-#line 1148 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1292 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp11_);
-#line 1141 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1285 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 7818 "ConfigurationInterfaces.c"
+#line 8953 "ConfigurationInterfaces.c"
 	}
-	__finally146:
-#line 1141 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally159:
+#line 1285 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1141 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1285 "/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 1141 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1285 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		g_clear_error (&_inner_error_);
-#line 1141 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1285 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 7829 "ConfigurationInterfaces.c"
+#line 8964 "ConfigurationInterfaces.c"
 	}
 }
 
 
 void configuration_facade_set_library_window_state (ConfigurationFacade* self, gboolean maximize, Dimensions* dimensions) {
-#line 1140 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1284 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
-#line 1140 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1284 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_library_window_state (self, maximize, dimensions);
-#line 7839 "ConfigurationInterfaces.c"
+#line 8974 "ConfigurationInterfaces.c"
 }
 
 
@@ -7853,77 +8988,77 @@ static gboolean configuration_facade_real_get_modify_originals (ConfigurationFac
 		ConfigurationEngine* _tmp2_ = NULL;
 		gboolean _tmp3_ = FALSE;
 		gboolean _tmp4_ = FALSE;
-#line 1157 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1301 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = configuration_facade_get_engine (self);
-#line 1157 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1301 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = _tmp1_;
-#line 1157 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1301 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = configuration_engine_get_bool_property (_tmp2_, CONFIGURABLE_PROPERTY_MODIFY_ORIGINALS, &_inner_error_);
-#line 1157 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1301 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp4_ = _tmp3_;
-#line 1157 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1301 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp2_);
-#line 1157 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1301 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = _tmp4_;
-#line 1157 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1301 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1157 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1301 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 7868 "ConfigurationInterfaces.c"
-				goto __catch147_configuration_error;
+#line 9003 "ConfigurationInterfaces.c"
+				goto __catch160_configuration_error;
 			}
-#line 1157 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#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);
-#line 1157 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1301 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 1157 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1301 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return FALSE;
-#line 7877 "ConfigurationInterfaces.c"
+#line 9012 "ConfigurationInterfaces.c"
 		}
-#line 1157 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1301 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp0_;
-#line 1157 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1301 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 7883 "ConfigurationInterfaces.c"
+#line 9018 "ConfigurationInterfaces.c"
 	}
-	goto __finally147;
-	__catch147_configuration_error:
+	goto __finally160;
+	__catch160_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp5_ = NULL;
-#line 1156 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1300 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 1156 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1300 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 1159 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1303 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp5_ = err;
-#line 1159 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1303 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp5_);
-#line 1162 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1306 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = FALSE;
-#line 1162 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1306 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 1162 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1306 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 7904 "ConfigurationInterfaces.c"
+#line 9039 "ConfigurationInterfaces.c"
 	}
-	__finally147:
-#line 1156 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally160:
+#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 1156 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1300 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
-#line 1156 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1300 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return FALSE;
-#line 7913 "ConfigurationInterfaces.c"
+#line 9048 "ConfigurationInterfaces.c"
 }
 
 
 gboolean configuration_facade_get_modify_originals (ConfigurationFacade* self) {
-#line 1155 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1299 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), FALSE);
-#line 1155 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1299 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_modify_originals (self);
-#line 7922 "ConfigurationInterfaces.c"
+#line 9057 "ConfigurationInterfaces.c"
 }
 
 
@@ -7933,69 +9068,69 @@ static void configuration_facade_real_set_modify_originals (ConfigurationFacade*
 		ConfigurationEngine* _tmp0_ = NULL;
 		ConfigurationEngine* _tmp1_ = NULL;
 		gboolean _tmp2_ = FALSE;
-#line 1168 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1312 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = configuration_facade_get_engine (self);
-#line 1168 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1312 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = _tmp0_;
-#line 1168 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1312 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = modify_originals;
-#line 1168 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1312 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_engine_set_bool_property (_tmp1_, CONFIGURABLE_PROPERTY_MODIFY_ORIGINALS, _tmp2_, &_inner_error_);
-#line 1168 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1312 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp1_);
-#line 1168 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1312 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1168 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1312 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 7946 "ConfigurationInterfaces.c"
-				goto __catch148_configuration_error;
+#line 9081 "ConfigurationInterfaces.c"
+				goto __catch161_configuration_error;
 			}
-#line 1168 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#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);
-#line 1168 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1312 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 1168 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1312 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 7955 "ConfigurationInterfaces.c"
+#line 9090 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally148;
-	__catch148_configuration_error:
+	goto __finally161;
+	__catch161_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
-#line 1167 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1311 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 1167 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1311 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 1170 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1314 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = err;
-#line 1170 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1314 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp3_);
-#line 1167 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1311 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 7973 "ConfigurationInterfaces.c"
+#line 9108 "ConfigurationInterfaces.c"
 	}
-	__finally148:
-#line 1167 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally161:
+#line 1311 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1167 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1311 "/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 1167 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1311 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		g_clear_error (&_inner_error_);
-#line 1167 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1311 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 7984 "ConfigurationInterfaces.c"
+#line 9119 "ConfigurationInterfaces.c"
 	}
 }
 
 
 void configuration_facade_set_modify_originals (ConfigurationFacade* self, gboolean modify_originals) {
-#line 1166 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1310 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
-#line 1166 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1310 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_modify_originals (self, modify_originals);
-#line 7994 "ConfigurationInterfaces.c"
+#line 9129 "ConfigurationInterfaces.c"
 }
 
 
@@ -8008,83 +9143,83 @@ static gint configuration_facade_real_get_photo_thumbnail_scale (ConfigurationFa
 		ConfigurationEngine* _tmp2_ = NULL;
 		gint _tmp3_ = 0;
 		gint _tmp4_ = 0;
-#line 1179 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1323 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = configuration_facade_get_engine (self);
-#line 1179 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1323 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = _tmp1_;
-#line 1179 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1323 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = configuration_engine_get_int_property (_tmp2_, CONFIGURABLE_PROPERTY_PHOTO_THUMBNAIL_SCALE, &_inner_error_);
-#line 1179 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1323 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp4_ = _tmp3_;
-#line 1179 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1323 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp2_);
-#line 1179 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1323 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = _tmp4_;
-#line 1179 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1323 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1179 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1323 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 8023 "ConfigurationInterfaces.c"
-				goto __catch149_configuration_error;
+#line 9158 "ConfigurationInterfaces.c"
+				goto __catch162_configuration_error;
 			}
-#line 1179 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#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);
-#line 1179 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1323 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 1179 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1323 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return 0;
-#line 8032 "ConfigurationInterfaces.c"
+#line 9167 "ConfigurationInterfaces.c"
 		}
-#line 1179 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1323 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp0_;
-#line 1179 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1323 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 8038 "ConfigurationInterfaces.c"
+#line 9173 "ConfigurationInterfaces.c"
 	}
-	goto __finally149;
-	__catch149_configuration_error:
+	goto __finally162;
+	__catch162_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp5_ = NULL;
 		gint _tmp6_ = 0;
 		gint _tmp7_ = 0;
-#line 1178 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1322 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 1178 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1322 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 1181 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1325 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp5_ = err;
-#line 1181 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1325 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp5_);
-#line 1182 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1326 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp6_ = thumbnail_get_DEFAULT_SCALE ();
-#line 1182 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1326 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp7_ = _tmp6_;
-#line 1182 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1326 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp7_;
-#line 1182 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1326 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 1182 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1326 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 8065 "ConfigurationInterfaces.c"
+#line 9200 "ConfigurationInterfaces.c"
 	}
-	__finally149:
-#line 1178 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally162:
+#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 1178 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1322 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
-#line 1178 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1322 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return 0;
-#line 8074 "ConfigurationInterfaces.c"
+#line 9209 "ConfigurationInterfaces.c"
 }
 
 
 gint configuration_facade_get_photo_thumbnail_scale (ConfigurationFacade* self) {
-#line 1177 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1321 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), 0);
-#line 1177 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1321 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_photo_thumbnail_scale (self);
-#line 8083 "ConfigurationInterfaces.c"
+#line 9218 "ConfigurationInterfaces.c"
 }
 
 
@@ -8094,69 +9229,69 @@ static void configuration_facade_real_set_photo_thumbnail_scale (ConfigurationFa
 		ConfigurationEngine* _tmp0_ = NULL;
 		ConfigurationEngine* _tmp1_ = NULL;
 		gint _tmp2_ = 0;
-#line 1188 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1332 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = configuration_facade_get_engine (self);
-#line 1188 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1332 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = _tmp0_;
-#line 1188 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1332 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = scale;
-#line 1188 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1332 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_engine_set_int_property (_tmp1_, CONFIGURABLE_PROPERTY_PHOTO_THUMBNAIL_SCALE, _tmp2_, &_inner_error_);
-#line 1188 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1332 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp1_);
-#line 1188 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1332 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1188 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1332 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 8107 "ConfigurationInterfaces.c"
-				goto __catch150_configuration_error;
+#line 9242 "ConfigurationInterfaces.c"
+				goto __catch163_configuration_error;
 			}
-#line 1188 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#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);
-#line 1188 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1332 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 1188 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1332 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 8116 "ConfigurationInterfaces.c"
+#line 9251 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally150;
-	__catch150_configuration_error:
+	goto __finally163;
+	__catch163_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
-#line 1187 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1331 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 1187 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1331 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 1190 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1334 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = err;
-#line 1190 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1334 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp3_);
-#line 1187 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1331 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 8134 "ConfigurationInterfaces.c"
+#line 9269 "ConfigurationInterfaces.c"
 	}
-	__finally150:
-#line 1187 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally163:
+#line 1331 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1187 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1331 "/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 1187 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1331 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		g_clear_error (&_inner_error_);
-#line 1187 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1331 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 8145 "ConfigurationInterfaces.c"
+#line 9280 "ConfigurationInterfaces.c"
 	}
 }
 
 
 void configuration_facade_set_photo_thumbnail_scale (ConfigurationFacade* self, gint scale) {
-#line 1186 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1330 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
-#line 1186 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1330 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_photo_thumbnail_scale (self, scale);
-#line 8155 "ConfigurationInterfaces.c"
+#line 9290 "ConfigurationInterfaces.c"
 }
 
 
@@ -8169,77 +9304,77 @@ static gdouble configuration_facade_real_get_printing_content_height (Configurat
 		ConfigurationEngine* _tmp2_ = NULL;
 		gdouble _tmp3_ = 0.0;
 		gdouble _tmp4_ = 0.0;
-#line 1199 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1343 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = configuration_facade_get_engine (self);
-#line 1199 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1343 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = _tmp1_;
-#line 1199 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1343 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = configuration_engine_get_double_property (_tmp2_, CONFIGURABLE_PROPERTY_PRINTING_CONTENT_HEIGHT, &_inner_error_);
-#line 1199 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1343 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp4_ = _tmp3_;
-#line 1199 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1343 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp2_);
-#line 1199 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1343 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = _tmp4_;
-#line 1199 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1343 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1199 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1343 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 8184 "ConfigurationInterfaces.c"
-				goto __catch151_configuration_error;
+#line 9319 "ConfigurationInterfaces.c"
+				goto __catch164_configuration_error;
 			}
-#line 1199 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#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);
-#line 1199 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1343 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 1199 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1343 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return 0.0;
-#line 8193 "ConfigurationInterfaces.c"
+#line 9328 "ConfigurationInterfaces.c"
 		}
-#line 1199 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1343 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp0_;
-#line 1199 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1343 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 8199 "ConfigurationInterfaces.c"
+#line 9334 "ConfigurationInterfaces.c"
 	}
-	goto __finally151;
-	__catch151_configuration_error:
+	goto __finally164;
+	__catch164_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp5_ = NULL;
-#line 1198 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1342 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 1198 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1342 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 1201 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp5_ = err;
-#line 1201 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp5_);
-#line 1203 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1347 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = 5.0;
-#line 1203 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1347 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 1203 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1347 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 8220 "ConfigurationInterfaces.c"
+#line 9355 "ConfigurationInterfaces.c"
 	}
-	__finally151:
-#line 1198 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally164:
+#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 1198 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1342 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
-#line 1198 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1342 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return 0.0;
-#line 8229 "ConfigurationInterfaces.c"
+#line 9364 "ConfigurationInterfaces.c"
 }
 
 
 gdouble configuration_facade_get_printing_content_height (ConfigurationFacade* self) {
-#line 1197 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1341 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), 0.0);
-#line 1197 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1341 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_printing_content_height (self);
-#line 8238 "ConfigurationInterfaces.c"
+#line 9373 "ConfigurationInterfaces.c"
 }
 
 
@@ -8249,69 +9384,69 @@ static void configuration_facade_real_set_printing_content_height (Configuration
 		ConfigurationEngine* _tmp0_ = NULL;
 		ConfigurationEngine* _tmp1_ = NULL;
 		gdouble _tmp2_ = 0.0;
-#line 1209 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1353 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = configuration_facade_get_engine (self);
-#line 1209 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1353 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = _tmp0_;
-#line 1209 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1353 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = content_height;
-#line 1209 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1353 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_engine_set_double_property (_tmp1_, CONFIGURABLE_PROPERTY_PRINTING_CONTENT_HEIGHT, _tmp2_, &_inner_error_);
-#line 1209 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1353 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp1_);
-#line 1209 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1353 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1209 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1353 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 8262 "ConfigurationInterfaces.c"
-				goto __catch152_configuration_error;
+#line 9397 "ConfigurationInterfaces.c"
+				goto __catch165_configuration_error;
 			}
-#line 1209 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#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);
-#line 1209 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1353 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 1209 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1353 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 8271 "ConfigurationInterfaces.c"
+#line 9406 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally152;
-	__catch152_configuration_error:
+	goto __finally165;
+	__catch165_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
-#line 1208 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1352 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 1208 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1352 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 1212 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1356 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = err;
-#line 1212 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1356 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp3_);
-#line 1208 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1352 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 8289 "ConfigurationInterfaces.c"
+#line 9424 "ConfigurationInterfaces.c"
 	}
-	__finally152:
-#line 1208 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally165:
+#line 1352 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1208 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1352 "/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 1208 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1352 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		g_clear_error (&_inner_error_);
-#line 1208 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1352 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 8300 "ConfigurationInterfaces.c"
+#line 9435 "ConfigurationInterfaces.c"
 	}
 }
 
 
 void configuration_facade_set_printing_content_height (ConfigurationFacade* self, gdouble content_height) {
-#line 1207 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1351 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
-#line 1207 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1351 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_printing_content_height (self, content_height);
-#line 8310 "ConfigurationInterfaces.c"
+#line 9445 "ConfigurationInterfaces.c"
 }
 
 
@@ -8324,77 +9459,77 @@ static gint configuration_facade_real_get_printing_content_layout (Configuration
 		ConfigurationEngine* _tmp2_ = NULL;
 		gint _tmp3_ = 0;
 		gint _tmp4_ = 0;
-#line 1221 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1365 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = configuration_facade_get_engine (self);
-#line 1221 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1365 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = _tmp1_;
-#line 1221 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1365 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = configuration_engine_get_int_property (_tmp2_, CONFIGURABLE_PROPERTY_PRINTING_CONTENT_LAYOUT, &_inner_error_);
-#line 1221 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1365 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp4_ = _tmp3_;
-#line 1221 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1365 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp2_);
-#line 1221 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1365 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = _tmp4_;
-#line 1221 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1365 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1221 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1365 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 8339 "ConfigurationInterfaces.c"
-				goto __catch153_configuration_error;
+#line 9474 "ConfigurationInterfaces.c"
+				goto __catch166_configuration_error;
 			}
-#line 1221 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#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);
-#line 1221 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1365 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 1221 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1365 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return 0;
-#line 8348 "ConfigurationInterfaces.c"
+#line 9483 "ConfigurationInterfaces.c"
 		}
-#line 1221 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1365 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp0_ - 1;
-#line 1221 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1365 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 8354 "ConfigurationInterfaces.c"
+#line 9489 "ConfigurationInterfaces.c"
 	}
-	goto __finally153;
-	__catch153_configuration_error:
+	goto __finally166;
+	__catch166_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp5_ = NULL;
-#line 1220 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1364 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 1220 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1364 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 1223 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1367 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp5_ = err;
-#line 1223 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1367 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp5_);
-#line 1225 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1369 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = 0;
-#line 1225 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1369 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 1225 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1369 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 8375 "ConfigurationInterfaces.c"
+#line 9510 "ConfigurationInterfaces.c"
 	}
-	__finally153:
-#line 1220 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally166:
+#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 1220 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1364 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
-#line 1220 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1364 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return 0;
-#line 8384 "ConfigurationInterfaces.c"
+#line 9519 "ConfigurationInterfaces.c"
 }
 
 
 gint configuration_facade_get_printing_content_layout (ConfigurationFacade* self) {
-#line 1219 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1363 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), 0);
-#line 1219 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1363 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_printing_content_layout (self);
-#line 8393 "ConfigurationInterfaces.c"
+#line 9528 "ConfigurationInterfaces.c"
 }
 
 
@@ -8404,69 +9539,69 @@ static void configuration_facade_real_set_printing_content_layout (Configuration
 		ConfigurationEngine* _tmp0_ = NULL;
 		ConfigurationEngine* _tmp1_ = NULL;
 		gint _tmp2_ = 0;
-#line 1231 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1375 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = configuration_facade_get_engine (self);
-#line 1231 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1375 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = _tmp0_;
-#line 1231 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1375 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = layout_code;
-#line 1231 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1375 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_engine_set_int_property (_tmp1_, CONFIGURABLE_PROPERTY_PRINTING_CONTENT_LAYOUT, _tmp2_ + 1, &_inner_error_);
-#line 1231 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1375 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp1_);
-#line 1231 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1375 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1231 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1375 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 8417 "ConfigurationInterfaces.c"
-				goto __catch154_configuration_error;
+#line 9552 "ConfigurationInterfaces.c"
+				goto __catch167_configuration_error;
 			}
-#line 1231 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#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);
-#line 1231 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1375 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 1231 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1375 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 8426 "ConfigurationInterfaces.c"
+#line 9561 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally154;
-	__catch154_configuration_error:
+	goto __finally167;
+	__catch167_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
-#line 1230 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1374 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 1230 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1374 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 1234 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1378 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = err;
-#line 1234 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1378 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp3_);
-#line 1230 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1374 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 8444 "ConfigurationInterfaces.c"
+#line 9579 "ConfigurationInterfaces.c"
 	}
-	__finally154:
-#line 1230 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally167:
+#line 1374 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1230 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1374 "/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 1230 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1374 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		g_clear_error (&_inner_error_);
-#line 1230 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1374 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 8455 "ConfigurationInterfaces.c"
+#line 9590 "ConfigurationInterfaces.c"
 	}
 }
 
 
 void configuration_facade_set_printing_content_layout (ConfigurationFacade* self, gint layout_code) {
-#line 1229 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1373 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
-#line 1229 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1373 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_printing_content_layout (self, layout_code);
-#line 8465 "ConfigurationInterfaces.c"
+#line 9600 "ConfigurationInterfaces.c"
 }
 
 
@@ -8479,77 +9614,77 @@ static gint configuration_facade_real_get_printing_content_ppi (ConfigurationFac
 		ConfigurationEngine* _tmp2_ = NULL;
 		gint _tmp3_ = 0;
 		gint _tmp4_ = 0;
-#line 1243 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1387 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = configuration_facade_get_engine (self);
-#line 1243 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1387 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = _tmp1_;
-#line 1243 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1387 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = configuration_engine_get_int_property (_tmp2_, CONFIGURABLE_PROPERTY_PRINTING_CONTENT_PPI, &_inner_error_);
-#line 1243 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1387 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp4_ = _tmp3_;
-#line 1243 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1387 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp2_);
-#line 1243 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1387 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = _tmp4_;
-#line 1243 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1387 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1243 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1387 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 8494 "ConfigurationInterfaces.c"
-				goto __catch155_configuration_error;
+#line 9629 "ConfigurationInterfaces.c"
+				goto __catch168_configuration_error;
 			}
-#line 1243 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#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);
-#line 1243 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1387 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 1243 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1387 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return 0;
-#line 8503 "ConfigurationInterfaces.c"
+#line 9638 "ConfigurationInterfaces.c"
 		}
-#line 1243 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1387 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp0_;
-#line 1243 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1387 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 8509 "ConfigurationInterfaces.c"
+#line 9644 "ConfigurationInterfaces.c"
 	}
-	goto __finally155;
-	__catch155_configuration_error:
+	goto __finally168;
+	__catch168_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp5_ = NULL;
-#line 1242 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1386 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 1242 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1386 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 1245 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1389 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp5_ = err;
-#line 1245 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1389 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp5_);
-#line 1247 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1391 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = 600;
-#line 1247 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1391 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 1247 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1391 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 8530 "ConfigurationInterfaces.c"
+#line 9665 "ConfigurationInterfaces.c"
 	}
-	__finally155:
-#line 1242 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally168:
+#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 1242 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1386 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
-#line 1242 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1386 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return 0;
-#line 8539 "ConfigurationInterfaces.c"
+#line 9674 "ConfigurationInterfaces.c"
 }
 
 
 gint configuration_facade_get_printing_content_ppi (ConfigurationFacade* self) {
-#line 1241 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1385 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), 0);
-#line 1241 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1385 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_printing_content_ppi (self);
-#line 8548 "ConfigurationInterfaces.c"
+#line 9683 "ConfigurationInterfaces.c"
 }
 
 
@@ -8559,69 +9694,69 @@ static void configuration_facade_real_set_printing_content_ppi (ConfigurationFac
 		ConfigurationEngine* _tmp0_ = NULL;
 		ConfigurationEngine* _tmp1_ = NULL;
 		gint _tmp2_ = 0;
-#line 1253 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1397 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = configuration_facade_get_engine (self);
-#line 1253 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1397 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = _tmp0_;
-#line 1253 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1397 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = content_ppi;
-#line 1253 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1397 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_engine_set_int_property (_tmp1_, CONFIGURABLE_PROPERTY_PRINTING_CONTENT_PPI, _tmp2_, &_inner_error_);
-#line 1253 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1397 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp1_);
-#line 1253 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1397 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1253 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1397 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 8572 "ConfigurationInterfaces.c"
-				goto __catch156_configuration_error;
+#line 9707 "ConfigurationInterfaces.c"
+				goto __catch169_configuration_error;
 			}
-#line 1253 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#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);
-#line 1253 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1397 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 1253 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1397 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 8581 "ConfigurationInterfaces.c"
+#line 9716 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally156;
-	__catch156_configuration_error:
+	goto __finally169;
+	__catch169_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
-#line 1252 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1396 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 1252 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1396 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 1255 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1399 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = err;
-#line 1255 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1399 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp3_);
-#line 1252 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1396 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 8599 "ConfigurationInterfaces.c"
+#line 9734 "ConfigurationInterfaces.c"
 	}
-	__finally156:
-#line 1252 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally169:
+#line 1396 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1252 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1396 "/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 1252 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1396 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		g_clear_error (&_inner_error_);
-#line 1252 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1396 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 8610 "ConfigurationInterfaces.c"
+#line 9745 "ConfigurationInterfaces.c"
 	}
 }
 
 
 void configuration_facade_set_printing_content_ppi (ConfigurationFacade* self, gint content_ppi) {
-#line 1251 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1395 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
-#line 1251 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1395 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_printing_content_ppi (self, content_ppi);
-#line 8620 "ConfigurationInterfaces.c"
+#line 9755 "ConfigurationInterfaces.c"
 }
 
 
@@ -8634,77 +9769,77 @@ static gint configuration_facade_real_get_printing_content_units (ConfigurationF
 		ConfigurationEngine* _tmp2_ = NULL;
 		gint _tmp3_ = 0;
 		gint _tmp4_ = 0;
-#line 1264 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1408 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = configuration_facade_get_engine (self);
-#line 1264 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1408 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = _tmp1_;
-#line 1264 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1408 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = configuration_engine_get_int_property (_tmp2_, CONFIGURABLE_PROPERTY_PRINTING_CONTENT_UNITS, &_inner_error_);
-#line 1264 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1408 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp4_ = _tmp3_;
-#line 1264 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1408 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp2_);
-#line 1264 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1408 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = _tmp4_;
-#line 1264 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1408 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1264 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1408 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 8649 "ConfigurationInterfaces.c"
-				goto __catch157_configuration_error;
+#line 9784 "ConfigurationInterfaces.c"
+				goto __catch170_configuration_error;
 			}
-#line 1264 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#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);
-#line 1264 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1408 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 1264 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1408 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return 0;
-#line 8658 "ConfigurationInterfaces.c"
+#line 9793 "ConfigurationInterfaces.c"
 		}
-#line 1264 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1408 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp0_ - 1;
-#line 1264 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1408 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 8664 "ConfigurationInterfaces.c"
+#line 9799 "ConfigurationInterfaces.c"
 	}
-	goto __finally157;
-	__catch157_configuration_error:
+	goto __finally170;
+	__catch170_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp5_ = NULL;
-#line 1263 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1407 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 1263 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1407 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 1266 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1410 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp5_ = err;
-#line 1266 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1410 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp5_);
-#line 1268 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1412 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = 0;
-#line 1268 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1412 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 1268 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1412 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 8685 "ConfigurationInterfaces.c"
+#line 9820 "ConfigurationInterfaces.c"
 	}
-	__finally157:
-#line 1263 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally170:
+#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 1263 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1407 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
-#line 1263 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1407 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return 0;
-#line 8694 "ConfigurationInterfaces.c"
+#line 9829 "ConfigurationInterfaces.c"
 }
 
 
 gint configuration_facade_get_printing_content_units (ConfigurationFacade* self) {
-#line 1262 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1406 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), 0);
-#line 1262 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1406 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_printing_content_units (self);
-#line 8703 "ConfigurationInterfaces.c"
+#line 9838 "ConfigurationInterfaces.c"
 }
 
 
@@ -8714,69 +9849,69 @@ static void configuration_facade_real_set_printing_content_units (ConfigurationF
 		ConfigurationEngine* _tmp0_ = NULL;
 		ConfigurationEngine* _tmp1_ = NULL;
 		gint _tmp2_ = 0;
-#line 1274 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1418 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = configuration_facade_get_engine (self);
-#line 1274 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1418 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = _tmp0_;
-#line 1274 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1418 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = units_code;
-#line 1274 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1418 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_engine_set_int_property (_tmp1_, CONFIGURABLE_PROPERTY_PRINTING_CONTENT_UNITS, _tmp2_ + 1, &_inner_error_);
-#line 1274 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1418 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp1_);
-#line 1274 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1418 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1274 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1418 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 8727 "ConfigurationInterfaces.c"
-				goto __catch158_configuration_error;
+#line 9862 "ConfigurationInterfaces.c"
+				goto __catch171_configuration_error;
 			}
-#line 1274 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#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);
-#line 1274 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1418 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 1274 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1418 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 8736 "ConfigurationInterfaces.c"
+#line 9871 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally158;
-	__catch158_configuration_error:
+	goto __finally171;
+	__catch171_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
-#line 1273 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1417 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 1273 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1417 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 1277 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1421 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = err;
-#line 1277 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1421 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp3_);
-#line 1273 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1417 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 8754 "ConfigurationInterfaces.c"
+#line 9889 "ConfigurationInterfaces.c"
 	}
-	__finally158:
-#line 1273 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally171:
+#line 1417 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1273 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1417 "/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 1273 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1417 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		g_clear_error (&_inner_error_);
-#line 1273 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1417 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 8765 "ConfigurationInterfaces.c"
+#line 9900 "ConfigurationInterfaces.c"
 	}
 }
 
 
 void configuration_facade_set_printing_content_units (ConfigurationFacade* self, gint units_code) {
-#line 1272 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1416 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
-#line 1272 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1416 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_printing_content_units (self, units_code);
-#line 8775 "ConfigurationInterfaces.c"
+#line 9910 "ConfigurationInterfaces.c"
 }
 
 
@@ -8789,77 +9924,77 @@ static gdouble configuration_facade_real_get_printing_content_width (Configurati
 		ConfigurationEngine* _tmp2_ = NULL;
 		gdouble _tmp3_ = 0.0;
 		gdouble _tmp4_ = 0.0;
-#line 1286 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1430 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = configuration_facade_get_engine (self);
-#line 1286 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1430 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = _tmp1_;
-#line 1286 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1430 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = configuration_engine_get_double_property (_tmp2_, CONFIGURABLE_PROPERTY_PRINTING_CONTENT_WIDTH, &_inner_error_);
-#line 1286 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1430 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp4_ = _tmp3_;
-#line 1286 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1430 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp2_);
-#line 1286 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1430 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = _tmp4_;
-#line 1286 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1430 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1286 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1430 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 8804 "ConfigurationInterfaces.c"
-				goto __catch159_configuration_error;
+#line 9939 "ConfigurationInterfaces.c"
+				goto __catch172_configuration_error;
 			}
-#line 1286 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#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);
-#line 1286 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1430 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 1286 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1430 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return 0.0;
-#line 8813 "ConfigurationInterfaces.c"
+#line 9948 "ConfigurationInterfaces.c"
 		}
-#line 1286 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1430 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp0_;
-#line 1286 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1430 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 8819 "ConfigurationInterfaces.c"
+#line 9954 "ConfigurationInterfaces.c"
 	}
-	goto __finally159;
-	__catch159_configuration_error:
+	goto __finally172;
+	__catch172_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp5_ = NULL;
-#line 1285 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1429 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 1285 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1429 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 1288 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1432 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp5_ = err;
-#line 1288 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1432 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp5_);
-#line 1290 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1434 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = 7.0;
-#line 1290 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1434 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 1290 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1434 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 8840 "ConfigurationInterfaces.c"
+#line 9975 "ConfigurationInterfaces.c"
 	}
-	__finally159:
-#line 1285 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally172:
+#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 1285 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1429 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
-#line 1285 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1429 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return 0.0;
-#line 8849 "ConfigurationInterfaces.c"
+#line 9984 "ConfigurationInterfaces.c"
 }
 
 
 gdouble configuration_facade_get_printing_content_width (ConfigurationFacade* self) {
-#line 1284 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1428 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), 0.0);
-#line 1284 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1428 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_printing_content_width (self);
-#line 8858 "ConfigurationInterfaces.c"
+#line 9993 "ConfigurationInterfaces.c"
 }
 
 
@@ -8869,69 +10004,69 @@ static void configuration_facade_real_set_printing_content_width (ConfigurationF
 		ConfigurationEngine* _tmp0_ = NULL;
 		ConfigurationEngine* _tmp1_ = NULL;
 		gdouble _tmp2_ = 0.0;
-#line 1296 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1440 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = configuration_facade_get_engine (self);
-#line 1296 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1440 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = _tmp0_;
-#line 1296 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1440 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = content_width;
-#line 1296 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1440 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_engine_set_double_property (_tmp1_, CONFIGURABLE_PROPERTY_PRINTING_CONTENT_WIDTH, _tmp2_, &_inner_error_);
-#line 1296 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1440 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp1_);
-#line 1296 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1440 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1296 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1440 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 8882 "ConfigurationInterfaces.c"
-				goto __catch160_configuration_error;
+#line 10017 "ConfigurationInterfaces.c"
+				goto __catch173_configuration_error;
 			}
-#line 1296 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#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);
-#line 1296 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1440 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 1296 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1440 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 8891 "ConfigurationInterfaces.c"
+#line 10026 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally160;
-	__catch160_configuration_error:
+	goto __finally173;
+	__catch173_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
-#line 1295 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1439 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 1295 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1439 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 1299 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1443 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = err;
-#line 1299 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1443 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp3_);
-#line 1295 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1439 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 8909 "ConfigurationInterfaces.c"
+#line 10044 "ConfigurationInterfaces.c"
 	}
-	__finally160:
-#line 1295 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally173:
+#line 1439 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1295 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1439 "/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 1295 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1439 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		g_clear_error (&_inner_error_);
-#line 1295 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1439 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 8920 "ConfigurationInterfaces.c"
+#line 10055 "ConfigurationInterfaces.c"
 	}
 }
 
 
 void configuration_facade_set_printing_content_width (ConfigurationFacade* self, gdouble content_width) {
-#line 1294 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1438 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
-#line 1294 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1438 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_printing_content_width (self, content_width);
-#line 8930 "ConfigurationInterfaces.c"
+#line 10065 "ConfigurationInterfaces.c"
 }
 
 
@@ -8944,77 +10079,77 @@ static gint configuration_facade_real_get_printing_images_per_page (Configuratio
 		ConfigurationEngine* _tmp2_ = NULL;
 		gint _tmp3_ = 0;
 		gint _tmp4_ = 0;
-#line 1308 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1452 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = configuration_facade_get_engine (self);
-#line 1308 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1452 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = _tmp1_;
-#line 1308 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1452 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = configuration_engine_get_int_property (_tmp2_, CONFIGURABLE_PROPERTY_PRINTING_IMAGES_PER_PAGE, &_inner_error_);
-#line 1308 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1452 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp4_ = _tmp3_;
-#line 1308 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1452 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp2_);
-#line 1308 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1452 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = _tmp4_;
-#line 1308 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1452 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1308 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1452 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 8959 "ConfigurationInterfaces.c"
-				goto __catch161_configuration_error;
+#line 10094 "ConfigurationInterfaces.c"
+				goto __catch174_configuration_error;
 			}
-#line 1308 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#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);
-#line 1308 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1452 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 1308 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1452 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return 0;
-#line 8968 "ConfigurationInterfaces.c"
+#line 10103 "ConfigurationInterfaces.c"
 		}
-#line 1308 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1452 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp0_ - 1;
-#line 1308 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1452 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 8974 "ConfigurationInterfaces.c"
+#line 10109 "ConfigurationInterfaces.c"
 	}
-	goto __finally161;
-	__catch161_configuration_error:
+	goto __finally174;
+	__catch174_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp5_ = NULL;
-#line 1307 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1451 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 1307 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1451 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 1310 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1454 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp5_ = err;
-#line 1310 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1454 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp5_);
-#line 1312 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1456 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = 0;
-#line 1312 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1456 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 1312 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1456 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 8995 "ConfigurationInterfaces.c"
+#line 10130 "ConfigurationInterfaces.c"
 	}
-	__finally161:
-#line 1307 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally174:
+#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 1307 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1451 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
-#line 1307 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1451 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return 0;
-#line 9004 "ConfigurationInterfaces.c"
+#line 10139 "ConfigurationInterfaces.c"
 }
 
 
 gint configuration_facade_get_printing_images_per_page (ConfigurationFacade* self) {
-#line 1306 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1450 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), 0);
-#line 1306 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1450 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_printing_images_per_page (self);
-#line 9013 "ConfigurationInterfaces.c"
+#line 10148 "ConfigurationInterfaces.c"
 }
 
 
@@ -9024,69 +10159,69 @@ static void configuration_facade_real_set_printing_images_per_page (Configuratio
 		ConfigurationEngine* _tmp0_ = NULL;
 		ConfigurationEngine* _tmp1_ = NULL;
 		gint _tmp2_ = 0;
-#line 1318 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1462 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = configuration_facade_get_engine (self);
-#line 1318 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1462 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = _tmp0_;
-#line 1318 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1462 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = images_per_page_code;
-#line 1318 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1462 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_engine_set_int_property (_tmp1_, CONFIGURABLE_PROPERTY_PRINTING_IMAGES_PER_PAGE, _tmp2_ + 1, &_inner_error_);
-#line 1318 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1462 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp1_);
-#line 1318 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1462 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1318 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1462 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 9037 "ConfigurationInterfaces.c"
-				goto __catch162_configuration_error;
+#line 10172 "ConfigurationInterfaces.c"
+				goto __catch175_configuration_error;
 			}
-#line 1318 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#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);
-#line 1318 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1462 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 1318 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1462 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 9046 "ConfigurationInterfaces.c"
+#line 10181 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally162;
-	__catch162_configuration_error:
+	goto __finally175;
+	__catch175_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
-#line 1317 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1461 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 1317 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1461 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 1321 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1465 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = err;
-#line 1321 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1465 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp3_);
-#line 1317 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1461 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 9064 "ConfigurationInterfaces.c"
+#line 10199 "ConfigurationInterfaces.c"
 	}
-	__finally162:
-#line 1317 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally175:
+#line 1461 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1317 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1461 "/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 1317 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1461 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		g_clear_error (&_inner_error_);
-#line 1317 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1461 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 9075 "ConfigurationInterfaces.c"
+#line 10210 "ConfigurationInterfaces.c"
 	}
 }
 
 
 void configuration_facade_set_printing_images_per_page (ConfigurationFacade* self, gint images_per_page_code) {
-#line 1316 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1460 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
-#line 1316 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#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 9085 "ConfigurationInterfaces.c"
+#line 10220 "ConfigurationInterfaces.c"
 }
 
 
@@ -9099,77 +10234,77 @@ static gboolean configuration_facade_real_get_printing_match_aspect_ratio (Confi
 		ConfigurationEngine* _tmp2_ = NULL;
 		gboolean _tmp3_ = FALSE;
 		gboolean _tmp4_ = FALSE;
-#line 1330 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1474 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = configuration_facade_get_engine (self);
-#line 1330 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1474 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = _tmp1_;
-#line 1330 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1474 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = configuration_engine_get_bool_property (_tmp2_, CONFIGURABLE_PROPERTY_PRINTING_MATCH_ASPECT_RATIO, &_inner_error_);
-#line 1330 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1474 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp4_ = _tmp3_;
-#line 1330 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1474 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp2_);
-#line 1330 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1474 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = _tmp4_;
-#line 1330 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1474 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1330 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1474 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 9114 "ConfigurationInterfaces.c"
-				goto __catch163_configuration_error;
+#line 10249 "ConfigurationInterfaces.c"
+				goto __catch176_configuration_error;
 			}
-#line 1330 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#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);
-#line 1330 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1474 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 1330 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1474 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return FALSE;
-#line 9123 "ConfigurationInterfaces.c"
+#line 10258 "ConfigurationInterfaces.c"
 		}
-#line 1330 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1474 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp0_;
-#line 1330 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1474 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 9129 "ConfigurationInterfaces.c"
+#line 10264 "ConfigurationInterfaces.c"
 	}
-	goto __finally163;
-	__catch163_configuration_error:
+	goto __finally176;
+	__catch176_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp5_ = NULL;
-#line 1329 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1473 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 1329 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1473 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 1332 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1476 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp5_ = err;
-#line 1332 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1476 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp5_);
-#line 1334 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1478 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = TRUE;
-#line 1334 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1478 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 1334 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1478 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 9150 "ConfigurationInterfaces.c"
+#line 10285 "ConfigurationInterfaces.c"
 	}
-	__finally163:
-#line 1329 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally176:
+#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 1329 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1473 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
-#line 1329 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1473 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return FALSE;
-#line 9159 "ConfigurationInterfaces.c"
+#line 10294 "ConfigurationInterfaces.c"
 }
 
 
 gboolean configuration_facade_get_printing_match_aspect_ratio (ConfigurationFacade* self) {
-#line 1328 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1472 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), FALSE);
-#line 1328 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1472 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_printing_match_aspect_ratio (self);
-#line 9168 "ConfigurationInterfaces.c"
+#line 10303 "ConfigurationInterfaces.c"
 }
 
 
@@ -9179,69 +10314,69 @@ static void configuration_facade_real_set_printing_match_aspect_ratio (Configura
 		ConfigurationEngine* _tmp0_ = NULL;
 		ConfigurationEngine* _tmp1_ = NULL;
 		gboolean _tmp2_ = FALSE;
-#line 1340 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1484 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = configuration_facade_get_engine (self);
-#line 1340 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1484 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = _tmp0_;
-#line 1340 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1484 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = match_aspect_ratio;
-#line 1340 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1484 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_engine_set_bool_property (_tmp1_, CONFIGURABLE_PROPERTY_PRINTING_MATCH_ASPECT_RATIO, _tmp2_, &_inner_error_);
-#line 1340 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1484 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp1_);
-#line 1340 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1484 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1340 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1484 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 9192 "ConfigurationInterfaces.c"
-				goto __catch164_configuration_error;
+#line 10327 "ConfigurationInterfaces.c"
+				goto __catch177_configuration_error;
 			}
-#line 1340 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#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);
-#line 1340 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1484 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 1340 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1484 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 9201 "ConfigurationInterfaces.c"
+#line 10336 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally164;
-	__catch164_configuration_error:
+	goto __finally177;
+	__catch177_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
-#line 1339 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1483 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 1339 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1483 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 1343 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1487 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = err;
-#line 1343 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1487 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp3_);
-#line 1339 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1483 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 9219 "ConfigurationInterfaces.c"
+#line 10354 "ConfigurationInterfaces.c"
 	}
-	__finally164:
-#line 1339 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally177:
+#line 1483 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1339 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1483 "/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 1339 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1483 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		g_clear_error (&_inner_error_);
-#line 1339 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1483 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 9230 "ConfigurationInterfaces.c"
+#line 10365 "ConfigurationInterfaces.c"
 	}
 }
 
 
 void configuration_facade_set_printing_match_aspect_ratio (ConfigurationFacade* self, gboolean match_aspect_ratio) {
-#line 1338 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1482 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
-#line 1338 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#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 9240 "ConfigurationInterfaces.c"
+#line 10375 "ConfigurationInterfaces.c"
 }
 
 
@@ -9254,77 +10389,77 @@ static gboolean configuration_facade_real_get_printing_print_titles (Configurati
 		ConfigurationEngine* _tmp2_ = NULL;
 		gboolean _tmp3_ = FALSE;
 		gboolean _tmp4_ = FALSE;
-#line 1352 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1496 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = configuration_facade_get_engine (self);
-#line 1352 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1496 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = _tmp1_;
-#line 1352 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1496 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = configuration_engine_get_bool_property (_tmp2_, CONFIGURABLE_PROPERTY_PRINTING_PRINT_TITLES, &_inner_error_);
-#line 1352 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1496 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp4_ = _tmp3_;
-#line 1352 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1496 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp2_);
-#line 1352 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1496 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = _tmp4_;
-#line 1352 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1496 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1352 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1496 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 9269 "ConfigurationInterfaces.c"
-				goto __catch165_configuration_error;
+#line 10404 "ConfigurationInterfaces.c"
+				goto __catch178_configuration_error;
 			}
-#line 1352 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#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);
-#line 1352 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1496 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 1352 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1496 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return FALSE;
-#line 9278 "ConfigurationInterfaces.c"
+#line 10413 "ConfigurationInterfaces.c"
 		}
-#line 1352 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1496 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp0_;
-#line 1352 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1496 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 9284 "ConfigurationInterfaces.c"
+#line 10419 "ConfigurationInterfaces.c"
 	}
-	goto __finally165;
-	__catch165_configuration_error:
+	goto __finally178;
+	__catch178_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp5_ = NULL;
-#line 1351 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1495 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 1351 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1495 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 1354 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1498 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp5_ = err;
-#line 1354 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1498 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp5_);
-#line 1356 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1500 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = FALSE;
-#line 1356 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1500 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 1356 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1500 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 9305 "ConfigurationInterfaces.c"
+#line 10440 "ConfigurationInterfaces.c"
 	}
-	__finally165:
-#line 1351 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally178:
+#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 1351 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1495 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
-#line 1351 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1495 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return FALSE;
-#line 9314 "ConfigurationInterfaces.c"
+#line 10449 "ConfigurationInterfaces.c"
 }
 
 
 gboolean configuration_facade_get_printing_print_titles (ConfigurationFacade* self) {
-#line 1350 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1494 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), FALSE);
-#line 1350 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1494 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_printing_print_titles (self);
-#line 9323 "ConfigurationInterfaces.c"
+#line 10458 "ConfigurationInterfaces.c"
 }
 
 
@@ -9334,69 +10469,69 @@ static void configuration_facade_real_set_printing_print_titles (ConfigurationFa
 		ConfigurationEngine* _tmp0_ = NULL;
 		ConfigurationEngine* _tmp1_ = NULL;
 		gboolean _tmp2_ = FALSE;
-#line 1362 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1506 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = configuration_facade_get_engine (self);
-#line 1362 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1506 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = _tmp0_;
-#line 1362 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1506 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = print_titles;
-#line 1362 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1506 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_engine_set_bool_property (_tmp1_, CONFIGURABLE_PROPERTY_PRINTING_PRINT_TITLES, _tmp2_, &_inner_error_);
-#line 1362 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1506 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp1_);
-#line 1362 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1506 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1362 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1506 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 9347 "ConfigurationInterfaces.c"
-				goto __catch166_configuration_error;
+#line 10482 "ConfigurationInterfaces.c"
+				goto __catch179_configuration_error;
 			}
-#line 1362 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#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);
-#line 1362 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1506 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 1362 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1506 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 9356 "ConfigurationInterfaces.c"
+#line 10491 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally166;
-	__catch166_configuration_error:
+	goto __finally179;
+	__catch179_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
-#line 1361 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1505 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 1361 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1505 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 1365 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1509 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = err;
-#line 1365 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1509 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp3_);
-#line 1361 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1505 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 9374 "ConfigurationInterfaces.c"
+#line 10509 "ConfigurationInterfaces.c"
 	}
-	__finally166:
-#line 1361 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally179:
+#line 1505 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1361 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1505 "/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 1361 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1505 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		g_clear_error (&_inner_error_);
-#line 1361 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1505 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 9385 "ConfigurationInterfaces.c"
+#line 10520 "ConfigurationInterfaces.c"
 	}
 }
 
 
 void configuration_facade_set_printing_print_titles (ConfigurationFacade* self, gboolean print_titles) {
-#line 1360 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1504 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
-#line 1360 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1504 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_printing_print_titles (self, print_titles);
-#line 9395 "ConfigurationInterfaces.c"
+#line 10530 "ConfigurationInterfaces.c"
 }
 
 
@@ -9409,77 +10544,77 @@ static gint configuration_facade_real_get_printing_size_selection (Configuration
 		ConfigurationEngine* _tmp2_ = NULL;
 		gint _tmp3_ = 0;
 		gint _tmp4_ = 0;
-#line 1374 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1518 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = configuration_facade_get_engine (self);
-#line 1374 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1518 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = _tmp1_;
-#line 1374 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1518 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = configuration_engine_get_int_property (_tmp2_, CONFIGURABLE_PROPERTY_PRINTING_SIZE_SELECTION, &_inner_error_);
-#line 1374 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1518 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp4_ = _tmp3_;
-#line 1374 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1518 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp2_);
-#line 1374 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1518 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = _tmp4_;
-#line 1374 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1518 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1374 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1518 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 9424 "ConfigurationInterfaces.c"
-				goto __catch167_configuration_error;
+#line 10559 "ConfigurationInterfaces.c"
+				goto __catch180_configuration_error;
 			}
-#line 1374 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#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);
-#line 1374 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1518 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 1374 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1518 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return 0;
-#line 9433 "ConfigurationInterfaces.c"
+#line 10568 "ConfigurationInterfaces.c"
 		}
-#line 1374 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1518 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp0_ - 1;
-#line 1374 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1518 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 9439 "ConfigurationInterfaces.c"
+#line 10574 "ConfigurationInterfaces.c"
 	}
-	goto __finally167;
-	__catch167_configuration_error:
+	goto __finally180;
+	__catch180_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp5_ = NULL;
-#line 1373 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1517 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 1373 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1517 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 1376 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1520 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp5_ = err;
-#line 1376 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1520 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp5_);
-#line 1378 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1522 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = 0;
-#line 1378 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1522 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 1378 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1522 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 9460 "ConfigurationInterfaces.c"
+#line 10595 "ConfigurationInterfaces.c"
 	}
-	__finally167:
-#line 1373 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally180:
+#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 1373 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1517 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
-#line 1373 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1517 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return 0;
-#line 9469 "ConfigurationInterfaces.c"
+#line 10604 "ConfigurationInterfaces.c"
 }
 
 
 gint configuration_facade_get_printing_size_selection (ConfigurationFacade* self) {
-#line 1372 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1516 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), 0);
-#line 1372 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1516 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_printing_size_selection (self);
-#line 9478 "ConfigurationInterfaces.c"
+#line 10613 "ConfigurationInterfaces.c"
 }
 
 
@@ -9489,69 +10624,69 @@ static void configuration_facade_real_set_printing_size_selection (Configuration
 		ConfigurationEngine* _tmp0_ = NULL;
 		ConfigurationEngine* _tmp1_ = NULL;
 		gint _tmp2_ = 0;
-#line 1384 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1528 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = configuration_facade_get_engine (self);
-#line 1384 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1528 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = _tmp0_;
-#line 1384 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1528 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = size_code;
-#line 1384 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1528 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_engine_set_int_property (_tmp1_, CONFIGURABLE_PROPERTY_PRINTING_SIZE_SELECTION, _tmp2_ + 1, &_inner_error_);
-#line 1384 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1528 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp1_);
-#line 1384 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1528 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1384 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1528 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 9502 "ConfigurationInterfaces.c"
-				goto __catch168_configuration_error;
+#line 10637 "ConfigurationInterfaces.c"
+				goto __catch181_configuration_error;
 			}
-#line 1384 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1528 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("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 1384 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1528 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 1384 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1528 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 9511 "ConfigurationInterfaces.c"
+#line 10646 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally168;
-	__catch168_configuration_error:
+	goto __finally181;
+	__catch181_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
-#line 1383 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1527 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 1383 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1527 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 1387 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1531 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = err;
-#line 1387 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1531 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp3_);
-#line 1383 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1527 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 9529 "ConfigurationInterfaces.c"
+#line 10664 "ConfigurationInterfaces.c"
 	}
-	__finally168:
-#line 1383 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally181:
+#line 1527 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1383 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1527 "/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 1383 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1527 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		g_clear_error (&_inner_error_);
-#line 1383 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1527 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 9540 "ConfigurationInterfaces.c"
+#line 10675 "ConfigurationInterfaces.c"
 	}
 }
 
 
 void configuration_facade_set_printing_size_selection (ConfigurationFacade* self, gint size_code) {
-#line 1382 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1526 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
-#line 1382 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1526 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_printing_size_selection (self, size_code);
-#line 9550 "ConfigurationInterfaces.c"
+#line 10685 "ConfigurationInterfaces.c"
 }
 
 
@@ -9565,161 +10700,161 @@ static gchar* configuration_facade_real_get_printing_titles_font (ConfigurationF
 		gchar* _tmp3_ = NULL;
 		gchar* _tmp4_ = NULL;
 		gchar* _tmp5_ = NULL;
-#line 1396 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1540 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = configuration_facade_get_engine (self);
-#line 1396 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1540 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = _tmp1_;
-#line 1396 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1540 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = configuration_engine_get_string_property (_tmp2_, CONFIGURABLE_PROPERTY_PRINTING_TITLES_FONT, &_inner_error_);
-#line 1396 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1540 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp4_ = _tmp3_;
-#line 1396 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1540 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp2_);
-#line 1396 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1540 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = _tmp4_;
-#line 1396 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1540 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1396 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1540 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 9580 "ConfigurationInterfaces.c"
-				goto __catch169_configuration_error;
+#line 10715 "ConfigurationInterfaces.c"
+				goto __catch182_configuration_error;
 			}
-#line 1396 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1540 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("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 1396 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1540 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 1396 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1540 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return NULL;
-#line 9589 "ConfigurationInterfaces.c"
+#line 10724 "ConfigurationInterfaces.c"
 		}
-#line 1396 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1540 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp5_ = _tmp0_;
-#line 1396 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1540 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = NULL;
-#line 1396 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1540 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp5_;
-#line 1396 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1540 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_free0 (_tmp0_);
-#line 1396 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1540 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 9601 "ConfigurationInterfaces.c"
+#line 10736 "ConfigurationInterfaces.c"
 	}
-	goto __finally169;
-	__catch169_configuration_error:
+	goto __finally182;
+	__catch182_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp6_ = NULL;
 		gchar* _tmp7_ = NULL;
-#line 1395 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1539 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 1395 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1539 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 1398 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1542 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp6_ = err;
-#line 1398 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1542 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp6_);
-#line 1402 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1546 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp7_ = g_strdup ("Sans Bold 12");
-#line 1402 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1546 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp7_;
-#line 1402 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1546 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 1402 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1546 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 9625 "ConfigurationInterfaces.c"
+#line 10760 "ConfigurationInterfaces.c"
 	}
-	__finally169:
-#line 1395 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally182:
+#line 1539 "/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 1395 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1539 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
-#line 1395 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1539 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return NULL;
-#line 9634 "ConfigurationInterfaces.c"
+#line 10769 "ConfigurationInterfaces.c"
 }
 
 
 gchar* configuration_facade_get_printing_titles_font (ConfigurationFacade* self) {
-#line 1394 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1538 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), NULL);
-#line 1394 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1538 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_printing_titles_font (self);
-#line 9643 "ConfigurationInterfaces.c"
+#line 10778 "ConfigurationInterfaces.c"
 }
 
 
 static void configuration_facade_real_set_printing_titles_font (ConfigurationFacade* self, const gchar* font_name) {
 	GError * _inner_error_ = NULL;
-#line 1406 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1550 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (font_name != NULL);
-#line 9651 "ConfigurationInterfaces.c"
+#line 10786 "ConfigurationInterfaces.c"
 	{
 		ConfigurationEngine* _tmp0_ = NULL;
 		ConfigurationEngine* _tmp1_ = NULL;
 		const gchar* _tmp2_ = NULL;
-#line 1408 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1552 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = configuration_facade_get_engine (self);
-#line 1408 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1552 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = _tmp0_;
-#line 1408 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1552 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = font_name;
-#line 1408 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1552 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_engine_set_string_property (_tmp1_, CONFIGURABLE_PROPERTY_PRINTING_TITLES_FONT, _tmp2_, &_inner_error_);
-#line 1408 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1552 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp1_);
-#line 1408 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1552 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1408 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1552 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 9670 "ConfigurationInterfaces.c"
-				goto __catch170_configuration_error;
+#line 10805 "ConfigurationInterfaces.c"
+				goto __catch183_configuration_error;
 			}
-#line 1408 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1552 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("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 1408 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1552 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 1408 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1552 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 9679 "ConfigurationInterfaces.c"
+#line 10814 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally170;
-	__catch170_configuration_error:
+	goto __finally183;
+	__catch183_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
-#line 1407 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1551 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 1407 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1551 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 1410 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1554 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = err;
-#line 1410 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1554 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp3_);
-#line 1407 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1551 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 9697 "ConfigurationInterfaces.c"
+#line 10832 "ConfigurationInterfaces.c"
 	}
-	__finally170:
-#line 1407 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally183:
+#line 1551 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1407 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1551 "/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"
+#line 1551 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		g_clear_error (&_inner_error_);
-#line 1407 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1551 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 9708 "ConfigurationInterfaces.c"
+#line 10843 "ConfigurationInterfaces.c"
 	}
 }
 
 
 void configuration_facade_set_printing_titles_font (ConfigurationFacade* self, const gchar* font_name) {
-#line 1406 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1550 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
-#line 1406 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1550 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_printing_titles_font (self, font_name);
-#line 9718 "ConfigurationInterfaces.c"
+#line 10853 "ConfigurationInterfaces.c"
 }
 
 
@@ -9732,77 +10867,77 @@ static gboolean configuration_facade_real_get_show_welcome_dialog (Configuration
 		ConfigurationEngine* _tmp2_ = NULL;
 		gboolean _tmp3_ = FALSE;
 		gboolean _tmp4_ = FALSE;
-#line 1419 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1563 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = configuration_facade_get_engine (self);
-#line 1419 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1563 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = _tmp1_;
-#line 1419 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1563 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = configuration_engine_get_bool_property (_tmp2_, CONFIGURABLE_PROPERTY_SHOW_WELCOME_DIALOG, &_inner_error_);
-#line 1419 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1563 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp4_ = _tmp3_;
-#line 1419 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1563 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp2_);
-#line 1419 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1563 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = _tmp4_;
-#line 1419 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1563 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1419 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1563 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 9747 "ConfigurationInterfaces.c"
-				goto __catch171_configuration_error;
+#line 10882 "ConfigurationInterfaces.c"
+				goto __catch184_configuration_error;
 			}
-#line 1419 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1563 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("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 1419 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1563 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 1419 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1563 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return FALSE;
-#line 9756 "ConfigurationInterfaces.c"
+#line 10891 "ConfigurationInterfaces.c"
 		}
-#line 1419 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1563 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp0_;
-#line 1419 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1563 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 9762 "ConfigurationInterfaces.c"
+#line 10897 "ConfigurationInterfaces.c"
 	}
-	goto __finally171;
-	__catch171_configuration_error:
+	goto __finally184;
+	__catch184_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp5_ = NULL;
-#line 1418 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1562 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 1418 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1562 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 1421 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1565 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp5_ = err;
-#line 1421 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1565 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp5_);
-#line 1423 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1567 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = TRUE;
-#line 1423 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1567 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 1423 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1567 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 9783 "ConfigurationInterfaces.c"
+#line 10918 "ConfigurationInterfaces.c"
 	}
-	__finally171:
-#line 1418 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally184:
+#line 1562 "/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 1418 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1562 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
-#line 1418 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1562 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return FALSE;
-#line 9792 "ConfigurationInterfaces.c"
+#line 10927 "ConfigurationInterfaces.c"
 }
 
 
 gboolean configuration_facade_get_show_welcome_dialog (ConfigurationFacade* self) {
-#line 1417 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1561 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), FALSE);
-#line 1417 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1561 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_show_welcome_dialog (self);
-#line 9801 "ConfigurationInterfaces.c"
+#line 10936 "ConfigurationInterfaces.c"
 }
 
 
@@ -9812,69 +10947,69 @@ static void configuration_facade_real_set_show_welcome_dialog (ConfigurationFaca
 		ConfigurationEngine* _tmp0_ = NULL;
 		ConfigurationEngine* _tmp1_ = NULL;
 		gboolean _tmp2_ = FALSE;
-#line 1429 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1573 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = configuration_facade_get_engine (self);
-#line 1429 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1573 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = _tmp0_;
-#line 1429 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1573 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = show;
-#line 1429 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1573 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_engine_set_bool_property (_tmp1_, CONFIGURABLE_PROPERTY_SHOW_WELCOME_DIALOG, _tmp2_, &_inner_error_);
-#line 1429 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1573 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp1_);
-#line 1429 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1573 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1429 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1573 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 9825 "ConfigurationInterfaces.c"
-				goto __catch172_configuration_error;
+#line 10960 "ConfigurationInterfaces.c"
+				goto __catch185_configuration_error;
 			}
-#line 1429 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1573 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("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 1429 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1573 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 1429 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1573 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 9834 "ConfigurationInterfaces.c"
+#line 10969 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally172;
-	__catch172_configuration_error:
+	goto __finally185;
+	__catch185_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
-#line 1428 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1572 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 1428 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1572 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 1432 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1576 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = err;
-#line 1432 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1576 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp3_);
-#line 1428 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1572 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 9852 "ConfigurationInterfaces.c"
+#line 10987 "ConfigurationInterfaces.c"
 	}
-	__finally172:
-#line 1428 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally185:
+#line 1572 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1428 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1572 "/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 1428 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1572 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		g_clear_error (&_inner_error_);
-#line 1428 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1572 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 9863 "ConfigurationInterfaces.c"
+#line 10998 "ConfigurationInterfaces.c"
 	}
 }
 
 
 void configuration_facade_set_show_welcome_dialog (ConfigurationFacade* self, gboolean show) {
-#line 1427 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1571 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
-#line 1427 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1571 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_show_welcome_dialog (self, show);
-#line 9873 "ConfigurationInterfaces.c"
+#line 11008 "ConfigurationInterfaces.c"
 }
 
 
@@ -9887,77 +11022,77 @@ static gint configuration_facade_real_get_sidebar_position (ConfigurationFacade*
 		ConfigurationEngine* _tmp2_ = NULL;
 		gint _tmp3_ = 0;
 		gint _tmp4_ = 0;
-#line 1441 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1585 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = configuration_facade_get_engine (self);
-#line 1441 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1585 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = _tmp1_;
-#line 1441 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1585 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = configuration_engine_get_int_property (_tmp2_, CONFIGURABLE_PROPERTY_SIDEBAR_POSITION, &_inner_error_);
-#line 1441 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1585 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp4_ = _tmp3_;
-#line 1441 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1585 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp2_);
-#line 1441 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1585 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = _tmp4_;
-#line 1441 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1585 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1441 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1585 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 9902 "ConfigurationInterfaces.c"
-				goto __catch173_configuration_error;
+#line 11037 "ConfigurationInterfaces.c"
+				goto __catch186_configuration_error;
 			}
-#line 1441 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1585 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("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 1441 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1585 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 1441 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1585 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return 0;
-#line 9911 "ConfigurationInterfaces.c"
+#line 11046 "ConfigurationInterfaces.c"
 		}
-#line 1441 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1585 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp0_;
-#line 1441 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1585 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 9917 "ConfigurationInterfaces.c"
+#line 11052 "ConfigurationInterfaces.c"
 	}
-	goto __finally173;
-	__catch173_configuration_error:
+	goto __finally186;
+	__catch186_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp5_ = NULL;
-#line 1440 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1584 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 1440 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1584 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 1443 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1587 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp5_ = err;
-#line 1443 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1587 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp5_);
-#line 1445 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1589 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = 180;
-#line 1445 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1589 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 1445 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1589 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 9938 "ConfigurationInterfaces.c"
+#line 11073 "ConfigurationInterfaces.c"
 	}
-	__finally173:
-#line 1440 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally186:
+#line 1584 "/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 1440 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1584 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
-#line 1440 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1584 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return 0;
-#line 9947 "ConfigurationInterfaces.c"
+#line 11082 "ConfigurationInterfaces.c"
 }
 
 
 gint configuration_facade_get_sidebar_position (ConfigurationFacade* self) {
-#line 1439 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1583 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), 0);
-#line 1439 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1583 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_sidebar_position (self);
-#line 9956 "ConfigurationInterfaces.c"
+#line 11091 "ConfigurationInterfaces.c"
 }
 
 
@@ -9967,69 +11102,69 @@ static void configuration_facade_real_set_sidebar_position (ConfigurationFacade*
 		ConfigurationEngine* _tmp0_ = NULL;
 		ConfigurationEngine* _tmp1_ = NULL;
 		gint _tmp2_ = 0;
-#line 1451 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1595 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = configuration_facade_get_engine (self);
-#line 1451 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1595 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = _tmp0_;
-#line 1451 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1595 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = position;
-#line 1451 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1595 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_engine_set_int_property (_tmp1_, CONFIGURABLE_PROPERTY_SIDEBAR_POSITION, _tmp2_, &_inner_error_);
-#line 1451 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1595 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp1_);
-#line 1451 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1595 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1451 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1595 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 9980 "ConfigurationInterfaces.c"
-				goto __catch174_configuration_error;
+#line 11115 "ConfigurationInterfaces.c"
+				goto __catch187_configuration_error;
 			}
-#line 1451 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1595 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("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 1451 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1595 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 1451 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1595 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 9989 "ConfigurationInterfaces.c"
+#line 11124 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally174;
-	__catch174_configuration_error:
+	goto __finally187;
+	__catch187_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
-#line 1450 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1594 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 1450 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1594 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 1453 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1597 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = err;
-#line 1453 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1597 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp3_);
-#line 1450 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1594 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 10007 "ConfigurationInterfaces.c"
+#line 11142 "ConfigurationInterfaces.c"
 	}
-	__finally174:
-#line 1450 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally187:
+#line 1594 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1450 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1594 "/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 1450 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1594 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		g_clear_error (&_inner_error_);
-#line 1450 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1594 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 10018 "ConfigurationInterfaces.c"
+#line 11153 "ConfigurationInterfaces.c"
 	}
 }
 
 
 void configuration_facade_set_sidebar_position (ConfigurationFacade* self, gint position) {
-#line 1449 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1593 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
-#line 1449 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1593 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_sidebar_position (self, position);
-#line 10028 "ConfigurationInterfaces.c"
+#line 11163 "ConfigurationInterfaces.c"
 }
 
 
@@ -10042,77 +11177,77 @@ static gdouble configuration_facade_real_get_slideshow_delay (ConfigurationFacad
 		ConfigurationEngine* _tmp2_ = NULL;
 		gdouble _tmp3_ = 0.0;
 		gdouble _tmp4_ = 0.0;
-#line 1462 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1606 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = configuration_facade_get_engine (self);
-#line 1462 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1606 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = _tmp1_;
-#line 1462 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1606 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = configuration_engine_get_double_property (_tmp2_, CONFIGURABLE_PROPERTY_SLIDESHOW_DELAY, &_inner_error_);
-#line 1462 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1606 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp4_ = _tmp3_;
-#line 1462 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1606 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp2_);
-#line 1462 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1606 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = _tmp4_;
-#line 1462 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1606 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1462 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1606 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 10057 "ConfigurationInterfaces.c"
-				goto __catch175_configuration_error;
+#line 11192 "ConfigurationInterfaces.c"
+				goto __catch188_configuration_error;
 			}
-#line 1462 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1606 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("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 1462 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1606 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 1462 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1606 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return 0.0;
-#line 10066 "ConfigurationInterfaces.c"
+#line 11201 "ConfigurationInterfaces.c"
 		}
-#line 1462 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1606 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp0_;
-#line 1462 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1606 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 10072 "ConfigurationInterfaces.c"
+#line 11207 "ConfigurationInterfaces.c"
 	}
-	goto __finally175;
-	__catch175_configuration_error:
+	goto __finally188;
+	__catch188_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp5_ = NULL;
-#line 1461 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1605 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 1461 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1605 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 1464 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1608 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp5_ = err;
-#line 1464 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1608 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp5_);
-#line 1466 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1610 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = 3.0;
-#line 1466 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1610 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 1466 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1610 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 10093 "ConfigurationInterfaces.c"
+#line 11228 "ConfigurationInterfaces.c"
 	}
-	__finally175:
-#line 1461 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally188:
+#line 1605 "/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 1461 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1605 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
-#line 1461 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1605 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return 0.0;
-#line 10102 "ConfigurationInterfaces.c"
+#line 11237 "ConfigurationInterfaces.c"
 }
 
 
 gdouble configuration_facade_get_slideshow_delay (ConfigurationFacade* self) {
-#line 1460 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1604 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), 0.0);
-#line 1460 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1604 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_slideshow_delay (self);
-#line 10111 "ConfigurationInterfaces.c"
+#line 11246 "ConfigurationInterfaces.c"
 }
 
 
@@ -10122,69 +11257,69 @@ static void configuration_facade_real_set_slideshow_delay (ConfigurationFacade*
 		ConfigurationEngine* _tmp0_ = NULL;
 		ConfigurationEngine* _tmp1_ = NULL;
 		gdouble _tmp2_ = 0.0;
-#line 1472 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1616 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = configuration_facade_get_engine (self);
-#line 1472 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1616 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = _tmp0_;
-#line 1472 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1616 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = delay;
-#line 1472 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1616 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_engine_set_double_property (_tmp1_, CONFIGURABLE_PROPERTY_SLIDESHOW_DELAY, _tmp2_, &_inner_error_);
-#line 1472 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1616 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp1_);
-#line 1472 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1616 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1472 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1616 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 10135 "ConfigurationInterfaces.c"
-				goto __catch176_configuration_error;
+#line 11270 "ConfigurationInterfaces.c"
+				goto __catch189_configuration_error;
 			}
-#line 1472 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1616 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("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 1472 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1616 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 1472 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1616 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 10144 "ConfigurationInterfaces.c"
+#line 11279 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally176;
-	__catch176_configuration_error:
+	goto __finally189;
+	__catch189_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
-#line 1471 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1615 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 1471 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1615 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 1474 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1618 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = err;
-#line 1474 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1618 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp3_);
-#line 1471 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1615 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 10162 "ConfigurationInterfaces.c"
+#line 11297 "ConfigurationInterfaces.c"
 	}
-	__finally176:
-#line 1471 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally189:
+#line 1615 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1471 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1615 "/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 1471 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1615 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		g_clear_error (&_inner_error_);
-#line 1471 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1615 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 10173 "ConfigurationInterfaces.c"
+#line 11308 "ConfigurationInterfaces.c"
 	}
 }
 
 
 void configuration_facade_set_slideshow_delay (ConfigurationFacade* self, gdouble delay) {
-#line 1470 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1614 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
-#line 1470 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1614 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_slideshow_delay (self, delay);
-#line 10183 "ConfigurationInterfaces.c"
+#line 11318 "ConfigurationInterfaces.c"
 }
 
 
@@ -10197,77 +11332,77 @@ static gdouble configuration_facade_real_get_slideshow_transition_delay (Configu
 		ConfigurationEngine* _tmp2_ = NULL;
 		gdouble _tmp3_ = 0.0;
 		gdouble _tmp4_ = 0.0;
-#line 1483 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1627 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = configuration_facade_get_engine (self);
-#line 1483 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1627 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = _tmp1_;
-#line 1483 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1627 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = configuration_engine_get_double_property (_tmp2_, CONFIGURABLE_PROPERTY_SLIDESHOW_TRANSITION_DELAY, &_inner_error_);
-#line 1483 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1627 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp4_ = _tmp3_;
-#line 1483 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1627 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp2_);
-#line 1483 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1627 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = _tmp4_;
-#line 1483 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1627 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1483 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1627 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 10212 "ConfigurationInterfaces.c"
-				goto __catch177_configuration_error;
+#line 11347 "ConfigurationInterfaces.c"
+				goto __catch190_configuration_error;
 			}
-#line 1483 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1627 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("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 1483 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1627 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 1483 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1627 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return 0.0;
-#line 10221 "ConfigurationInterfaces.c"
+#line 11356 "ConfigurationInterfaces.c"
 		}
-#line 1483 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1627 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp0_;
-#line 1483 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1627 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 10227 "ConfigurationInterfaces.c"
+#line 11362 "ConfigurationInterfaces.c"
 	}
-	goto __finally177;
-	__catch177_configuration_error:
+	goto __finally190;
+	__catch190_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp5_ = NULL;
-#line 1482 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1626 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 1482 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1626 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 1486 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1630 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp5_ = err;
-#line 1486 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1630 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp5_);
-#line 1488 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1632 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = 0.3;
-#line 1488 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1632 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 1488 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1632 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 10248 "ConfigurationInterfaces.c"
+#line 11383 "ConfigurationInterfaces.c"
 	}
-	__finally177:
-#line 1482 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally190:
+#line 1626 "/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 1482 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1626 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
-#line 1482 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1626 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return 0.0;
-#line 10257 "ConfigurationInterfaces.c"
+#line 11392 "ConfigurationInterfaces.c"
 }
 
 
 gdouble configuration_facade_get_slideshow_transition_delay (ConfigurationFacade* self) {
-#line 1481 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1625 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), 0.0);
-#line 1481 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1625 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_slideshow_transition_delay (self);
-#line 10266 "ConfigurationInterfaces.c"
+#line 11401 "ConfigurationInterfaces.c"
 }
 
 
@@ -10277,69 +11412,69 @@ static void configuration_facade_real_set_slideshow_transition_delay (Configurat
 		ConfigurationEngine* _tmp0_ = NULL;
 		ConfigurationEngine* _tmp1_ = NULL;
 		gdouble _tmp2_ = 0.0;
-#line 1494 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1638 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = configuration_facade_get_engine (self);
-#line 1494 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1638 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = _tmp0_;
-#line 1494 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1638 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = delay;
-#line 1494 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1638 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_engine_set_double_property (_tmp1_, CONFIGURABLE_PROPERTY_SLIDESHOW_TRANSITION_DELAY, _tmp2_, &_inner_error_);
-#line 1494 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1638 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp1_);
-#line 1494 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1638 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1494 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1638 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 10290 "ConfigurationInterfaces.c"
-				goto __catch178_configuration_error;
+#line 11425 "ConfigurationInterfaces.c"
+				goto __catch191_configuration_error;
 			}
-#line 1494 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1638 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("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 1494 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1638 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 1494 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1638 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 10299 "ConfigurationInterfaces.c"
+#line 11434 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally178;
-	__catch178_configuration_error:
+	goto __finally191;
+	__catch191_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
-#line 1493 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1637 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 1493 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1637 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 1497 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1641 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = err;
-#line 1497 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1641 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp3_);
-#line 1493 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1637 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 10317 "ConfigurationInterfaces.c"
+#line 11452 "ConfigurationInterfaces.c"
 	}
-	__finally178:
-#line 1493 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally191:
+#line 1637 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1493 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1637 "/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 1493 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1637 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		g_clear_error (&_inner_error_);
-#line 1493 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1637 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 10328 "ConfigurationInterfaces.c"
+#line 11463 "ConfigurationInterfaces.c"
 	}
 }
 
 
 void configuration_facade_set_slideshow_transition_delay (ConfigurationFacade* self, gdouble delay) {
-#line 1492 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1636 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
-#line 1492 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1636 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_slideshow_transition_delay (self, delay);
-#line 10338 "ConfigurationInterfaces.c"
+#line 11473 "ConfigurationInterfaces.c"
 }
 
 
@@ -10353,161 +11488,161 @@ static gchar* configuration_facade_real_get_slideshow_transition_effect_id (Conf
 		gchar* _tmp3_ = NULL;
 		gchar* _tmp4_ = NULL;
 		gchar* _tmp5_ = NULL;
-#line 1506 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1650 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = configuration_facade_get_engine (self);
-#line 1506 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1650 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = _tmp1_;
-#line 1506 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1650 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = configuration_engine_get_string_property (_tmp2_, CONFIGURABLE_PROPERTY_SLIDESHOW_TRANSITION_EFFECT_ID, &_inner_error_);
-#line 1506 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1650 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp4_ = _tmp3_;
-#line 1506 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1650 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp2_);
-#line 1506 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1650 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = _tmp4_;
-#line 1506 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1650 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1506 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1650 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 10368 "ConfigurationInterfaces.c"
-				goto __catch179_configuration_error;
+#line 11503 "ConfigurationInterfaces.c"
+				goto __catch192_configuration_error;
 			}
-#line 1506 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1650 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("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 1506 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1650 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 1506 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1650 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return NULL;
-#line 10377 "ConfigurationInterfaces.c"
+#line 11512 "ConfigurationInterfaces.c"
 		}
-#line 1506 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1650 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp5_ = _tmp0_;
-#line 1506 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1650 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = NULL;
-#line 1506 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1650 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp5_;
-#line 1506 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1650 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_free0 (_tmp0_);
-#line 1506 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1650 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 10389 "ConfigurationInterfaces.c"
+#line 11524 "ConfigurationInterfaces.c"
 	}
-	goto __finally179;
-	__catch179_configuration_error:
+	goto __finally192;
+	__catch192_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp6_ = NULL;
 		gchar* _tmp7_ = NULL;
-#line 1505 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1649 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 1505 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1649 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 1509 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1653 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp6_ = err;
-#line 1509 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1653 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp6_);
-#line 1513 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1657 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp7_ = g_strdup (TRANSITION_EFFECTS_MANAGER_NULL_EFFECT_ID);
-#line 1513 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1657 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp7_;
-#line 1513 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1657 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 1513 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1657 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 10413 "ConfigurationInterfaces.c"
+#line 11548 "ConfigurationInterfaces.c"
 	}
-	__finally179:
-#line 1505 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally192:
+#line 1649 "/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 1505 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1649 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
-#line 1505 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1649 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return NULL;
-#line 10422 "ConfigurationInterfaces.c"
+#line 11557 "ConfigurationInterfaces.c"
 }
 
 
 gchar* configuration_facade_get_slideshow_transition_effect_id (ConfigurationFacade* self) {
-#line 1504 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1648 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), NULL);
-#line 1504 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1648 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_slideshow_transition_effect_id (self);
-#line 10431 "ConfigurationInterfaces.c"
+#line 11566 "ConfigurationInterfaces.c"
 }
 
 
 static void configuration_facade_real_set_slideshow_transition_effect_id (ConfigurationFacade* self, const gchar* id) {
 	GError * _inner_error_ = NULL;
-#line 1517 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1661 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (id != NULL);
-#line 10439 "ConfigurationInterfaces.c"
+#line 11574 "ConfigurationInterfaces.c"
 	{
 		ConfigurationEngine* _tmp0_ = NULL;
 		ConfigurationEngine* _tmp1_ = NULL;
 		const gchar* _tmp2_ = NULL;
-#line 1519 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1663 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = configuration_facade_get_engine (self);
-#line 1519 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1663 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = _tmp0_;
-#line 1519 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1663 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = id;
-#line 1519 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1663 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_engine_set_string_property (_tmp1_, CONFIGURABLE_PROPERTY_SLIDESHOW_TRANSITION_EFFECT_ID, _tmp2_, &_inner_error_);
-#line 1519 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1663 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp1_);
-#line 1519 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1663 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1519 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1663 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 10458 "ConfigurationInterfaces.c"
-				goto __catch180_configuration_error;
+#line 11593 "ConfigurationInterfaces.c"
+				goto __catch193_configuration_error;
 			}
-#line 1519 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1663 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("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 1519 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1663 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 1519 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1663 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 10467 "ConfigurationInterfaces.c"
+#line 11602 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally180;
-	__catch180_configuration_error:
+	goto __finally193;
+	__catch193_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
-#line 1518 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1662 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 1518 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1662 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 1522 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1666 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = err;
-#line 1522 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1666 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp3_);
-#line 1518 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1662 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 10485 "ConfigurationInterfaces.c"
+#line 11620 "ConfigurationInterfaces.c"
 	}
-	__finally180:
-#line 1518 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally193:
+#line 1662 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1518 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1662 "/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 1518 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1662 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		g_clear_error (&_inner_error_);
-#line 1518 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1662 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 10496 "ConfigurationInterfaces.c"
+#line 11631 "ConfigurationInterfaces.c"
 	}
 }
 
 
 void configuration_facade_set_slideshow_transition_effect_id (ConfigurationFacade* self, const gchar* id) {
-#line 1517 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1661 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
-#line 1517 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1661 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_slideshow_transition_effect_id (self, id);
-#line 10506 "ConfigurationInterfaces.c"
+#line 11641 "ConfigurationInterfaces.c"
 }
 
 
@@ -10520,77 +11655,77 @@ static gboolean configuration_facade_real_get_slideshow_show_title (Configuratio
 		ConfigurationEngine* _tmp2_ = NULL;
 		gboolean _tmp3_ = FALSE;
 		gboolean _tmp4_ = FALSE;
-#line 1531 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1675 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = configuration_facade_get_engine (self);
-#line 1531 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1675 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = _tmp1_;
-#line 1531 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1675 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = configuration_engine_get_bool_property (_tmp2_, CONFIGURABLE_PROPERTY_SLIDESHOW_SHOW_TITLE, &_inner_error_);
-#line 1531 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1675 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp4_ = _tmp3_;
-#line 1531 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1675 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp2_);
-#line 1531 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1675 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = _tmp4_;
-#line 1531 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1675 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1531 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1675 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 10535 "ConfigurationInterfaces.c"
-				goto __catch181_configuration_error;
+#line 11670 "ConfigurationInterfaces.c"
+				goto __catch194_configuration_error;
 			}
-#line 1531 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1675 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("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 1531 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1675 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 1531 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1675 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return FALSE;
-#line 10544 "ConfigurationInterfaces.c"
+#line 11679 "ConfigurationInterfaces.c"
 		}
-#line 1531 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1675 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp0_;
-#line 1531 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1675 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 10550 "ConfigurationInterfaces.c"
+#line 11685 "ConfigurationInterfaces.c"
 	}
-	goto __finally181;
-	__catch181_configuration_error:
+	goto __finally194;
+	__catch194_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp5_ = NULL;
-#line 1530 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1674 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 1530 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1674 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 1533 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1677 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp5_ = err;
-#line 1533 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1677 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp5_);
-#line 1535 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1679 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = FALSE;
-#line 1535 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1679 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 1535 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1679 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 10571 "ConfigurationInterfaces.c"
+#line 11706 "ConfigurationInterfaces.c"
 	}
-	__finally181:
-#line 1530 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally194:
+#line 1674 "/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 1530 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1674 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
-#line 1530 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1674 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return FALSE;
-#line 10580 "ConfigurationInterfaces.c"
+#line 11715 "ConfigurationInterfaces.c"
 }
 
 
 gboolean configuration_facade_get_slideshow_show_title (ConfigurationFacade* self) {
-#line 1529 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1673 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), FALSE);
-#line 1529 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1673 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_slideshow_show_title (self);
-#line 10589 "ConfigurationInterfaces.c"
+#line 11724 "ConfigurationInterfaces.c"
 }
 
 
@@ -10600,69 +11735,69 @@ static void configuration_facade_real_set_slideshow_show_title (ConfigurationFac
 		ConfigurationEngine* _tmp0_ = NULL;
 		ConfigurationEngine* _tmp1_ = NULL;
 		gboolean _tmp2_ = FALSE;
-#line 1541 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1685 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = configuration_facade_get_engine (self);
-#line 1541 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1685 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = _tmp0_;
-#line 1541 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1685 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = show_title;
-#line 1541 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1685 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_engine_set_bool_property (_tmp1_, CONFIGURABLE_PROPERTY_SLIDESHOW_SHOW_TITLE, _tmp2_, &_inner_error_);
-#line 1541 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1685 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp1_);
-#line 1541 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1685 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1541 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1685 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 10613 "ConfigurationInterfaces.c"
-				goto __catch182_configuration_error;
+#line 11748 "ConfigurationInterfaces.c"
+				goto __catch195_configuration_error;
 			}
-#line 1541 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1685 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("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 1541 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1685 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 1541 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1685 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 10622 "ConfigurationInterfaces.c"
+#line 11757 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally182;
-	__catch182_configuration_error:
+	goto __finally195;
+	__catch195_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
-#line 1540 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1684 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 1540 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1684 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 1543 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1687 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = err;
-#line 1543 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1687 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp3_);
-#line 1540 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1684 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 10640 "ConfigurationInterfaces.c"
+#line 11775 "ConfigurationInterfaces.c"
 	}
-	__finally182:
-#line 1540 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally195:
+#line 1684 "/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 1684 "/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 1540 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1684 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		g_clear_error (&_inner_error_);
-#line 1540 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1684 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 10651 "ConfigurationInterfaces.c"
+#line 11786 "ConfigurationInterfaces.c"
 	}
 }
 
 
 void configuration_facade_set_slideshow_show_title (ConfigurationFacade* self, gboolean show_title) {
-#line 1539 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1683 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
-#line 1539 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1683 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_slideshow_show_title (self, show_title);
-#line 10661 "ConfigurationInterfaces.c"
+#line 11796 "ConfigurationInterfaces.c"
 }
 
 
@@ -10677,7 +11812,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 10676 "ConfigurationInterfaces.c"
+#line 11811 "ConfigurationInterfaces.c"
 }
 
 
@@ -10723,7 +11858,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 10722 "ConfigurationInterfaces.c"
+#line 11857 "ConfigurationInterfaces.c"
 }
 
 
@@ -10736,41 +11871,41 @@ static gboolean configuration_facade_real_get_use_24_hour_time (ConfigurationFac
 		ConfigurationEngine* _tmp2_ = NULL;
 		gboolean _tmp3_ = FALSE;
 		gboolean _tmp4_ = FALSE;
-#line 1552 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1696 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = configuration_facade_get_engine (self);
-#line 1552 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1696 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = _tmp1_;
-#line 1552 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1696 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = configuration_engine_get_bool_property (_tmp2_, CONFIGURABLE_PROPERTY_USE_24_HOUR_TIME, &_inner_error_);
-#line 1552 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1696 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp4_ = _tmp3_;
-#line 1552 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1696 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp2_);
-#line 1552 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1696 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = _tmp4_;
-#line 1552 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1696 "/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 1696 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 10751 "ConfigurationInterfaces.c"
-				goto __catch183_configuration_error;
+#line 11886 "ConfigurationInterfaces.c"
+				goto __catch196_configuration_error;
 			}
-#line 1552 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1696 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("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 1696 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 1552 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1696 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return FALSE;
-#line 10760 "ConfigurationInterfaces.c"
+#line 11895 "ConfigurationInterfaces.c"
 		}
-#line 1552 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1696 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp0_;
-#line 1552 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1696 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 10766 "ConfigurationInterfaces.c"
+#line 11901 "ConfigurationInterfaces.c"
 	}
-	goto __finally183;
-	__catch183_configuration_error:
+	goto __finally196;
+	__catch196_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp5_ = NULL;
@@ -10779,51 +11914,51 @@ static gboolean configuration_facade_real_get_use_24_hour_time (ConfigurationFac
 		gchar* _tmp8_ = NULL;
 		gboolean _tmp9_ = FALSE;
 		gboolean _tmp10_ = FALSE;
-#line 1551 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1695 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 1551 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1695 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 1554 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1698 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp5_ = err;
-#line 1554 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1698 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp5_);
-#line 1558 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1702 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		g_time_local ((time_t) 0, &_tmp6_);
-#line 1558 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1702 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp7_ = g_time_format (&_tmp6_, "%p");
-#line 1558 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1702 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp8_ = _tmp7_;
-#line 1558 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1702 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp9_ = is_string_empty (_tmp8_);
-#line 1558 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1702 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp10_ = _tmp9_;
-#line 1558 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1702 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_free0 (_tmp8_);
-#line 1558 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1702 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp10_;
-#line 1558 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1702 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 1558 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1702 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 10804 "ConfigurationInterfaces.c"
+#line 11939 "ConfigurationInterfaces.c"
 	}
-	__finally183:
-#line 1551 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally196:
+#line 1695 "/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 1695 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
-#line 1551 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1695 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return FALSE;
-#line 10813 "ConfigurationInterfaces.c"
+#line 11948 "ConfigurationInterfaces.c"
 }
 
 
 gboolean configuration_facade_get_use_24_hour_time (ConfigurationFacade* self) {
-#line 1550 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1694 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), FALSE);
-#line 1550 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1694 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_use_24_hour_time (self);
-#line 10822 "ConfigurationInterfaces.c"
+#line 11957 "ConfigurationInterfaces.c"
 }
 
 
@@ -10833,69 +11968,69 @@ static void configuration_facade_real_set_use_24_hour_time (ConfigurationFacade*
 		ConfigurationEngine* _tmp0_ = NULL;
 		ConfigurationEngine* _tmp1_ = NULL;
 		gboolean _tmp2_ = FALSE;
-#line 1564 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1708 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = configuration_facade_get_engine (self);
-#line 1564 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1708 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = _tmp0_;
-#line 1564 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1708 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = use_24_hour_time;
-#line 1564 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1708 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_engine_set_bool_property (_tmp1_, CONFIGURABLE_PROPERTY_USE_24_HOUR_TIME, _tmp2_, &_inner_error_);
-#line 1564 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1708 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp1_);
-#line 1564 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1708 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1564 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1708 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 10846 "ConfigurationInterfaces.c"
-				goto __catch184_configuration_error;
+#line 11981 "ConfigurationInterfaces.c"
+				goto __catch197_configuration_error;
 			}
-#line 1564 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1708 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("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 1564 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1708 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 1564 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1708 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 10855 "ConfigurationInterfaces.c"
+#line 11990 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally184;
-	__catch184_configuration_error:
+	goto __finally197;
+	__catch197_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
-#line 1563 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1707 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 1563 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1707 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 1566 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1710 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = err;
-#line 1566 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1710 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp3_);
-#line 1563 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1707 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 10873 "ConfigurationInterfaces.c"
+#line 12008 "ConfigurationInterfaces.c"
 	}
-	__finally184:
-#line 1563 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally197:
+#line 1707 "/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 1707 "/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 1563 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1707 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		g_clear_error (&_inner_error_);
-#line 1563 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1707 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 10884 "ConfigurationInterfaces.c"
+#line 12019 "ConfigurationInterfaces.c"
 	}
 }
 
 
 void configuration_facade_set_use_24_hour_time (ConfigurationFacade* self, gboolean use_24_hour_time) {
-#line 1562 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1706 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
-#line 1562 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1706 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_use_24_hour_time (self, use_24_hour_time);
-#line 10894 "ConfigurationInterfaces.c"
+#line 12029 "ConfigurationInterfaces.c"
 }
 
 
@@ -10908,77 +12043,77 @@ static gboolean configuration_facade_real_get_use_lowercase_filenames (Configura
 		ConfigurationEngine* _tmp2_ = NULL;
 		gboolean _tmp3_ = FALSE;
 		gboolean _tmp4_ = FALSE;
-#line 1575 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1719 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = configuration_facade_get_engine (self);
-#line 1575 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1719 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = _tmp1_;
-#line 1575 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1719 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = configuration_engine_get_bool_property (_tmp2_, CONFIGURABLE_PROPERTY_USE_LOWERCASE_FILENAMES, &_inner_error_);
-#line 1575 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1719 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp4_ = _tmp3_;
-#line 1575 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1719 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp2_);
-#line 1575 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1719 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = _tmp4_;
-#line 1575 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1719 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1575 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1719 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 10923 "ConfigurationInterfaces.c"
-				goto __catch185_configuration_error;
+#line 12058 "ConfigurationInterfaces.c"
+				goto __catch198_configuration_error;
 			}
-#line 1575 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1719 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("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 1575 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1719 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 1575 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1719 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return FALSE;
-#line 10932 "ConfigurationInterfaces.c"
+#line 12067 "ConfigurationInterfaces.c"
 		}
-#line 1575 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1719 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp0_;
-#line 1575 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1719 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 10938 "ConfigurationInterfaces.c"
+#line 12073 "ConfigurationInterfaces.c"
 	}
-	goto __finally185;
-	__catch185_configuration_error:
+	goto __finally198;
+	__catch198_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp5_ = NULL;
-#line 1574 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1718 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 1574 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1718 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 1577 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1721 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp5_ = err;
-#line 1577 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1721 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp5_);
-#line 1579 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1723 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = FALSE;
-#line 1579 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1723 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 1579 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1723 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 10959 "ConfigurationInterfaces.c"
+#line 12094 "ConfigurationInterfaces.c"
 	}
-	__finally185:
-#line 1574 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally198:
+#line 1718 "/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 1574 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1718 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
-#line 1574 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1718 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return FALSE;
-#line 10968 "ConfigurationInterfaces.c"
+#line 12103 "ConfigurationInterfaces.c"
 }
 
 
 gboolean configuration_facade_get_use_lowercase_filenames (ConfigurationFacade* self) {
-#line 1573 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1717 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), FALSE);
-#line 1573 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1717 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_use_lowercase_filenames (self);
-#line 10977 "ConfigurationInterfaces.c"
+#line 12112 "ConfigurationInterfaces.c"
 }
 
 
@@ -10988,69 +12123,69 @@ static void configuration_facade_real_set_use_lowercase_filenames (Configuration
 		ConfigurationEngine* _tmp0_ = NULL;
 		ConfigurationEngine* _tmp1_ = NULL;
 		gboolean _tmp2_ = FALSE;
-#line 1585 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1729 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = configuration_facade_get_engine (self);
-#line 1585 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1729 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = _tmp0_;
-#line 1585 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1729 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = b;
-#line 1585 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1729 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_engine_set_bool_property (_tmp1_, CONFIGURABLE_PROPERTY_USE_LOWERCASE_FILENAMES, _tmp2_, &_inner_error_);
-#line 1585 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1729 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp1_);
-#line 1585 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1729 "/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 1729 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 11001 "ConfigurationInterfaces.c"
-				goto __catch186_configuration_error;
+#line 12136 "ConfigurationInterfaces.c"
+				goto __catch199_configuration_error;
 			}
-#line 1585 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1729 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("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 1729 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 1585 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1729 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 11010 "ConfigurationInterfaces.c"
+#line 12145 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally186;
-	__catch186_configuration_error:
+	goto __finally199;
+	__catch199_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
-#line 1584 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1728 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 1584 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1728 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 1587 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1731 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = err;
-#line 1587 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1731 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp3_);
-#line 1584 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1728 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 11028 "ConfigurationInterfaces.c"
+#line 12163 "ConfigurationInterfaces.c"
 	}
-	__finally186:
-#line 1584 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally199:
+#line 1728 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1584 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1728 "/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 1728 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		g_clear_error (&_inner_error_);
-#line 1584 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1728 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 11039 "ConfigurationInterfaces.c"
+#line 12174 "ConfigurationInterfaces.c"
 	}
 }
 
 
 void configuration_facade_set_use_lowercase_filenames (ConfigurationFacade* self, gboolean b) {
-#line 1583 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1727 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
-#line 1583 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1727 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_use_lowercase_filenames (self, b);
-#line 11049 "ConfigurationInterfaces.c"
+#line 12184 "ConfigurationInterfaces.c"
 }
 
 
@@ -11063,77 +12198,77 @@ static gint configuration_facade_real_get_video_interpreter_state_cookie (Config
 		ConfigurationEngine* _tmp2_ = NULL;
 		gint _tmp3_ = 0;
 		gint _tmp4_ = 0;
-#line 1596 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1740 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = configuration_facade_get_engine (self);
-#line 1596 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1740 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = _tmp1_;
-#line 1596 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1740 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = configuration_engine_get_int_property (_tmp2_, CONFIGURABLE_PROPERTY_VIDEO_INTERPRETER_STATE_COOKIE, &_inner_error_);
-#line 1596 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1740 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp4_ = _tmp3_;
-#line 1596 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1740 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp2_);
-#line 1596 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1740 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = _tmp4_;
-#line 1596 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1740 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1596 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1740 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 11078 "ConfigurationInterfaces.c"
-				goto __catch187_configuration_error;
+#line 12213 "ConfigurationInterfaces.c"
+				goto __catch200_configuration_error;
 			}
-#line 1596 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1740 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("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 1596 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1740 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 1596 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1740 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return 0;
-#line 11087 "ConfigurationInterfaces.c"
+#line 12222 "ConfigurationInterfaces.c"
 		}
-#line 1596 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1740 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp0_;
-#line 1596 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1740 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 11093 "ConfigurationInterfaces.c"
+#line 12228 "ConfigurationInterfaces.c"
 	}
-	goto __finally187;
-	__catch187_configuration_error:
+	goto __finally200;
+	__catch200_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp5_ = NULL;
-#line 1595 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1739 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 1595 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1739 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 1599 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1743 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp5_ = err;
-#line 1599 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1743 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp5_);
-#line 1601 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1745 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = -1;
-#line 1601 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1745 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 1601 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1745 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 11114 "ConfigurationInterfaces.c"
+#line 12249 "ConfigurationInterfaces.c"
 	}
-	__finally187:
-#line 1595 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally200:
+#line 1739 "/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 1595 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1739 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
-#line 1595 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1739 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return 0;
-#line 11123 "ConfigurationInterfaces.c"
+#line 12258 "ConfigurationInterfaces.c"
 }
 
 
 gint configuration_facade_get_video_interpreter_state_cookie (ConfigurationFacade* self) {
-#line 1594 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1738 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), 0);
-#line 1594 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1738 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_video_interpreter_state_cookie (self);
-#line 11132 "ConfigurationInterfaces.c"
+#line 12267 "ConfigurationInterfaces.c"
 }
 
 
@@ -11143,69 +12278,69 @@ static void configuration_facade_real_set_video_interpreter_state_cookie (Config
 		ConfigurationEngine* _tmp0_ = NULL;
 		ConfigurationEngine* _tmp1_ = NULL;
 		gint _tmp2_ = 0;
-#line 1607 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1751 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = configuration_facade_get_engine (self);
-#line 1607 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1751 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = _tmp0_;
-#line 1607 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1751 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = state_cookie;
-#line 1607 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1751 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_engine_set_int_property (_tmp1_, CONFIGURABLE_PROPERTY_VIDEO_INTERPRETER_STATE_COOKIE, _tmp2_, &_inner_error_);
-#line 1607 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1751 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp1_);
-#line 1607 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1751 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1607 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1751 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 11156 "ConfigurationInterfaces.c"
-				goto __catch188_configuration_error;
+#line 12291 "ConfigurationInterfaces.c"
+				goto __catch201_configuration_error;
 			}
-#line 1607 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1751 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("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 1607 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1751 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 1607 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1751 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 11165 "ConfigurationInterfaces.c"
+#line 12300 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally188;
-	__catch188_configuration_error:
+	goto __finally201;
+	__catch201_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
-#line 1606 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1750 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 1606 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1750 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 1610 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1754 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = err;
-#line 1610 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1754 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp3_);
-#line 1606 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1750 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 11183 "ConfigurationInterfaces.c"
+#line 12318 "ConfigurationInterfaces.c"
 	}
-	__finally188:
-#line 1606 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally201:
+#line 1750 "/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 1750 "/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 1606 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1750 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		g_clear_error (&_inner_error_);
-#line 1606 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1750 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 11194 "ConfigurationInterfaces.c"
+#line 12329 "ConfigurationInterfaces.c"
 	}
 }
 
 
 void configuration_facade_set_video_interpreter_state_cookie (ConfigurationFacade* self, gint state_cookie) {
-#line 1605 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1749 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
-#line 1605 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1749 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_video_interpreter_state_cookie (self, state_cookie);
-#line 11204 "ConfigurationInterfaces.c"
+#line 12339 "ConfigurationInterfaces.c"
 }
 
 
@@ -11219,44 +12354,44 @@ static gboolean configuration_facade_real_get_plugin_bool (ConfigurationFacade*
 	gboolean _tmp5_ = FALSE;
 	gboolean _tmp6_ = FALSE;
 	gboolean _tmp7_ = FALSE;
-#line 1617 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1761 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (domain != NULL, FALSE);
-#line 1617 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1761 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (id != NULL, FALSE);
-#line 1617 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1761 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (key != NULL, FALSE);
-#line 1618 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1762 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp0_ = configuration_facade_get_engine (self);
-#line 1618 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1762 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp1_ = _tmp0_;
-#line 1618 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1762 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp2_ = domain;
-#line 1618 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1762 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp3_ = id;
-#line 1618 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1762 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp4_ = key;
-#line 1618 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1762 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp5_ = def;
-#line 1618 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1762 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp6_ = configuration_engine_get_plugin_bool (_tmp1_, _tmp2_, _tmp3_, _tmp4_, _tmp5_);
-#line 1618 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1762 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp7_ = _tmp6_;
-#line 1618 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1762 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_g_object_unref0 (_tmp1_);
-#line 1618 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1762 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	result = _tmp7_;
-#line 1618 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1762 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return result;
-#line 11246 "ConfigurationInterfaces.c"
+#line 12381 "ConfigurationInterfaces.c"
 }
 
 
 gboolean configuration_facade_get_plugin_bool (ConfigurationFacade* self, const gchar* domain, const gchar* id, const gchar* key, gboolean def) {
-#line 1617 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1761 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), FALSE);
-#line 1617 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1761 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_plugin_bool (self, domain, id, key, def);
-#line 11255 "ConfigurationInterfaces.c"
+#line 12390 "ConfigurationInterfaces.c"
 }
 
 
@@ -11267,38 +12402,38 @@ static void configuration_facade_real_set_plugin_bool (ConfigurationFacade* self
 	const gchar* _tmp3_ = NULL;
 	const gchar* _tmp4_ = NULL;
 	gboolean _tmp5_ = FALSE;
-#line 1621 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1765 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (domain != NULL);
-#line 1621 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1765 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (id != NULL);
-#line 1621 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1765 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (key != NULL);
-#line 1622 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1766 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp0_ = configuration_facade_get_engine (self);
-#line 1622 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1766 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp1_ = _tmp0_;
-#line 1622 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1766 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp2_ = domain;
-#line 1622 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1766 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp3_ = id;
-#line 1622 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1766 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp4_ = key;
-#line 1622 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1766 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp5_ = val;
-#line 1622 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1766 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	configuration_engine_set_plugin_bool (_tmp1_, _tmp2_, _tmp3_, _tmp4_, _tmp5_);
-#line 1622 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1766 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_g_object_unref0 (_tmp1_);
-#line 11288 "ConfigurationInterfaces.c"
+#line 12423 "ConfigurationInterfaces.c"
 }
 
 
 void configuration_facade_set_plugin_bool (ConfigurationFacade* self, const gchar* domain, const gchar* id, const gchar* key, gboolean val) {
-#line 1621 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1765 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
-#line 1621 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1765 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_plugin_bool (self, domain, id, key, val);
-#line 11297 "ConfigurationInterfaces.c"
+#line 12432 "ConfigurationInterfaces.c"
 }
 
 
@@ -11312,44 +12447,44 @@ static gdouble configuration_facade_real_get_plugin_double (ConfigurationFacade*
 	gdouble _tmp5_ = 0.0;
 	gdouble _tmp6_ = 0.0;
 	gdouble _tmp7_ = 0.0;
-#line 1625 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1769 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (domain != NULL, 0.0);
-#line 1625 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1769 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (id != NULL, 0.0);
-#line 1625 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1769 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (key != NULL, 0.0);
-#line 1626 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1770 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp0_ = configuration_facade_get_engine (self);
-#line 1626 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1770 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp1_ = _tmp0_;
-#line 1626 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1770 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp2_ = domain;
-#line 1626 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1770 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp3_ = id;
-#line 1626 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1770 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp4_ = key;
-#line 1626 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1770 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp5_ = def;
-#line 1626 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1770 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp6_ = configuration_engine_get_plugin_double (_tmp1_, _tmp2_, _tmp3_, _tmp4_, _tmp5_);
-#line 1626 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1770 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp7_ = _tmp6_;
-#line 1626 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1770 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_g_object_unref0 (_tmp1_);
-#line 1626 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1770 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	result = _tmp7_;
-#line 1626 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1770 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return result;
-#line 11339 "ConfigurationInterfaces.c"
+#line 12474 "ConfigurationInterfaces.c"
 }
 
 
 gdouble configuration_facade_get_plugin_double (ConfigurationFacade* self, const gchar* domain, const gchar* id, const gchar* key, gdouble def) {
-#line 1625 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1769 "/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 1769 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_plugin_double (self, domain, id, key, def);
-#line 11348 "ConfigurationInterfaces.c"
+#line 12483 "ConfigurationInterfaces.c"
 }
 
 
@@ -11360,38 +12495,38 @@ static void configuration_facade_real_set_plugin_double (ConfigurationFacade* se
 	const gchar* _tmp3_ = NULL;
 	const gchar* _tmp4_ = NULL;
 	gdouble _tmp5_ = 0.0;
-#line 1629 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1773 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (domain != NULL);
-#line 1629 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1773 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (id != NULL);
-#line 1629 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1773 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (key != NULL);
-#line 1630 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1774 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp0_ = configuration_facade_get_engine (self);
-#line 1630 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1774 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp1_ = _tmp0_;
-#line 1630 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1774 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp2_ = domain;
-#line 1630 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1774 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp3_ = id;
-#line 1630 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1774 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp4_ = key;
-#line 1630 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1774 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp5_ = val;
-#line 1630 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1774 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	configuration_engine_set_plugin_double (_tmp1_, _tmp2_, _tmp3_, _tmp4_, _tmp5_);
-#line 1630 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1774 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_g_object_unref0 (_tmp1_);
-#line 11381 "ConfigurationInterfaces.c"
+#line 12516 "ConfigurationInterfaces.c"
 }
 
 
 void configuration_facade_set_plugin_double (ConfigurationFacade* self, const gchar* domain, const gchar* id, const gchar* key, gdouble val) {
-#line 1629 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1773 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
-#line 1629 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1773 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_plugin_double (self, domain, id, key, val);
-#line 11390 "ConfigurationInterfaces.c"
+#line 12525 "ConfigurationInterfaces.c"
 }
 
 
@@ -11405,44 +12540,44 @@ static gint configuration_facade_real_get_plugin_int (ConfigurationFacade* self,
 	gint _tmp5_ = 0;
 	gint _tmp6_ = 0;
 	gint _tmp7_ = 0;
-#line 1633 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1777 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (domain != NULL, 0);
-#line 1633 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1777 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (id != NULL, 0);
-#line 1633 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1777 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (key != NULL, 0);
-#line 1634 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1778 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp0_ = configuration_facade_get_engine (self);
-#line 1634 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1778 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp1_ = _tmp0_;
-#line 1634 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1778 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp2_ = domain;
-#line 1634 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1778 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp3_ = id;
-#line 1634 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1778 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp4_ = key;
-#line 1634 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1778 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp5_ = def;
-#line 1634 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1778 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp6_ = configuration_engine_get_plugin_int (_tmp1_, _tmp2_, _tmp3_, _tmp4_, _tmp5_);
-#line 1634 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1778 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp7_ = _tmp6_;
-#line 1634 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1778 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_g_object_unref0 (_tmp1_);
-#line 1634 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1778 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	result = _tmp7_;
-#line 1634 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1778 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return result;
-#line 11432 "ConfigurationInterfaces.c"
+#line 12567 "ConfigurationInterfaces.c"
 }
 
 
 gint configuration_facade_get_plugin_int (ConfigurationFacade* self, const gchar* domain, const gchar* id, const gchar* key, gint def) {
-#line 1633 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1777 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), 0);
-#line 1633 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1777 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_plugin_int (self, domain, id, key, def);
-#line 11441 "ConfigurationInterfaces.c"
+#line 12576 "ConfigurationInterfaces.c"
 }
 
 
@@ -11453,38 +12588,38 @@ static void configuration_facade_real_set_plugin_int (ConfigurationFacade* self,
 	const gchar* _tmp3_ = NULL;
 	const gchar* _tmp4_ = NULL;
 	gint _tmp5_ = 0;
-#line 1637 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1781 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (domain != NULL);
-#line 1637 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1781 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (id != NULL);
-#line 1637 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1781 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (key != NULL);
-#line 1638 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1782 "/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 1782 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp1_ = _tmp0_;
-#line 1638 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1782 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp2_ = domain;
-#line 1638 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1782 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp3_ = id;
-#line 1638 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1782 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp4_ = key;
-#line 1638 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1782 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp5_ = val;
-#line 1638 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1782 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	configuration_engine_set_plugin_int (_tmp1_, _tmp2_, _tmp3_, _tmp4_, _tmp5_);
-#line 1638 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1782 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_g_object_unref0 (_tmp1_);
-#line 11474 "ConfigurationInterfaces.c"
+#line 12609 "ConfigurationInterfaces.c"
 }
 
 
 void configuration_facade_set_plugin_int (ConfigurationFacade* self, const gchar* domain, const gchar* id, const gchar* key, gint val) {
-#line 1637 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1781 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
-#line 1637 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1781 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_plugin_int (self, domain, id, key, val);
-#line 11483 "ConfigurationInterfaces.c"
+#line 12618 "ConfigurationInterfaces.c"
 }
 
 
@@ -11502,65 +12637,65 @@ static gchar* configuration_facade_real_get_plugin_string (ConfigurationFacade*
 	const gchar* _tmp8_ = NULL;
 	const gchar* _tmp9_ = NULL;
 	gchar* _tmp11_ = NULL;
-#line 1641 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1785 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (domain != NULL, NULL);
-#line 1641 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1785 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (id != NULL, NULL);
-#line 1641 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1785 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (key != NULL, NULL);
-#line 1642 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1786 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp0_ = configuration_facade_get_engine (self);
-#line 1642 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1786 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp1_ = _tmp0_;
-#line 1642 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1786 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp2_ = domain;
-#line 1642 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1786 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp3_ = id;
-#line 1642 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1786 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp4_ = key;
-#line 1642 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1786 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp5_ = def;
-#line 1642 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1786 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp6_ = configuration_engine_get_plugin_string (_tmp1_, _tmp2_, _tmp3_, _tmp4_, _tmp5_);
-#line 1642 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1786 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp7_ = _tmp6_;
-#line 1642 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1786 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_g_object_unref0 (_tmp1_);
-#line 1642 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1786 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_result_ = _tmp7_;
-#line 1643 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1787 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp9_ = _result_;
-#line 1643 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1787 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (g_strcmp0 (_tmp9_, "") == 0) {
-#line 1643 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1787 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp8_ = NULL;
-#line 11533 "ConfigurationInterfaces.c"
+#line 12668 "ConfigurationInterfaces.c"
 	} else {
 		const gchar* _tmp10_ = NULL;
-#line 1643 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1787 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp10_ = _result_;
-#line 1643 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1787 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp8_ = _tmp10_;
-#line 11540 "ConfigurationInterfaces.c"
+#line 12675 "ConfigurationInterfaces.c"
 	}
-#line 1643 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1787 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp11_ = g_strdup (_tmp8_);
-#line 1643 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1787 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	result = _tmp11_;
-#line 1643 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1787 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_g_free0 (_result_);
-#line 1643 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1787 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return result;
-#line 11550 "ConfigurationInterfaces.c"
+#line 12685 "ConfigurationInterfaces.c"
 }
 
 
 gchar* configuration_facade_get_plugin_string (ConfigurationFacade* self, const gchar* domain, const gchar* id, const gchar* key, const gchar* def) {
-#line 1641 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1785 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), NULL);
-#line 1641 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1785 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_plugin_string (self, domain, id, key, def);
-#line 11559 "ConfigurationInterfaces.c"
+#line 12694 "ConfigurationInterfaces.c"
 }
 
 
@@ -11572,46 +12707,46 @@ static void configuration_facade_real_set_plugin_string (ConfigurationFacade* se
 	const gchar* _tmp4_ = NULL;
 	const gchar* _tmp5_ = NULL;
 	const gchar* _tmp6_ = NULL;
-#line 1646 "/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 1646 "/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 1646 "/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 1647 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1791 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp0_ = val;
-#line 1647 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1791 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (_tmp0_ == NULL) {
-#line 1648 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1792 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		val = "";
-#line 11583 "ConfigurationInterfaces.c"
+#line 12718 "ConfigurationInterfaces.c"
 	}
-#line 1650 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1794 "/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 1794 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp2_ = _tmp1_;
-#line 1650 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1794 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp3_ = domain;
-#line 1650 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1794 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp4_ = id;
-#line 1650 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1794 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp5_ = key;
-#line 1650 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1794 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp6_ = val;
-#line 1650 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1794 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	configuration_engine_set_plugin_string (_tmp2_, _tmp3_, _tmp4_, _tmp5_, _tmp6_);
-#line 1650 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1794 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_g_object_unref0 (_tmp2_);
-#line 11601 "ConfigurationInterfaces.c"
+#line 12736 "ConfigurationInterfaces.c"
 }
 
 
 void configuration_facade_set_plugin_string (ConfigurationFacade* self, const gchar* domain, const gchar* id, const gchar* key, const gchar* val) {
-#line 1646 "/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 1646 "/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_string (self, domain, id, key, val);
-#line 11610 "ConfigurationInterfaces.c"
+#line 12745 "ConfigurationInterfaces.c"
 }
 
 
@@ -11621,36 +12756,36 @@ static void configuration_facade_real_unset_plugin_key (ConfigurationFacade* sel
 	const gchar* _tmp2_ = NULL;
 	const gchar* _tmp3_ = NULL;
 	const gchar* _tmp4_ = NULL;
-#line 1653 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1797 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (domain != NULL);
-#line 1653 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1797 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (id != NULL);
-#line 1653 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1797 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (key != NULL);
-#line 1654 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1798 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp0_ = configuration_facade_get_engine (self);
-#line 1654 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1798 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp1_ = _tmp0_;
-#line 1654 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1798 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp2_ = domain;
-#line 1654 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1798 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp3_ = id;
-#line 1654 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1798 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp4_ = key;
-#line 1654 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1798 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	configuration_engine_unset_plugin_key (_tmp1_, _tmp2_, _tmp3_, _tmp4_);
-#line 1654 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1798 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_g_object_unref0 (_tmp1_);
-#line 11640 "ConfigurationInterfaces.c"
+#line 12775 "ConfigurationInterfaces.c"
 }
 
 
 void configuration_facade_unset_plugin_key (ConfigurationFacade* self, const gchar* domain, const gchar* id, const gchar* key) {
-#line 1653 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1797 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
-#line 1653 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1797 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->unset_plugin_key (self, domain, id, key);
-#line 11649 "ConfigurationInterfaces.c"
+#line 12784 "ConfigurationInterfaces.c"
 }
 
 
@@ -11661,34 +12796,34 @@ static FuzzyPropertyState configuration_facade_real_is_plugin_enabled (Configura
 	const gchar* _tmp2_ = NULL;
 	FuzzyPropertyState _tmp3_ = 0;
 	FuzzyPropertyState _tmp4_ = 0;
-#line 1660 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1804 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (id != NULL, 0);
-#line 1661 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1805 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp0_ = configuration_facade_get_engine (self);
-#line 1661 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1805 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp1_ = _tmp0_;
-#line 1661 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1805 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp2_ = id;
-#line 1661 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1805 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp3_ = configuration_engine_is_plugin_enabled (_tmp1_, _tmp2_);
-#line 1661 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1805 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp4_ = _tmp3_;
-#line 1661 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1805 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_g_object_unref0 (_tmp1_);
-#line 1661 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1805 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	result = _tmp4_;
-#line 1661 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1805 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return result;
-#line 11678 "ConfigurationInterfaces.c"
+#line 12813 "ConfigurationInterfaces.c"
 }
 
 
 FuzzyPropertyState configuration_facade_is_plugin_enabled (ConfigurationFacade* self, const gchar* id) {
-#line 1660 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1804 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), 0);
-#line 1660 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1804 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->is_plugin_enabled (self, id);
-#line 11687 "ConfigurationInterfaces.c"
+#line 12822 "ConfigurationInterfaces.c"
 }
 
 
@@ -11697,314 +12832,338 @@ static void configuration_facade_real_set_plugin_enabled (ConfigurationFacade* s
 	ConfigurationEngine* _tmp1_ = NULL;
 	const gchar* _tmp2_ = NULL;
 	gboolean _tmp3_ = FALSE;
-#line 1664 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1808 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (id != NULL);
-#line 1665 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1809 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp0_ = configuration_facade_get_engine (self);
-#line 1665 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1809 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp1_ = _tmp0_;
-#line 1665 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1809 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp2_ = id;
-#line 1665 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1809 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp3_ = enabled;
-#line 1665 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1809 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	configuration_engine_set_plugin_enabled (_tmp1_, _tmp2_, _tmp3_);
-#line 1665 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1809 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_g_object_unref0 (_tmp1_);
-#line 11710 "ConfigurationInterfaces.c"
+#line 12845 "ConfigurationInterfaces.c"
 }
 
 
 void configuration_facade_set_plugin_enabled (ConfigurationFacade* self, const gchar* id, gboolean enabled) {
-#line 1664 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1808 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
-#line 1664 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1808 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_plugin_enabled (self, id, enabled);
-#line 11719 "ConfigurationInterfaces.c"
+#line 12854 "ConfigurationInterfaces.c"
 }
 
 
 static void configuration_facade_class_init (ConfigurationFacadeClass * klass) {
-#line 318 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	configuration_facade_parent_class = g_type_class_peek_parent (klass);
-#line 318 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_type_class_add_private (klass, sizeof (ConfigurationFacadePrivate));
-#line 318 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->get_auto_import_from_library = configuration_facade_real_get_auto_import_from_library;
-#line 318 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->set_auto_import_from_library = configuration_facade_real_set_auto_import_from_library;
-#line 318 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->get_bg_color_name = configuration_facade_real_get_bg_color_name;
-#line 318 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->set_bg_color_name = configuration_facade_real_set_bg_color_name;
-#line 318 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->get_commit_metadata_to_masters = configuration_facade_real_get_commit_metadata_to_masters;
-#line 318 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->set_commit_metadata_to_masters = configuration_facade_real_set_commit_metadata_to_masters;
-#line 318 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->get_desktop_background = configuration_facade_real_get_desktop_background;
-#line 318 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->set_desktop_background = configuration_facade_real_set_desktop_background;
-#line 318 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->get_screensaver = configuration_facade_real_get_screensaver;
-#line 318 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->set_screensaver = configuration_facade_real_set_screensaver;
-#line 318 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->get_directory_pattern = configuration_facade_real_get_directory_pattern;
-#line 318 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->set_directory_pattern = configuration_facade_real_set_directory_pattern;
-#line 318 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->get_directory_pattern_custom = configuration_facade_real_get_directory_pattern_custom;
-#line 318 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->set_directory_pattern_custom = configuration_facade_real_set_directory_pattern_custom;
-#line 318 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->get_direct_window_state = configuration_facade_real_get_direct_window_state;
-#line 318 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->set_direct_window_state = configuration_facade_real_set_direct_window_state;
-#line 318 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->get_display_basic_properties = configuration_facade_real_get_display_basic_properties;
-#line 318 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->set_display_basic_properties = configuration_facade_real_set_display_basic_properties;
-#line 318 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->get_display_extended_properties = configuration_facade_real_get_display_extended_properties;
-#line 318 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->set_display_extended_properties = configuration_facade_real_set_display_extended_properties;
-#line 318 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->get_display_sidebar = configuration_facade_real_get_display_sidebar;
-#line 318 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->set_display_sidebar = configuration_facade_real_set_display_sidebar;
-#line 318 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->get_display_toolbar = configuration_facade_real_get_display_toolbar;
-#line 318 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->set_display_toolbar = configuration_facade_real_set_display_toolbar;
-#line 318 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->get_display_search_bar = configuration_facade_real_get_display_search_bar;
-#line 318 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->set_display_search_bar = configuration_facade_real_set_display_search_bar;
-#line 318 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->get_display_photo_ratings = configuration_facade_real_get_display_photo_ratings;
-#line 318 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->set_display_photo_ratings = configuration_facade_real_set_display_photo_ratings;
-#line 318 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->get_display_photo_tags = configuration_facade_real_get_display_photo_tags;
-#line 318 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->set_display_photo_tags = configuration_facade_real_set_display_photo_tags;
-#line 318 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->get_display_photo_titles = configuration_facade_real_get_display_photo_titles;
-#line 318 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->set_display_photo_titles = configuration_facade_real_set_display_photo_titles;
-#line 318 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->get_display_photo_comments = configuration_facade_real_get_display_photo_comments;
-#line 318 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->set_display_photo_comments = configuration_facade_real_set_display_photo_comments;
-#line 318 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->get_display_event_comments = configuration_facade_real_get_display_event_comments;
-#line 318 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->set_display_event_comments = configuration_facade_real_set_display_event_comments;
-#line 318 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->get_event_photos_sort = configuration_facade_real_get_event_photos_sort;
-#line 318 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->set_event_photos_sort = configuration_facade_real_set_event_photos_sort;
-#line 318 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->get_events_sort_ascending = configuration_facade_real_get_events_sort_ascending;
-#line 318 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->set_events_sort_ascending = configuration_facade_real_set_events_sort_ascending;
-#line 318 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->get_external_photo_app = configuration_facade_real_get_external_photo_app;
-#line 318 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->set_external_photo_app = configuration_facade_real_set_external_photo_app;
-#line 318 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->get_external_raw_app = configuration_facade_real_get_external_raw_app;
-#line 318 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->set_external_raw_app = configuration_facade_real_set_external_raw_app;
-#line 318 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	((ConfigurationFacadeClass *) klass)->get_export_constraint = configuration_facade_real_get_export_constraint;
+#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	((ConfigurationFacadeClass *) klass)->set_export_constraint = configuration_facade_real_set_export_constraint;
+#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	((ConfigurationFacadeClass *) klass)->get_export_export_format_mode = configuration_facade_real_get_export_export_format_mode;
+#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	((ConfigurationFacadeClass *) klass)->set_export_export_format_mode = configuration_facade_real_set_export_export_format_mode;
+#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	((ConfigurationFacadeClass *) klass)->get_export_export_metadata = configuration_facade_real_get_export_export_metadata;
+#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	((ConfigurationFacadeClass *) klass)->set_export_export_metadata = configuration_facade_real_set_export_export_metadata;
+#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	((ConfigurationFacadeClass *) klass)->get_export_photo_file_format = configuration_facade_real_get_export_photo_file_format;
+#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	((ConfigurationFacadeClass *) klass)->set_export_photo_file_format = configuration_facade_real_set_export_photo_file_format;
+#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	((ConfigurationFacadeClass *) klass)->get_export_quality = configuration_facade_real_get_export_quality;
+#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	((ConfigurationFacadeClass *) klass)->set_export_quality = configuration_facade_real_set_export_quality;
+#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	((ConfigurationFacadeClass *) klass)->get_export_scale = configuration_facade_real_get_export_scale;
+#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	((ConfigurationFacadeClass *) klass)->set_export_scale = configuration_facade_real_set_export_scale;
+#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->get_default_raw_developer = configuration_facade_real_get_default_raw_developer;
-#line 318 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->set_default_raw_developer = configuration_facade_real_set_default_raw_developer;
-#line 318 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->get_hide_photos_already_imported = configuration_facade_real_get_hide_photos_already_imported;
-#line 318 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->set_hide_photos_already_imported = configuration_facade_real_set_hide_photos_already_imported;
-#line 318 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->get_import_dir = configuration_facade_real_get_import_dir;
-#line 318 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->set_import_dir = configuration_facade_real_set_import_dir;
-#line 318 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->get_keep_relativity = configuration_facade_real_get_keep_relativity;
-#line 318 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->set_keep_relativity = configuration_facade_real_set_keep_relativity;
-#line 318 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->get_pin_toolbar_state = configuration_facade_real_get_pin_toolbar_state;
-#line 318 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->set_pin_toolbar_state = configuration_facade_real_set_pin_toolbar_state;
-#line 318 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->get_last_crop_height = configuration_facade_real_get_last_crop_height;
-#line 318 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->set_last_crop_height = configuration_facade_real_set_last_crop_height;
-#line 318 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->get_last_crop_menu_choice = configuration_facade_real_get_last_crop_menu_choice;
-#line 318 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->set_last_crop_menu_choice = configuration_facade_real_set_last_crop_menu_choice;
-#line 318 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->get_last_crop_width = configuration_facade_real_get_last_crop_width;
-#line 318 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->set_last_crop_width = configuration_facade_real_set_last_crop_width;
-#line 318 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->get_last_used_service = configuration_facade_real_get_last_used_service;
-#line 318 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->set_last_used_service = configuration_facade_real_set_last_used_service;
-#line 318 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->get_last_used_dataimports_service = configuration_facade_real_get_last_used_dataimports_service;
-#line 318 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->set_last_used_dataimports_service = configuration_facade_real_set_last_used_dataimports_service;
-#line 318 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->get_library_photos_sort = configuration_facade_real_get_library_photos_sort;
-#line 318 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->set_library_photos_sort = configuration_facade_real_set_library_photos_sort;
-#line 318 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->get_library_window_state = configuration_facade_real_get_library_window_state;
-#line 318 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->set_library_window_state = configuration_facade_real_set_library_window_state;
-#line 318 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->get_modify_originals = configuration_facade_real_get_modify_originals;
-#line 318 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->set_modify_originals = configuration_facade_real_set_modify_originals;
-#line 318 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->get_photo_thumbnail_scale = configuration_facade_real_get_photo_thumbnail_scale;
-#line 318 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->set_photo_thumbnail_scale = configuration_facade_real_set_photo_thumbnail_scale;
-#line 318 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->get_printing_content_height = configuration_facade_real_get_printing_content_height;
-#line 318 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->set_printing_content_height = configuration_facade_real_set_printing_content_height;
-#line 318 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->get_printing_content_layout = configuration_facade_real_get_printing_content_layout;
-#line 318 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->set_printing_content_layout = configuration_facade_real_set_printing_content_layout;
-#line 318 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->get_printing_content_ppi = configuration_facade_real_get_printing_content_ppi;
-#line 318 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->set_printing_content_ppi = configuration_facade_real_set_printing_content_ppi;
-#line 318 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->get_printing_content_units = configuration_facade_real_get_printing_content_units;
-#line 318 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->set_printing_content_units = configuration_facade_real_set_printing_content_units;
-#line 318 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->get_printing_content_width = configuration_facade_real_get_printing_content_width;
-#line 318 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->set_printing_content_width = configuration_facade_real_set_printing_content_width;
-#line 318 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->get_printing_images_per_page = configuration_facade_real_get_printing_images_per_page;
-#line 318 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->set_printing_images_per_page = configuration_facade_real_set_printing_images_per_page;
-#line 318 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->get_printing_match_aspect_ratio = configuration_facade_real_get_printing_match_aspect_ratio;
-#line 318 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->set_printing_match_aspect_ratio = configuration_facade_real_set_printing_match_aspect_ratio;
-#line 318 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->get_printing_print_titles = configuration_facade_real_get_printing_print_titles;
-#line 318 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->set_printing_print_titles = configuration_facade_real_set_printing_print_titles;
-#line 318 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->get_printing_size_selection = configuration_facade_real_get_printing_size_selection;
-#line 318 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->set_printing_size_selection = configuration_facade_real_set_printing_size_selection;
-#line 318 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->get_printing_titles_font = configuration_facade_real_get_printing_titles_font;
-#line 318 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->set_printing_titles_font = configuration_facade_real_set_printing_titles_font;
-#line 318 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->get_show_welcome_dialog = configuration_facade_real_get_show_welcome_dialog;
-#line 318 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->set_show_welcome_dialog = configuration_facade_real_set_show_welcome_dialog;
-#line 318 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->get_sidebar_position = configuration_facade_real_get_sidebar_position;
-#line 318 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->set_sidebar_position = configuration_facade_real_set_sidebar_position;
-#line 318 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->get_slideshow_delay = configuration_facade_real_get_slideshow_delay;
-#line 318 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->set_slideshow_delay = configuration_facade_real_set_slideshow_delay;
-#line 318 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->get_slideshow_transition_delay = configuration_facade_real_get_slideshow_transition_delay;
-#line 318 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->set_slideshow_transition_delay = configuration_facade_real_set_slideshow_transition_delay;
-#line 318 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->get_slideshow_transition_effect_id = configuration_facade_real_get_slideshow_transition_effect_id;
-#line 318 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->set_slideshow_transition_effect_id = configuration_facade_real_set_slideshow_transition_effect_id;
-#line 318 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->get_slideshow_show_title = configuration_facade_real_get_slideshow_show_title;
-#line 318 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->set_slideshow_show_title = configuration_facade_real_set_slideshow_show_title;
-#line 318 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->get_use_24_hour_time = configuration_facade_real_get_use_24_hour_time;
-#line 318 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->set_use_24_hour_time = configuration_facade_real_set_use_24_hour_time;
-#line 318 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->get_use_lowercase_filenames = configuration_facade_real_get_use_lowercase_filenames;
-#line 318 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->set_use_lowercase_filenames = configuration_facade_real_set_use_lowercase_filenames;
-#line 318 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->get_video_interpreter_state_cookie = configuration_facade_real_get_video_interpreter_state_cookie;
-#line 318 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->set_video_interpreter_state_cookie = configuration_facade_real_set_video_interpreter_state_cookie;
-#line 318 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->get_plugin_bool = configuration_facade_real_get_plugin_bool;
-#line 318 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->set_plugin_bool = configuration_facade_real_set_plugin_bool;
-#line 318 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->get_plugin_double = configuration_facade_real_get_plugin_double;
-#line 318 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->set_plugin_double = configuration_facade_real_set_plugin_double;
-#line 318 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->get_plugin_int = configuration_facade_real_get_plugin_int;
-#line 318 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->set_plugin_int = configuration_facade_real_set_plugin_int;
-#line 318 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->get_plugin_string = configuration_facade_real_get_plugin_string;
-#line 318 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->set_plugin_string = configuration_facade_real_set_plugin_string;
-#line 318 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->unset_plugin_key = configuration_facade_real_unset_plugin_key;
-#line 318 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->is_plugin_enabled = configuration_facade_real_is_plugin_enabled;
-#line 318 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	((ConfigurationFacadeClass *) klass)->set_plugin_enabled = configuration_facade_real_set_plugin_enabled;
-#line 318 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	G_OBJECT_CLASS (klass)->finalize = configuration_facade_finalize;
-#line 318 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_signal_new ("auto_import_from_library_changed", TYPE_CONFIGURATION_FACADE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-#line 318 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_signal_new ("bg_color_name_changed", TYPE_CONFIGURATION_FACADE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-#line 318 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_signal_new ("commit_metadata_to_masters_changed", TYPE_CONFIGURATION_FACADE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-#line 318 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_signal_new ("events_sort_ascending_changed", TYPE_CONFIGURATION_FACADE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-#line 318 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_signal_new ("external_app_changed", TYPE_CONFIGURATION_FACADE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-#line 318 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#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 11984 "ConfigurationInterfaces.c"
+#line 13143 "ConfigurationInterfaces.c"
 }
 
 
 static void configuration_facade_instance_init (ConfigurationFacade * self) {
-#line 318 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	self->priv = CONFIGURATION_FACADE_GET_PRIVATE (self);
-#line 11991 "ConfigurationInterfaces.c"
+#line 13150 "ConfigurationInterfaces.c"
 }
 
 
 static void configuration_facade_finalize (GObject* obj) {
 	ConfigurationFacade * self;
-#line 318 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_CONFIGURATION_FACADE, ConfigurationFacade);
-#line 319 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 346 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_g_object_unref0 (self->priv->engine);
-#line 318 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	G_OBJECT_CLASS (configuration_facade_parent_class)->finalize (obj);
-#line 12003 "ConfigurationInterfaces.c"
+#line 13162 "ConfigurationInterfaces.c"
 }
 
 
diff --git a/src/config/ConfigurationInterfaces.vala b/src/config/ConfigurationInterfaces.vala
index 9414f49..29a3604 100644
--- a/src/config/ConfigurationInterfaces.vala
+++ b/src/config/ConfigurationInterfaces.vala
@@ -45,6 +45,12 @@ public enum ConfigurableProperty {
     EVENT_PHOTOS_SORT_ASCENDING,
     EVENT_PHOTOS_SORT_BY,
     EVENTS_SORT_ASCENDING,
+    EXPORT_CONSTRAINT,
+    EXPORT_EXPORT_FORMAT_MODE,
+    EXPORT_EXPORT_METADATA,
+    EXPORT_PHOTO_FILE_FORMAT,
+    EXPORT_QUALITY,
+    EXPORT_SCALE,
     EXTERNAL_PHOTO_APP,
     EXTERNAL_RAW_APP,
     HIDE_PHOTOS_ALREADY_IMPORTED,
@@ -164,6 +170,24 @@ public enum ConfigurableProperty {
             case EVENTS_SORT_ASCENDING:
                 return "EVENTS_SORT_ASCENDING";
                 
+            case EXPORT_CONSTRAINT:
+                return "EXPORT_CONSTRAINT";
+
+            case EXPORT_EXPORT_FORMAT_MODE:
+                return "EXPORT_EXPORT_FORMAT_MODE";
+
+            case EXPORT_EXPORT_METADATA:
+                return "EXPORT_EXPORT_METADATA";
+
+            case EXPORT_PHOTO_FILE_FORMAT:
+                return "EXPORT_PHOTO_FILE_FORMAT";
+
+            case EXPORT_QUALITY:
+                return "EXPORT_QUALITY";
+
+            case EXPORT_SCALE:
+                return "EXPORT_SCALE";
+
             case EXTERNAL_PHOTO_APP:
                 return "EXTERNAL_PHOTO_APP";
                 
@@ -292,6 +316,9 @@ public interface ConfigurationEngine : GLib.Object {
     public abstract int get_int_property(ConfigurableProperty p) throws ConfigurationError;
     public abstract void set_int_property(ConfigurableProperty p, int val) throws ConfigurationError;
     
+    public abstract int get_enum_property(ConfigurableProperty p) throws ConfigurationError;
+    public abstract void set_enum_property(ConfigurableProperty p, int val) throws ConfigurationError;
+
     public abstract string get_string_property(ConfigurableProperty p) throws ConfigurationError;
     public abstract void set_string_property(ConfigurableProperty p, string val) throws ConfigurationError;
     
@@ -877,6 +904,123 @@ public abstract class ConfigurationFacade : Object {
     }
 
     //
+    // export dialog settings
+    //
+    public virtual ScaleConstraint get_export_constraint() {
+        try {
+            return (ScaleConstraint) get_engine().get_enum_property(ConfigurableProperty.EXPORT_CONSTRAINT);
+        } catch (ConfigurationError err) {
+            on_configuration_error(err);
+
+            return 0;
+        }
+    }
+
+    public virtual void set_export_constraint(ScaleConstraint constraint) {
+        try {
+            get_engine().set_enum_property(ConfigurableProperty.EXPORT_CONSTRAINT, ( (int) constraint));
+        } catch (ConfigurationError err) {
+            on_configuration_error(err);
+            return;
+        }
+    }
+
+    public virtual ExportFormatMode get_export_export_format_mode() {
+        try {
+            return (ExportFormatMode) get_engine().get_enum_property(ConfigurableProperty.EXPORT_EXPORT_FORMAT_MODE);
+        } catch (ConfigurationError err) {
+            on_configuration_error(err);
+
+            return 0;
+        }
+    }
+
+    public virtual void set_export_export_format_mode(ExportFormatMode export_format_mode) {
+        try {
+            get_engine().set_enum_property(ConfigurableProperty.EXPORT_EXPORT_FORMAT_MODE, ( (int) export_format_mode ));
+        } catch (ConfigurationError err) {
+            on_configuration_error(err);
+            return;
+        }
+    }
+
+    public virtual bool get_export_export_metadata() {
+        try {
+            return get_engine().get_bool_property(ConfigurableProperty.EXPORT_EXPORT_METADATA);
+        } catch (ConfigurationError err) {
+            on_configuration_error(err);
+
+            return false;
+        }
+    }
+
+    public virtual void set_export_export_metadata(bool export_metadata) {
+        try {
+            get_engine().set_bool_property(ConfigurableProperty.EXPORT_EXPORT_METADATA, export_metadata);
+        } catch (ConfigurationError err) {
+            on_configuration_error(err);
+            return;
+        }
+    }
+
+    public virtual PhotoFileFormat get_export_photo_file_format() {
+        try {
+            return PhotoFileFormat.unserialize( get_engine().get_enum_property(ConfigurableProperty.EXPORT_PHOTO_FILE_FORMAT) );
+        } catch (ConfigurationError err) {
+            on_configuration_error(err);
+
+            return 0;
+        }
+    }
+
+    public virtual void set_export_photo_file_format(PhotoFileFormat photo_file_format) {
+        try {
+            get_engine().set_enum_property(ConfigurableProperty.EXPORT_PHOTO_FILE_FORMAT, photo_file_format.serialize());
+        } catch (ConfigurationError err) {
+            on_configuration_error(err);
+            return;
+        }
+    }
+
+    public virtual Jpeg.Quality get_export_quality() {
+        try {
+            return (Jpeg.Quality) get_engine().get_enum_property(ConfigurableProperty.EXPORT_QUALITY);
+        } catch (ConfigurationError err) {
+            on_configuration_error(err);
+
+            return 0;
+        }
+    }
+
+    public virtual void set_export_quality(Jpeg.Quality quality) {
+        try {
+            get_engine().set_enum_property(ConfigurableProperty.EXPORT_QUALITY, ( (int) quality ));
+        } catch (ConfigurationError err) {
+            on_configuration_error(err);
+            return;
+        }
+    }
+
+    public virtual int get_export_scale() {
+        try {
+            return get_engine().get_int_property(ConfigurableProperty.EXPORT_SCALE);
+        } catch (ConfigurationError err) {
+            on_configuration_error(err);
+
+            return 0;
+        }
+    }
+
+    public virtual void set_export_scale(int scale) {
+        try {
+            get_engine().set_int_property(ConfigurableProperty.EXPORT_SCALE, scale);
+        } catch (ConfigurationError err) {
+            on_configuration_error(err);
+            return;
+        }
+    }
+
+    //
     // Default RAW developer.
     //
     public virtual RawDeveloper get_default_raw_developer() {
diff --git a/src/config/GSettingsEngine.c b/src/config/GSettingsEngine.c
index 2459c8b..8f52ace 100644
--- a/src/config/GSettingsEngine.c
+++ b/src/config/GSettingsEngine.c
@@ -13,7 +13,6 @@
 #include <string.h>
 #include <float.h>
 #include <math.h>
-#include <gee.h>
 #include <gio/gio.h>
 
 
@@ -39,8 +38,10 @@ typedef struct _ConfigurationEngineIface ConfigurationEngineIface;
 typedef struct _GSettingsConfigurationEngine GSettingsConfigurationEngine;
 typedef struct _GSettingsConfigurationEngineClass GSettingsConfigurationEngineClass;
 typedef struct _GSettingsConfigurationEnginePrivate GSettingsConfigurationEnginePrivate;
-#define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
 #define _g_free0(var) (var = (g_free (var), NULL))
+#define _g_settings_schema_unref0(var) ((var == NULL) ? NULL : (var = (g_settings_schema_unref (var), NULL)))
+#define _g_settings_schema_source_unref0(var) ((var == NULL) ? NULL : (var = (g_settings_schema_source_unref (var), NULL)))
+#define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
 #define _g_regex_unref0(var) ((var == NULL) ? NULL : (var = (g_regex_unref (var), NULL)))
 #define _g_error_free0(var) ((var == NULL) ? NULL : (var = (g_error_free (var), NULL)))
 
@@ -70,6 +71,12 @@ typedef enum  {
 	CONFIGURABLE_PROPERTY_EVENT_PHOTOS_SORT_ASCENDING,
 	CONFIGURABLE_PROPERTY_EVENT_PHOTOS_SORT_BY,
 	CONFIGURABLE_PROPERTY_EVENTS_SORT_ASCENDING,
+	CONFIGURABLE_PROPERTY_EXPORT_CONSTRAINT,
+	CONFIGURABLE_PROPERTY_EXPORT_EXPORT_FORMAT_MODE,
+	CONFIGURABLE_PROPERTY_EXPORT_EXPORT_METADATA,
+	CONFIGURABLE_PROPERTY_EXPORT_PHOTO_FILE_FORMAT,
+	CONFIGURABLE_PROPERTY_EXPORT_QUALITY,
+	CONFIGURABLE_PROPERTY_EXPORT_SCALE,
 	CONFIGURABLE_PROPERTY_EXTERNAL_PHOTO_APP,
 	CONFIGURABLE_PROPERTY_EXTERNAL_RAW_APP,
 	CONFIGURABLE_PROPERTY_HIDE_PHOTOS_ALREADY_IMPORTED,
@@ -127,6 +134,8 @@ struct _ConfigurationEngineIface {
 	gchar* (*get_name) (ConfigurationEngine* self);
 	gint (*get_int_property) (ConfigurationEngine* self, ConfigurableProperty p, GError** error);
 	void (*set_int_property) (ConfigurationEngine* self, ConfigurableProperty p, gint val, GError** error);
+	gint (*get_enum_property) (ConfigurationEngine* self, ConfigurableProperty p, GError** error);
+	void (*set_enum_property) (ConfigurationEngine* self, ConfigurableProperty p, gint val, GError** error);
 	gchar* (*get_string_property) (ConfigurationEngine* self, ConfigurableProperty p, GError** error);
 	void (*set_string_property) (ConfigurationEngine* self, ConfigurableProperty p, const gchar* val, GError** error);
 	gboolean (*get_bool_property) (ConfigurationEngine* self, ConfigurableProperty p, GError** error);
@@ -156,7 +165,6 @@ struct _GSettingsConfigurationEngineClass {
 };
 
 struct _GSettingsConfigurationEnginePrivate {
-	GeeSet* known_schemas;
 	gchar** schema_names;
 	gint schema_names_length1;
 	gint _schema_names_size_;
@@ -185,6 +193,7 @@ enum  {
 #define GSETTINGS_CONFIGURATION_ENGINE_WINDOW_PREFS_SCHEMA_NAME GSETTINGS_CONFIGURATION_ENGINE_PREFS_SCHEMA_NAME ".window"
 #define GSETTINGS_CONFIGURATION_ENGINE_FILES_PREFS_SCHEMA_NAME GSETTINGS_CONFIGURATION_ENGINE_PREFS_SCHEMA_NAME ".files"
 #define GSETTINGS_CONFIGURATION_ENGINE_EDITING_PREFS_SCHEMA_NAME GSETTINGS_CONFIGURATION_ENGINE_PREFS_SCHEMA_NAME ".editing"
+#define GSETTINGS_CONFIGURATION_ENGINE_EXPORT_PREFS_SCHEMA_NAME GSETTINGS_CONFIGURATION_ENGINE_PREFS_SCHEMA_NAME ".export"
 #define GSETTINGS_CONFIGURATION_ENGINE_VIDEO_SCHEMA_NAME GSETTINGS_CONFIGURATION_ENGINE_ROOT_SCHEMA_NAME ".video"
 #define GSETTINGS_CONFIGURATION_ENGINE_PRINTING_SCHEMA_NAME GSETTINGS_CONFIGURATION_ENGINE_ROOT_SCHEMA_NAME ".printing"
 #define GSETTINGS_CONFIGURATION_ENGINE_SHARING_SCHEMA_NAME GSETTINGS_CONFIGURATION_ENGINE_ROOT_SCHEMA_NAME ".sharing"
@@ -195,10 +204,11 @@ enum  {
 #define GSETTINGS_CONFIGURATION_ENGINE_PLUGINS_ENABLE_DISABLE_SCHEMA_NAME GSETTINGS_CONFIGURATION_ENGINE_ROOT_SCHEMA_NAME ".plugins.enable-state"
 GSettingsConfigurationEngine* gsettings_configuration_engine_new (void);
 GSettingsConfigurationEngine* gsettings_configuration_engine_construct (GType object_type);
-static gboolean gsettings_configuration_engine_schema_has_key (GSettingsConfigurationEngine* self, GSettings* schema_object, const gchar* key);
 static void gsettings_configuration_engine_check_key_valid (GSettingsConfigurationEngine* self, const gchar* schema, const gchar* key, GError** error);
 static gboolean gsettings_configuration_engine_get_gs_bool (GSettingsConfigurationEngine* self, const gchar* schema, const gchar* key, GError** error);
 static void gsettings_configuration_engine_set_gs_bool (GSettingsConfigurationEngine* self, const gchar* schema, const gchar* key, gboolean value, GError** error);
+static void gsettings_configuration_engine_set_gs_enum (GSettingsConfigurationEngine* self, const gchar* schema, const gchar* key, gint value, GError** error);
+static gint gsettings_configuration_engine_get_gs_enum (GSettingsConfigurationEngine* self, const gchar* schema, const gchar* key, GError** error);
 static gint gsettings_configuration_engine_get_gs_int (GSettingsConfigurationEngine* self, const gchar* schema, const gchar* key, GError** error);
 static void gsettings_configuration_engine_set_gs_int (GSettingsConfigurationEngine* self, const gchar* schema, const gchar* key, gint value, GError** error);
 static gdouble gsettings_configuration_engine_get_gs_double (GSettingsConfigurationEngine* self, const gchar* schema, const gchar* key, GError** error);
@@ -212,6 +222,8 @@ static gchar* gsettings_configuration_engine_get_plugin_enable_disable_name (con
 static gchar* gsettings_configuration_engine_make_plugin_schema_name (const gchar* domain, const gchar* id);
 static gchar* gsettings_configuration_engine_make_gsettings_key (const gchar* gconf_key);
 static gchar* gsettings_configuration_engine_real_get_name (ConfigurationEngine* base);
+static gint gsettings_configuration_engine_real_get_enum_property (ConfigurationEngine* base, ConfigurableProperty p, GError** error);
+static void gsettings_configuration_engine_real_set_enum_property (ConfigurationEngine* base, ConfigurableProperty p, gint val, GError** error);
 static gint gsettings_configuration_engine_real_get_int_property (ConfigurationEngine* base, ConfigurableProperty p, GError** error);
 static void gsettings_configuration_engine_real_set_int_property (ConfigurationEngine* base, ConfigurableProperty p, gint val, GError** error);
 static gchar* gsettings_configuration_engine_real_get_string_property (ConfigurationEngine* base, ConfigurableProperty p, GError** error);
@@ -236,15 +248,19 @@ GFile* app_dirs_get_settings_migrator_bin (void);
 static void gsettings_configuration_engine_finalize (GObject* obj);
 static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func);
 static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func);
-static gint _vala_array_length (gpointer array);
 
 
 GSettingsConfigurationEngine* gsettings_configuration_engine_construct (GType object_type) {
 	GSettingsConfigurationEngine * self = NULL;
-	GeeHashSet* _tmp0_ = NULL;
+	gchar** _tmp0_ = NULL;
 	gchar** _tmp1_ = NULL;
-	gchar** _tmp2_ = NULL;
-	gchar** _tmp6_ = NULL;
+	gint _tmp1__length1 = 0;
+	gchar* _tmp2_ = NULL;
+	gchar* _tmp3_ = NULL;
+	gchar** _tmp4_ = NULL;
+	gint _tmp4__length1 = 0;
+	gchar* _tmp5_ = NULL;
+	gchar* _tmp6_ = NULL;
 	gchar** _tmp7_ = NULL;
 	gint _tmp7__length1 = 0;
 	gchar* _tmp8_ = NULL;
@@ -498,22 +514,22 @@ GSettingsConfigurationEngine* gsettings_configuration_engine_construct (GType ob
 	gchar* _tmp194_ = NULL;
 	gchar* _tmp195_ = NULL;
 	gchar** _tmp196_ = NULL;
-	gchar** _tmp197_ = NULL;
-	gint _tmp197__length1 = 0;
+	gint _tmp196__length1 = 0;
+	gchar* _tmp197_ = NULL;
 	gchar* _tmp198_ = NULL;
-	gchar* _tmp199_ = NULL;
-	gchar** _tmp200_ = NULL;
-	gint _tmp200__length1 = 0;
+	gchar** _tmp199_ = NULL;
+	gint _tmp199__length1 = 0;
+	gchar* _tmp200_ = NULL;
 	gchar* _tmp201_ = NULL;
-	gchar* _tmp202_ = NULL;
-	gchar** _tmp203_ = NULL;
-	gint _tmp203__length1 = 0;
+	gchar** _tmp202_ = NULL;
+	gint _tmp202__length1 = 0;
+	gchar* _tmp203_ = NULL;
 	gchar* _tmp204_ = NULL;
-	gchar* _tmp205_ = NULL;
-	gchar** _tmp206_ = NULL;
-	gint _tmp206__length1 = 0;
+	gchar** _tmp205_ = NULL;
+	gint _tmp205__length1 = 0;
+	gchar* _tmp206_ = NULL;
 	gchar* _tmp207_ = NULL;
-	gchar* _tmp208_ = NULL;
+	gchar** _tmp208_ = NULL;
 	gchar** _tmp209_ = NULL;
 	gint _tmp209__length1 = 0;
 	gchar* _tmp210_ = NULL;
@@ -750,1790 +766,1887 @@ GSettingsConfigurationEngine* gsettings_configuration_engine_construct (GType ob
 	gint _tmp383__length1 = 0;
 	gchar* _tmp384_ = NULL;
 	gchar* _tmp385_ = NULL;
+	gchar** _tmp386_ = NULL;
+	gint _tmp386__length1 = 0;
+	gchar* _tmp387_ = NULL;
+	gchar* _tmp388_ = NULL;
+	gchar** _tmp389_ = NULL;
+	gint _tmp389__length1 = 0;
+	gchar* _tmp390_ = NULL;
+	gchar* _tmp391_ = NULL;
+	gchar** _tmp392_ = NULL;
+	gint _tmp392__length1 = 0;
+	gchar* _tmp393_ = NULL;
+	gchar* _tmp394_ = NULL;
+	gchar** _tmp395_ = NULL;
+	gint _tmp395__length1 = 0;
+	gchar* _tmp396_ = NULL;
+	gchar* _tmp397_ = NULL;
+	gchar** _tmp398_ = NULL;
+	gint _tmp398__length1 = 0;
+	gchar* _tmp399_ = NULL;
+	gchar* _tmp400_ = NULL;
+	gchar** _tmp401_ = NULL;
+	gint _tmp401__length1 = 0;
+	gchar* _tmp402_ = NULL;
+	gchar* _tmp403_ = NULL;
+	gchar** _tmp404_ = NULL;
+	gint _tmp404__length1 = 0;
+	gchar* _tmp405_ = NULL;
+	gchar* _tmp406_ = NULL;
+	gchar** _tmp407_ = NULL;
+	gint _tmp407__length1 = 0;
+	gchar* _tmp408_ = NULL;
+	gchar* _tmp409_ = NULL;
+	gchar** _tmp410_ = NULL;
+	gint _tmp410__length1 = 0;
+	gchar* _tmp411_ = NULL;
+	gchar* _tmp412_ = NULL;
+	gchar** _tmp413_ = NULL;
+	gint _tmp413__length1 = 0;
+	gchar* _tmp414_ = NULL;
+	gchar* _tmp415_ = NULL;
 #line 29 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	self = (GSettingsConfigurationEngine*) g_object_new (object_type, NULL);
 #line 30 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp0_ = gee_hash_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, NULL, NULL, NULL, NULL, NULL, NULL);
+	_tmp0_ = g_new0 (gchar*, CONFIGURABLE_PROPERTY_NUM_PROPERTIES + 1);
+#line 30 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+	self->priv->schema_names = (_vala_array_free (self->priv->schema_names, self->priv->schema_names_length1, (GDestroyNotify) g_free), NULL);
+#line 30 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+	self->priv->schema_names = _tmp0_;
 #line 30 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_object_unref0 (self->priv->known_schemas);
+	self->priv->schema_names_length1 = CONFIGURABLE_PROPERTY_NUM_PROPERTIES;
 #line 30 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	self->priv->known_schemas = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_SET, GeeSet);
+	self->priv->_schema_names_size_ = self->priv->schema_names_length1;
 #line 32 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp2_ = _tmp1_ = g_settings_list_schemas ();
-#line 764 "GSettingsEngine.c"
-	{
-		gchar** current_schema_collection = NULL;
-		gint current_schema_collection_length1 = 0;
-		gint _current_schema_collection_size_ = 0;
-		gint current_schema_it = 0;
+	_tmp1_ = self->priv->schema_names;
 #line 32 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-		current_schema_collection = _tmp2_;
+	_tmp1__length1 = self->priv->schema_names_length1;
 #line 32 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-		current_schema_collection_length1 = _vala_array_length (_tmp1_);
+	_tmp2_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_FILES_PREFS_SCHEMA_NAME);
 #line 32 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-		for (current_schema_it = 0; current_schema_it < _vala_array_length (_tmp1_); current_schema_it = current_schema_it + 1) {
-#line 776 "GSettingsEngine.c"
-			gchar* _tmp3_ = NULL;
-			gchar* current_schema = NULL;
+	_g_free0 (_tmp1_[CONFIGURABLE_PROPERTY_AUTO_IMPORT_FROM_LIBRARY]);
 #line 32 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-			_tmp3_ = g_strdup (current_schema_collection[current_schema_it]);
+	_tmp1_[CONFIGURABLE_PROPERTY_AUTO_IMPORT_FROM_LIBRARY] = _tmp2_;
 #line 32 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-			current_schema = _tmp3_;
-#line 783 "GSettingsEngine.c"
-			{
-				GeeSet* _tmp4_ = NULL;
-				const gchar* _tmp5_ = NULL;
+	_tmp3_ = _tmp1_[CONFIGURABLE_PROPERTY_AUTO_IMPORT_FROM_LIBRARY];
 #line 33 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-				_tmp4_ = self->priv->known_schemas;
+	_tmp4_ = self->priv->schema_names;
 #line 33 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-				_tmp5_ = current_schema;
+	_tmp4__length1 = self->priv->schema_names_length1;
 #line 33 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-				gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_COLLECTION, GeeCollection), _tmp5_);
-#line 32 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-				_g_free0 (current_schema);
-#line 795 "GSettingsEngine.c"
-			}
-		}
-	}
+	_tmp5_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_UI_PREFS_SCHEMA_NAME);
+#line 33 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+	_g_free0 (_tmp4_[CONFIGURABLE_PROPERTY_BG_COLOR_NAME]);
+#line 33 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+	_tmp4_[CONFIGURABLE_PROPERTY_BG_COLOR_NAME] = _tmp5_;
+#line 33 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+	_tmp6_ = _tmp4_[CONFIGURABLE_PROPERTY_BG_COLOR_NAME];
+#line 34 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+	_tmp7_ = self->priv->schema_names;
+#line 34 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+	_tmp7__length1 = self->priv->schema_names_length1;
+#line 34 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+	_tmp8_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_FILES_PREFS_SCHEMA_NAME);
+#line 34 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+	_g_free0 (_tmp7_[CONFIGURABLE_PROPERTY_COMMIT_METADATA_TO_MASTERS]);
+#line 34 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+	_tmp7_[CONFIGURABLE_PROPERTY_COMMIT_METADATA_TO_MASTERS] = _tmp8_;
+#line 34 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+	_tmp9_ = _tmp7_[CONFIGURABLE_PROPERTY_COMMIT_METADATA_TO_MASTERS];
 #line 35 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp6_ = g_new0 (gchar*, CONFIGURABLE_PROPERTY_NUM_PROPERTIES + 1);
+	_tmp10_ = self->priv->schema_names;
 #line 35 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	self->priv->schema_names = (_vala_array_free (self->priv->schema_names, self->priv->schema_names_length1, (GDestroyNotify) g_free), NULL);
+	_tmp10__length1 = self->priv->schema_names_length1;
 #line 35 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	self->priv->schema_names = _tmp6_;
+	_tmp11_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_SYSTEM_DESKTOP_SCHEMA_NAME);
 #line 35 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	self->priv->schema_names_length1 = CONFIGURABLE_PROPERTY_NUM_PROPERTIES;
+	_g_free0 (_tmp10_[CONFIGURABLE_PROPERTY_DESKTOP_BACKGROUND_FILE]);
 #line 35 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	self->priv->_schema_names_size_ = self->priv->schema_names_length1;
+	_tmp10_[CONFIGURABLE_PROPERTY_DESKTOP_BACKGROUND_FILE] = _tmp11_;
+#line 35 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+	_tmp12_ = _tmp10_[CONFIGURABLE_PROPERTY_DESKTOP_BACKGROUND_FILE];
+#line 36 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+	_tmp13_ = self->priv->schema_names;
+#line 36 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+	_tmp13__length1 = self->priv->schema_names_length1;
+#line 36 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+	_tmp14_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_SYSTEM_DESKTOP_SCHEMA_NAME);
+#line 36 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+	_g_free0 (_tmp13_[CONFIGURABLE_PROPERTY_DESKTOP_BACKGROUND_MODE]);
+#line 36 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+	_tmp13_[CONFIGURABLE_PROPERTY_DESKTOP_BACKGROUND_MODE] = _tmp14_;
+#line 36 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+	_tmp15_ = _tmp13_[CONFIGURABLE_PROPERTY_DESKTOP_BACKGROUND_MODE];
 #line 37 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp7_ = self->priv->schema_names;
+	_tmp16_ = self->priv->schema_names;
 #line 37 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp7__length1 = self->priv->schema_names_length1;
+	_tmp16__length1 = self->priv->schema_names_length1;
 #line 37 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp8_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_FILES_PREFS_SCHEMA_NAME);
+	_tmp17_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_SYSTEM_SCREENSAVER_SCHEMA_NAME);
 #line 37 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp7_[CONFIGURABLE_PROPERTY_AUTO_IMPORT_FROM_LIBRARY]);
+	_g_free0 (_tmp16_[CONFIGURABLE_PROPERTY_SCREENSAVER_FILE]);
 #line 37 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp7_[CONFIGURABLE_PROPERTY_AUTO_IMPORT_FROM_LIBRARY] = _tmp8_;
+	_tmp16_[CONFIGURABLE_PROPERTY_SCREENSAVER_FILE] = _tmp17_;
 #line 37 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp9_ = _tmp7_[CONFIGURABLE_PROPERTY_AUTO_IMPORT_FROM_LIBRARY];
+	_tmp18_ = _tmp16_[CONFIGURABLE_PROPERTY_SCREENSAVER_FILE];
 #line 38 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp10_ = self->priv->schema_names;
+	_tmp19_ = self->priv->schema_names;
 #line 38 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp10__length1 = self->priv->schema_names_length1;
+	_tmp19__length1 = self->priv->schema_names_length1;
 #line 38 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp11_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_UI_PREFS_SCHEMA_NAME);
+	_tmp20_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_SYSTEM_SCREENSAVER_SCHEMA_NAME);
 #line 38 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp10_[CONFIGURABLE_PROPERTY_BG_COLOR_NAME]);
+	_g_free0 (_tmp19_[CONFIGURABLE_PROPERTY_SCREENSAVER_MODE]);
 #line 38 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp10_[CONFIGURABLE_PROPERTY_BG_COLOR_NAME] = _tmp11_;
+	_tmp19_[CONFIGURABLE_PROPERTY_SCREENSAVER_MODE] = _tmp20_;
 #line 38 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp12_ = _tmp10_[CONFIGURABLE_PROPERTY_BG_COLOR_NAME];
+	_tmp21_ = _tmp19_[CONFIGURABLE_PROPERTY_SCREENSAVER_MODE];
 #line 39 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp13_ = self->priv->schema_names;
+	_tmp22_ = self->priv->schema_names;
 #line 39 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp13__length1 = self->priv->schema_names_length1;
+	_tmp22__length1 = self->priv->schema_names_length1;
 #line 39 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp14_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_FILES_PREFS_SCHEMA_NAME);
+	_tmp23_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_FILES_PREFS_SCHEMA_NAME);
 #line 39 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp13_[CONFIGURABLE_PROPERTY_COMMIT_METADATA_TO_MASTERS]);
+	_g_free0 (_tmp22_[CONFIGURABLE_PROPERTY_DIRECTORY_PATTERN]);
 #line 39 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp13_[CONFIGURABLE_PROPERTY_COMMIT_METADATA_TO_MASTERS] = _tmp14_;
+	_tmp22_[CONFIGURABLE_PROPERTY_DIRECTORY_PATTERN] = _tmp23_;
 #line 39 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp15_ = _tmp13_[CONFIGURABLE_PROPERTY_COMMIT_METADATA_TO_MASTERS];
+	_tmp24_ = _tmp22_[CONFIGURABLE_PROPERTY_DIRECTORY_PATTERN];
 #line 40 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp16_ = self->priv->schema_names;
+	_tmp25_ = self->priv->schema_names;
 #line 40 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp16__length1 = self->priv->schema_names_length1;
+	_tmp25__length1 = self->priv->schema_names_length1;
 #line 40 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp17_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_SYSTEM_DESKTOP_SCHEMA_NAME);
+	_tmp26_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_FILES_PREFS_SCHEMA_NAME);
 #line 40 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp16_[CONFIGURABLE_PROPERTY_DESKTOP_BACKGROUND_FILE]);
+	_g_free0 (_tmp25_[CONFIGURABLE_PROPERTY_DIRECTORY_PATTERN_CUSTOM]);
 #line 40 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp16_[CONFIGURABLE_PROPERTY_DESKTOP_BACKGROUND_FILE] = _tmp17_;
+	_tmp25_[CONFIGURABLE_PROPERTY_DIRECTORY_PATTERN_CUSTOM] = _tmp26_;
 #line 40 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp18_ = _tmp16_[CONFIGURABLE_PROPERTY_DESKTOP_BACKGROUND_FILE];
+	_tmp27_ = _tmp25_[CONFIGURABLE_PROPERTY_DIRECTORY_PATTERN_CUSTOM];
 #line 41 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp19_ = self->priv->schema_names;
+	_tmp28_ = self->priv->schema_names;
 #line 41 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp19__length1 = self->priv->schema_names_length1;
+	_tmp28__length1 = self->priv->schema_names_length1;
 #line 41 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp20_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_SYSTEM_DESKTOP_SCHEMA_NAME);
+	_tmp29_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_WINDOW_PREFS_SCHEMA_NAME);
 #line 41 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp19_[CONFIGURABLE_PROPERTY_DESKTOP_BACKGROUND_MODE]);
+	_g_free0 (_tmp28_[CONFIGURABLE_PROPERTY_DIRECT_WINDOW_HEIGHT]);
 #line 41 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp19_[CONFIGURABLE_PROPERTY_DESKTOP_BACKGROUND_MODE] = _tmp20_;
+	_tmp28_[CONFIGURABLE_PROPERTY_DIRECT_WINDOW_HEIGHT] = _tmp29_;
 #line 41 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp21_ = _tmp19_[CONFIGURABLE_PROPERTY_DESKTOP_BACKGROUND_MODE];
+	_tmp30_ = _tmp28_[CONFIGURABLE_PROPERTY_DIRECT_WINDOW_HEIGHT];
 #line 42 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp22_ = self->priv->schema_names;
+	_tmp31_ = self->priv->schema_names;
 #line 42 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp22__length1 = self->priv->schema_names_length1;
+	_tmp31__length1 = self->priv->schema_names_length1;
 #line 42 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp23_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_SYSTEM_SCREENSAVER_SCHEMA_NAME);
+	_tmp32_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_WINDOW_PREFS_SCHEMA_NAME);
 #line 42 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp22_[CONFIGURABLE_PROPERTY_SCREENSAVER_FILE]);
+	_g_free0 (_tmp31_[CONFIGURABLE_PROPERTY_DIRECT_WINDOW_MAXIMIZE]);
 #line 42 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp22_[CONFIGURABLE_PROPERTY_SCREENSAVER_FILE] = _tmp23_;
+	_tmp31_[CONFIGURABLE_PROPERTY_DIRECT_WINDOW_MAXIMIZE] = _tmp32_;
 #line 42 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp24_ = _tmp22_[CONFIGURABLE_PROPERTY_SCREENSAVER_FILE];
+	_tmp33_ = _tmp31_[CONFIGURABLE_PROPERTY_DIRECT_WINDOW_MAXIMIZE];
 #line 43 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp25_ = self->priv->schema_names;
+	_tmp34_ = self->priv->schema_names;
 #line 43 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp25__length1 = self->priv->schema_names_length1;
+	_tmp34__length1 = self->priv->schema_names_length1;
 #line 43 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp26_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_SYSTEM_SCREENSAVER_SCHEMA_NAME);
+	_tmp35_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_WINDOW_PREFS_SCHEMA_NAME);
 #line 43 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp25_[CONFIGURABLE_PROPERTY_SCREENSAVER_MODE]);
+	_g_free0 (_tmp34_[CONFIGURABLE_PROPERTY_DIRECT_WINDOW_WIDTH]);
 #line 43 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp25_[CONFIGURABLE_PROPERTY_SCREENSAVER_MODE] = _tmp26_;
+	_tmp34_[CONFIGURABLE_PROPERTY_DIRECT_WINDOW_WIDTH] = _tmp35_;
 #line 43 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp27_ = _tmp25_[CONFIGURABLE_PROPERTY_SCREENSAVER_MODE];
+	_tmp36_ = _tmp34_[CONFIGURABLE_PROPERTY_DIRECT_WINDOW_WIDTH];
 #line 44 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp28_ = self->priv->schema_names;
+	_tmp37_ = self->priv->schema_names;
 #line 44 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp28__length1 = self->priv->schema_names_length1;
+	_tmp37__length1 = self->priv->schema_names_length1;
 #line 44 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp29_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_FILES_PREFS_SCHEMA_NAME);
+	_tmp38_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_UI_PREFS_SCHEMA_NAME);
 #line 44 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp28_[CONFIGURABLE_PROPERTY_DIRECTORY_PATTERN]);
+	_g_free0 (_tmp37_[CONFIGURABLE_PROPERTY_DISPLAY_BASIC_PROPERTIES]);
 #line 44 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp28_[CONFIGURABLE_PROPERTY_DIRECTORY_PATTERN] = _tmp29_;
+	_tmp37_[CONFIGURABLE_PROPERTY_DISPLAY_BASIC_PROPERTIES] = _tmp38_;
 #line 44 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp30_ = _tmp28_[CONFIGURABLE_PROPERTY_DIRECTORY_PATTERN];
+	_tmp39_ = _tmp37_[CONFIGURABLE_PROPERTY_DISPLAY_BASIC_PROPERTIES];
 #line 45 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp31_ = self->priv->schema_names;
+	_tmp40_ = self->priv->schema_names;
 #line 45 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp31__length1 = self->priv->schema_names_length1;
+	_tmp40__length1 = self->priv->schema_names_length1;
 #line 45 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp32_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_FILES_PREFS_SCHEMA_NAME);
+	_tmp41_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_UI_PREFS_SCHEMA_NAME);
 #line 45 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp31_[CONFIGURABLE_PROPERTY_DIRECTORY_PATTERN_CUSTOM]);
+	_g_free0 (_tmp40_[CONFIGURABLE_PROPERTY_DISPLAY_EXTENDED_PROPERTIES]);
 #line 45 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp31_[CONFIGURABLE_PROPERTY_DIRECTORY_PATTERN_CUSTOM] = _tmp32_;
+	_tmp40_[CONFIGURABLE_PROPERTY_DISPLAY_EXTENDED_PROPERTIES] = _tmp41_;
 #line 45 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp33_ = _tmp31_[CONFIGURABLE_PROPERTY_DIRECTORY_PATTERN_CUSTOM];
+	_tmp42_ = _tmp40_[CONFIGURABLE_PROPERTY_DISPLAY_EXTENDED_PROPERTIES];
 #line 46 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp34_ = self->priv->schema_names;
+	_tmp43_ = self->priv->schema_names;
 #line 46 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp34__length1 = self->priv->schema_names_length1;
+	_tmp43__length1 = self->priv->schema_names_length1;
 #line 46 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp35_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_WINDOW_PREFS_SCHEMA_NAME);
+	_tmp44_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_UI_PREFS_SCHEMA_NAME);
 #line 46 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp34_[CONFIGURABLE_PROPERTY_DIRECT_WINDOW_HEIGHT]);
+	_g_free0 (_tmp43_[CONFIGURABLE_PROPERTY_DISPLAY_SIDEBAR]);
 #line 46 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp34_[CONFIGURABLE_PROPERTY_DIRECT_WINDOW_HEIGHT] = _tmp35_;
+	_tmp43_[CONFIGURABLE_PROPERTY_DISPLAY_SIDEBAR] = _tmp44_;
 #line 46 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp36_ = _tmp34_[CONFIGURABLE_PROPERTY_DIRECT_WINDOW_HEIGHT];
+	_tmp45_ = _tmp43_[CONFIGURABLE_PROPERTY_DISPLAY_SIDEBAR];
 #line 47 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp37_ = self->priv->schema_names;
+	_tmp46_ = self->priv->schema_names;
 #line 47 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp37__length1 = self->priv->schema_names_length1;
+	_tmp46__length1 = self->priv->schema_names_length1;
 #line 47 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp38_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_WINDOW_PREFS_SCHEMA_NAME);
+	_tmp47_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_UI_PREFS_SCHEMA_NAME);
 #line 47 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp37_[CONFIGURABLE_PROPERTY_DIRECT_WINDOW_MAXIMIZE]);
+	_g_free0 (_tmp46_[CONFIGURABLE_PROPERTY_DISPLAY_TOOLBAR]);
 #line 47 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp37_[CONFIGURABLE_PROPERTY_DIRECT_WINDOW_MAXIMIZE] = _tmp38_;
+	_tmp46_[CONFIGURABLE_PROPERTY_DISPLAY_TOOLBAR] = _tmp47_;
 #line 47 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp39_ = _tmp37_[CONFIGURABLE_PROPERTY_DIRECT_WINDOW_MAXIMIZE];
+	_tmp48_ = _tmp46_[CONFIGURABLE_PROPERTY_DISPLAY_TOOLBAR];
 #line 48 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp40_ = self->priv->schema_names;
+	_tmp49_ = self->priv->schema_names;
 #line 48 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp40__length1 = self->priv->schema_names_length1;
+	_tmp49__length1 = self->priv->schema_names_length1;
 #line 48 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp41_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_WINDOW_PREFS_SCHEMA_NAME);
+	_tmp50_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_UI_PREFS_SCHEMA_NAME);
 #line 48 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp40_[CONFIGURABLE_PROPERTY_DIRECT_WINDOW_WIDTH]);
+	_g_free0 (_tmp49_[CONFIGURABLE_PROPERTY_DISPLAY_SEARCH_BAR]);
 #line 48 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp40_[CONFIGURABLE_PROPERTY_DIRECT_WINDOW_WIDTH] = _tmp41_;
+	_tmp49_[CONFIGURABLE_PROPERTY_DISPLAY_SEARCH_BAR] = _tmp50_;
 #line 48 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp42_ = _tmp40_[CONFIGURABLE_PROPERTY_DIRECT_WINDOW_WIDTH];
+	_tmp51_ = _tmp49_[CONFIGURABLE_PROPERTY_DISPLAY_SEARCH_BAR];
 #line 49 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp43_ = self->priv->schema_names;
+	_tmp52_ = self->priv->schema_names;
 #line 49 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp43__length1 = self->priv->schema_names_length1;
+	_tmp52__length1 = self->priv->schema_names_length1;
 #line 49 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp44_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_UI_PREFS_SCHEMA_NAME);
+	_tmp53_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_UI_PREFS_SCHEMA_NAME);
 #line 49 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp43_[CONFIGURABLE_PROPERTY_DISPLAY_BASIC_PROPERTIES]);
+	_g_free0 (_tmp52_[CONFIGURABLE_PROPERTY_DISPLAY_PHOTO_RATINGS]);
 #line 49 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp43_[CONFIGURABLE_PROPERTY_DISPLAY_BASIC_PROPERTIES] = _tmp44_;
+	_tmp52_[CONFIGURABLE_PROPERTY_DISPLAY_PHOTO_RATINGS] = _tmp53_;
 #line 49 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp45_ = _tmp43_[CONFIGURABLE_PROPERTY_DISPLAY_BASIC_PROPERTIES];
+	_tmp54_ = _tmp52_[CONFIGURABLE_PROPERTY_DISPLAY_PHOTO_RATINGS];
 #line 50 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp46_ = self->priv->schema_names;
+	_tmp55_ = self->priv->schema_names;
 #line 50 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp46__length1 = self->priv->schema_names_length1;
+	_tmp55__length1 = self->priv->schema_names_length1;
 #line 50 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp47_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_UI_PREFS_SCHEMA_NAME);
+	_tmp56_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_UI_PREFS_SCHEMA_NAME);
 #line 50 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp46_[CONFIGURABLE_PROPERTY_DISPLAY_EXTENDED_PROPERTIES]);
+	_g_free0 (_tmp55_[CONFIGURABLE_PROPERTY_DISPLAY_PHOTO_TAGS]);
 #line 50 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp46_[CONFIGURABLE_PROPERTY_DISPLAY_EXTENDED_PROPERTIES] = _tmp47_;
+	_tmp55_[CONFIGURABLE_PROPERTY_DISPLAY_PHOTO_TAGS] = _tmp56_;
 #line 50 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp48_ = _tmp46_[CONFIGURABLE_PROPERTY_DISPLAY_EXTENDED_PROPERTIES];
+	_tmp57_ = _tmp55_[CONFIGURABLE_PROPERTY_DISPLAY_PHOTO_TAGS];
 #line 51 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp49_ = self->priv->schema_names;
+	_tmp58_ = self->priv->schema_names;
 #line 51 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp49__length1 = self->priv->schema_names_length1;
+	_tmp58__length1 = self->priv->schema_names_length1;
 #line 51 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp50_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_UI_PREFS_SCHEMA_NAME);
+	_tmp59_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_UI_PREFS_SCHEMA_NAME);
 #line 51 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp49_[CONFIGURABLE_PROPERTY_DISPLAY_SIDEBAR]);
+	_g_free0 (_tmp58_[CONFIGURABLE_PROPERTY_DISPLAY_PHOTO_TITLES]);
 #line 51 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp49_[CONFIGURABLE_PROPERTY_DISPLAY_SIDEBAR] = _tmp50_;
+	_tmp58_[CONFIGURABLE_PROPERTY_DISPLAY_PHOTO_TITLES] = _tmp59_;
 #line 51 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp51_ = _tmp49_[CONFIGURABLE_PROPERTY_DISPLAY_SIDEBAR];
+	_tmp60_ = _tmp58_[CONFIGURABLE_PROPERTY_DISPLAY_PHOTO_TITLES];
 #line 52 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp52_ = self->priv->schema_names;
+	_tmp61_ = self->priv->schema_names;
 #line 52 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp52__length1 = self->priv->schema_names_length1;
+	_tmp61__length1 = self->priv->schema_names_length1;
 #line 52 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp53_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_UI_PREFS_SCHEMA_NAME);
+	_tmp62_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_UI_PREFS_SCHEMA_NAME);
 #line 52 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp52_[CONFIGURABLE_PROPERTY_DISPLAY_TOOLBAR]);
+	_g_free0 (_tmp61_[CONFIGURABLE_PROPERTY_DISPLAY_PHOTO_COMMENTS]);
 #line 52 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp52_[CONFIGURABLE_PROPERTY_DISPLAY_TOOLBAR] = _tmp53_;
+	_tmp61_[CONFIGURABLE_PROPERTY_DISPLAY_PHOTO_COMMENTS] = _tmp62_;
 #line 52 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp54_ = _tmp52_[CONFIGURABLE_PROPERTY_DISPLAY_TOOLBAR];
+	_tmp63_ = _tmp61_[CONFIGURABLE_PROPERTY_DISPLAY_PHOTO_COMMENTS];
 #line 53 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp55_ = self->priv->schema_names;
+	_tmp64_ = self->priv->schema_names;
 #line 53 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp55__length1 = self->priv->schema_names_length1;
+	_tmp64__length1 = self->priv->schema_names_length1;
 #line 53 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp56_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_UI_PREFS_SCHEMA_NAME);
+	_tmp65_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_UI_PREFS_SCHEMA_NAME);
 #line 53 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp55_[CONFIGURABLE_PROPERTY_DISPLAY_SEARCH_BAR]);
+	_g_free0 (_tmp64_[CONFIGURABLE_PROPERTY_DISPLAY_EVENT_COMMENTS]);
 #line 53 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp55_[CONFIGURABLE_PROPERTY_DISPLAY_SEARCH_BAR] = _tmp56_;
+	_tmp64_[CONFIGURABLE_PROPERTY_DISPLAY_EVENT_COMMENTS] = _tmp65_;
 #line 53 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp57_ = _tmp55_[CONFIGURABLE_PROPERTY_DISPLAY_SEARCH_BAR];
+	_tmp66_ = _tmp64_[CONFIGURABLE_PROPERTY_DISPLAY_EVENT_COMMENTS];
 #line 54 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp58_ = self->priv->schema_names;
+	_tmp67_ = self->priv->schema_names;
 #line 54 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp58__length1 = self->priv->schema_names_length1;
+	_tmp67__length1 = self->priv->schema_names_length1;
 #line 54 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp59_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_UI_PREFS_SCHEMA_NAME);
+	_tmp68_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_UI_PREFS_SCHEMA_NAME);
 #line 54 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp58_[CONFIGURABLE_PROPERTY_DISPLAY_PHOTO_RATINGS]);
+	_g_free0 (_tmp67_[CONFIGURABLE_PROPERTY_EVENT_PHOTOS_SORT_ASCENDING]);
 #line 54 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp58_[CONFIGURABLE_PROPERTY_DISPLAY_PHOTO_RATINGS] = _tmp59_;
+	_tmp67_[CONFIGURABLE_PROPERTY_EVENT_PHOTOS_SORT_ASCENDING] = _tmp68_;
 #line 54 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp60_ = _tmp58_[CONFIGURABLE_PROPERTY_DISPLAY_PHOTO_RATINGS];
+	_tmp69_ = _tmp67_[CONFIGURABLE_PROPERTY_EVENT_PHOTOS_SORT_ASCENDING];
 #line 55 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp61_ = self->priv->schema_names;
+	_tmp70_ = self->priv->schema_names;
 #line 55 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp61__length1 = self->priv->schema_names_length1;
+	_tmp70__length1 = self->priv->schema_names_length1;
 #line 55 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp62_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_UI_PREFS_SCHEMA_NAME);
+	_tmp71_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_UI_PREFS_SCHEMA_NAME);
 #line 55 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp61_[CONFIGURABLE_PROPERTY_DISPLAY_PHOTO_TAGS]);
+	_g_free0 (_tmp70_[CONFIGURABLE_PROPERTY_EVENT_PHOTOS_SORT_BY]);
 #line 55 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp61_[CONFIGURABLE_PROPERTY_DISPLAY_PHOTO_TAGS] = _tmp62_;
+	_tmp70_[CONFIGURABLE_PROPERTY_EVENT_PHOTOS_SORT_BY] = _tmp71_;
 #line 55 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp63_ = _tmp61_[CONFIGURABLE_PROPERTY_DISPLAY_PHOTO_TAGS];
+	_tmp72_ = _tmp70_[CONFIGURABLE_PROPERTY_EVENT_PHOTOS_SORT_BY];
 #line 56 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp64_ = self->priv->schema_names;
+	_tmp73_ = self->priv->schema_names;
 #line 56 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp64__length1 = self->priv->schema_names_length1;
+	_tmp73__length1 = self->priv->schema_names_length1;
 #line 56 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp65_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_UI_PREFS_SCHEMA_NAME);
+	_tmp74_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_UI_PREFS_SCHEMA_NAME);
 #line 56 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp64_[CONFIGURABLE_PROPERTY_DISPLAY_PHOTO_TITLES]);
+	_g_free0 (_tmp73_[CONFIGURABLE_PROPERTY_EVENTS_SORT_ASCENDING]);
 #line 56 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp64_[CONFIGURABLE_PROPERTY_DISPLAY_PHOTO_TITLES] = _tmp65_;
+	_tmp73_[CONFIGURABLE_PROPERTY_EVENTS_SORT_ASCENDING] = _tmp74_;
 #line 56 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp66_ = _tmp64_[CONFIGURABLE_PROPERTY_DISPLAY_PHOTO_TITLES];
+	_tmp75_ = _tmp73_[CONFIGURABLE_PROPERTY_EVENTS_SORT_ASCENDING];
 #line 57 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp67_ = self->priv->schema_names;
+	_tmp76_ = self->priv->schema_names;
 #line 57 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp67__length1 = self->priv->schema_names_length1;
+	_tmp76__length1 = self->priv->schema_names_length1;
 #line 57 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp68_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_UI_PREFS_SCHEMA_NAME);
+	_tmp77_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_EXPORT_PREFS_SCHEMA_NAME);
 #line 57 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp67_[CONFIGURABLE_PROPERTY_DISPLAY_PHOTO_COMMENTS]);
+	_g_free0 (_tmp76_[CONFIGURABLE_PROPERTY_EXPORT_CONSTRAINT]);
 #line 57 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp67_[CONFIGURABLE_PROPERTY_DISPLAY_PHOTO_COMMENTS] = _tmp68_;
+	_tmp76_[CONFIGURABLE_PROPERTY_EXPORT_CONSTRAINT] = _tmp77_;
 #line 57 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp69_ = _tmp67_[CONFIGURABLE_PROPERTY_DISPLAY_PHOTO_COMMENTS];
+	_tmp78_ = _tmp76_[CONFIGURABLE_PROPERTY_EXPORT_CONSTRAINT];
 #line 58 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp70_ = self->priv->schema_names;
+	_tmp79_ = self->priv->schema_names;
 #line 58 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp70__length1 = self->priv->schema_names_length1;
+	_tmp79__length1 = self->priv->schema_names_length1;
 #line 58 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp71_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_UI_PREFS_SCHEMA_NAME);
+	_tmp80_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_EXPORT_PREFS_SCHEMA_NAME);
 #line 58 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp70_[CONFIGURABLE_PROPERTY_DISPLAY_EVENT_COMMENTS]);
+	_g_free0 (_tmp79_[CONFIGURABLE_PROPERTY_EXPORT_EXPORT_FORMAT_MODE]);
 #line 58 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp70_[CONFIGURABLE_PROPERTY_DISPLAY_EVENT_COMMENTS] = _tmp71_;
+	_tmp79_[CONFIGURABLE_PROPERTY_EXPORT_EXPORT_FORMAT_MODE] = _tmp80_;
 #line 58 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp72_ = _tmp70_[CONFIGURABLE_PROPERTY_DISPLAY_EVENT_COMMENTS];
+	_tmp81_ = _tmp79_[CONFIGURABLE_PROPERTY_EXPORT_EXPORT_FORMAT_MODE];
 #line 59 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp73_ = self->priv->schema_names;
+	_tmp82_ = self->priv->schema_names;
 #line 59 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp73__length1 = self->priv->schema_names_length1;
+	_tmp82__length1 = self->priv->schema_names_length1;
 #line 59 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp74_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_UI_PREFS_SCHEMA_NAME);
+	_tmp83_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_EXPORT_PREFS_SCHEMA_NAME);
 #line 59 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp73_[CONFIGURABLE_PROPERTY_EVENT_PHOTOS_SORT_ASCENDING]);
+	_g_free0 (_tmp82_[CONFIGURABLE_PROPERTY_EXPORT_EXPORT_METADATA]);
 #line 59 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp73_[CONFIGURABLE_PROPERTY_EVENT_PHOTOS_SORT_ASCENDING] = _tmp74_;
+	_tmp82_[CONFIGURABLE_PROPERTY_EXPORT_EXPORT_METADATA] = _tmp83_;
 #line 59 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp75_ = _tmp73_[CONFIGURABLE_PROPERTY_EVENT_PHOTOS_SORT_ASCENDING];
+	_tmp84_ = _tmp82_[CONFIGURABLE_PROPERTY_EXPORT_EXPORT_METADATA];
 #line 60 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp76_ = self->priv->schema_names;
+	_tmp85_ = self->priv->schema_names;
 #line 60 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp76__length1 = self->priv->schema_names_length1;
+	_tmp85__length1 = self->priv->schema_names_length1;
 #line 60 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp77_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_UI_PREFS_SCHEMA_NAME);
+	_tmp86_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_EXPORT_PREFS_SCHEMA_NAME);
 #line 60 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp76_[CONFIGURABLE_PROPERTY_EVENT_PHOTOS_SORT_BY]);
+	_g_free0 (_tmp85_[CONFIGURABLE_PROPERTY_EXPORT_PHOTO_FILE_FORMAT]);
 #line 60 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp76_[CONFIGURABLE_PROPERTY_EVENT_PHOTOS_SORT_BY] = _tmp77_;
+	_tmp85_[CONFIGURABLE_PROPERTY_EXPORT_PHOTO_FILE_FORMAT] = _tmp86_;
 #line 60 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp78_ = _tmp76_[CONFIGURABLE_PROPERTY_EVENT_PHOTOS_SORT_BY];
+	_tmp87_ = _tmp85_[CONFIGURABLE_PROPERTY_EXPORT_PHOTO_FILE_FORMAT];
 #line 61 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp79_ = self->priv->schema_names;
+	_tmp88_ = self->priv->schema_names;
 #line 61 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp79__length1 = self->priv->schema_names_length1;
+	_tmp88__length1 = self->priv->schema_names_length1;
 #line 61 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp80_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_UI_PREFS_SCHEMA_NAME);
+	_tmp89_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_EXPORT_PREFS_SCHEMA_NAME);
 #line 61 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp79_[CONFIGURABLE_PROPERTY_EVENTS_SORT_ASCENDING]);
+	_g_free0 (_tmp88_[CONFIGURABLE_PROPERTY_EXPORT_QUALITY]);
 #line 61 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp79_[CONFIGURABLE_PROPERTY_EVENTS_SORT_ASCENDING] = _tmp80_;
+	_tmp88_[CONFIGURABLE_PROPERTY_EXPORT_QUALITY] = _tmp89_;
 #line 61 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp81_ = _tmp79_[CONFIGURABLE_PROPERTY_EVENTS_SORT_ASCENDING];
+	_tmp90_ = _tmp88_[CONFIGURABLE_PROPERTY_EXPORT_QUALITY];
 #line 62 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp82_ = self->priv->schema_names;
+	_tmp91_ = self->priv->schema_names;
 #line 62 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp82__length1 = self->priv->schema_names_length1;
+	_tmp91__length1 = self->priv->schema_names_length1;
 #line 62 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp83_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_EDITING_PREFS_SCHEMA_NAME);
+	_tmp92_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_EXPORT_PREFS_SCHEMA_NAME);
 #line 62 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp82_[CONFIGURABLE_PROPERTY_EXTERNAL_PHOTO_APP]);
+	_g_free0 (_tmp91_[CONFIGURABLE_PROPERTY_EXPORT_SCALE]);
 #line 62 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp82_[CONFIGURABLE_PROPERTY_EXTERNAL_PHOTO_APP] = _tmp83_;
+	_tmp91_[CONFIGURABLE_PROPERTY_EXPORT_SCALE] = _tmp92_;
 #line 62 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp84_ = _tmp82_[CONFIGURABLE_PROPERTY_EXTERNAL_PHOTO_APP];
+	_tmp93_ = _tmp91_[CONFIGURABLE_PROPERTY_EXPORT_SCALE];
 #line 63 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp85_ = self->priv->schema_names;
+	_tmp94_ = self->priv->schema_names;
 #line 63 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp85__length1 = self->priv->schema_names_length1;
+	_tmp94__length1 = self->priv->schema_names_length1;
 #line 63 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp86_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_EDITING_PREFS_SCHEMA_NAME);
+	_tmp95_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_EDITING_PREFS_SCHEMA_NAME);
 #line 63 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp85_[CONFIGURABLE_PROPERTY_EXTERNAL_RAW_APP]);
+	_g_free0 (_tmp94_[CONFIGURABLE_PROPERTY_EXTERNAL_PHOTO_APP]);
 #line 63 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp85_[CONFIGURABLE_PROPERTY_EXTERNAL_RAW_APP] = _tmp86_;
+	_tmp94_[CONFIGURABLE_PROPERTY_EXTERNAL_PHOTO_APP] = _tmp95_;
 #line 63 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp87_ = _tmp85_[CONFIGURABLE_PROPERTY_EXTERNAL_RAW_APP];
+	_tmp96_ = _tmp94_[CONFIGURABLE_PROPERTY_EXTERNAL_PHOTO_APP];
 #line 64 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp88_ = self->priv->schema_names;
+	_tmp97_ = self->priv->schema_names;
 #line 64 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp88__length1 = self->priv->schema_names_length1;
+	_tmp97__length1 = self->priv->schema_names_length1;
 #line 64 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp89_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_UI_PREFS_SCHEMA_NAME);
+	_tmp98_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_EDITING_PREFS_SCHEMA_NAME);
 #line 64 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp88_[CONFIGURABLE_PROPERTY_HIDE_PHOTOS_ALREADY_IMPORTED]);
+	_g_free0 (_tmp97_[CONFIGURABLE_PROPERTY_EXTERNAL_RAW_APP]);
 #line 64 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp88_[CONFIGURABLE_PROPERTY_HIDE_PHOTOS_ALREADY_IMPORTED] = _tmp89_;
+	_tmp97_[CONFIGURABLE_PROPERTY_EXTERNAL_RAW_APP] = _tmp98_;
 #line 64 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp90_ = _tmp88_[CONFIGURABLE_PROPERTY_HIDE_PHOTOS_ALREADY_IMPORTED];
+	_tmp99_ = _tmp97_[CONFIGURABLE_PROPERTY_EXTERNAL_RAW_APP];
 #line 65 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp91_ = self->priv->schema_names;
+	_tmp100_ = self->priv->schema_names;
 #line 65 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp91__length1 = self->priv->schema_names_length1;
+	_tmp100__length1 = self->priv->schema_names_length1;
 #line 65 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp92_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_FILES_PREFS_SCHEMA_NAME);
+	_tmp101_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_UI_PREFS_SCHEMA_NAME);
 #line 65 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp91_[CONFIGURABLE_PROPERTY_IMPORT_DIR]);
+	_g_free0 (_tmp100_[CONFIGURABLE_PROPERTY_HIDE_PHOTOS_ALREADY_IMPORTED]);
 #line 65 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp91_[CONFIGURABLE_PROPERTY_IMPORT_DIR] = _tmp92_;
+	_tmp100_[CONFIGURABLE_PROPERTY_HIDE_PHOTOS_ALREADY_IMPORTED] = _tmp101_;
 #line 65 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp93_ = _tmp91_[CONFIGURABLE_PROPERTY_IMPORT_DIR];
+	_tmp102_ = _tmp100_[CONFIGURABLE_PROPERTY_HIDE_PHOTOS_ALREADY_IMPORTED];
 #line 66 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp94_ = self->priv->schema_names;
+	_tmp103_ = self->priv->schema_names;
 #line 66 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp94__length1 = self->priv->schema_names_length1;
+	_tmp103__length1 = self->priv->schema_names_length1;
 #line 66 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp95_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_UI_PREFS_SCHEMA_NAME);
+	_tmp104_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_FILES_PREFS_SCHEMA_NAME);
 #line 66 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp94_[CONFIGURABLE_PROPERTY_KEEP_RELATIVITY]);
+	_g_free0 (_tmp103_[CONFIGURABLE_PROPERTY_IMPORT_DIR]);
 #line 66 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp94_[CONFIGURABLE_PROPERTY_KEEP_RELATIVITY] = _tmp95_;
+	_tmp103_[CONFIGURABLE_PROPERTY_IMPORT_DIR] = _tmp104_;
 #line 66 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp96_ = _tmp94_[CONFIGURABLE_PROPERTY_KEEP_RELATIVITY];
+	_tmp105_ = _tmp103_[CONFIGURABLE_PROPERTY_IMPORT_DIR];
 #line 67 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp97_ = self->priv->schema_names;
+	_tmp106_ = self->priv->schema_names;
 #line 67 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp97__length1 = self->priv->schema_names_length1;
+	_tmp106__length1 = self->priv->schema_names_length1;
 #line 67 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp98_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_CROP_SCHEMA_NAME);
+	_tmp107_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_UI_PREFS_SCHEMA_NAME);
 #line 67 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp97_[CONFIGURABLE_PROPERTY_LAST_CROP_HEIGHT]);
+	_g_free0 (_tmp106_[CONFIGURABLE_PROPERTY_KEEP_RELATIVITY]);
 #line 67 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp97_[CONFIGURABLE_PROPERTY_LAST_CROP_HEIGHT] = _tmp98_;
+	_tmp106_[CONFIGURABLE_PROPERTY_KEEP_RELATIVITY] = _tmp107_;
 #line 67 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp99_ = _tmp97_[CONFIGURABLE_PROPERTY_LAST_CROP_HEIGHT];
+	_tmp108_ = _tmp106_[CONFIGURABLE_PROPERTY_KEEP_RELATIVITY];
 #line 68 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp100_ = self->priv->schema_names;
+	_tmp109_ = self->priv->schema_names;
 #line 68 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp100__length1 = self->priv->schema_names_length1;
+	_tmp109__length1 = self->priv->schema_names_length1;
 #line 68 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp101_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_CROP_SCHEMA_NAME);
+	_tmp110_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_CROP_SCHEMA_NAME);
 #line 68 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp100_[CONFIGURABLE_PROPERTY_LAST_CROP_MENU_CHOICE]);
+	_g_free0 (_tmp109_[CONFIGURABLE_PROPERTY_LAST_CROP_HEIGHT]);
 #line 68 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp100_[CONFIGURABLE_PROPERTY_LAST_CROP_MENU_CHOICE] = _tmp101_;
+	_tmp109_[CONFIGURABLE_PROPERTY_LAST_CROP_HEIGHT] = _tmp110_;
 #line 68 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp102_ = _tmp100_[CONFIGURABLE_PROPERTY_LAST_CROP_MENU_CHOICE];
+	_tmp111_ = _tmp109_[CONFIGURABLE_PROPERTY_LAST_CROP_HEIGHT];
 #line 69 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp103_ = self->priv->schema_names;
+	_tmp112_ = self->priv->schema_names;
 #line 69 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp103__length1 = self->priv->schema_names_length1;
+	_tmp112__length1 = self->priv->schema_names_length1;
 #line 69 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp104_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_CROP_SCHEMA_NAME);
+	_tmp113_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_CROP_SCHEMA_NAME);
 #line 69 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp103_[CONFIGURABLE_PROPERTY_LAST_CROP_WIDTH]);
+	_g_free0 (_tmp112_[CONFIGURABLE_PROPERTY_LAST_CROP_MENU_CHOICE]);
 #line 69 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp103_[CONFIGURABLE_PROPERTY_LAST_CROP_WIDTH] = _tmp104_;
+	_tmp112_[CONFIGURABLE_PROPERTY_LAST_CROP_MENU_CHOICE] = _tmp113_;
 #line 69 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp105_ = _tmp103_[CONFIGURABLE_PROPERTY_LAST_CROP_WIDTH];
+	_tmp114_ = _tmp112_[CONFIGURABLE_PROPERTY_LAST_CROP_MENU_CHOICE];
 #line 70 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp106_ = self->priv->schema_names;
+	_tmp115_ = self->priv->schema_names;
 #line 70 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp106__length1 = self->priv->schema_names_length1;
+	_tmp115__length1 = self->priv->schema_names_length1;
 #line 70 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp107_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_SHARING_SCHEMA_NAME);
+	_tmp116_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_CROP_SCHEMA_NAME);
 #line 70 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp106_[CONFIGURABLE_PROPERTY_LAST_USED_SERVICE]);
+	_g_free0 (_tmp115_[CONFIGURABLE_PROPERTY_LAST_CROP_WIDTH]);
 #line 70 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp106_[CONFIGURABLE_PROPERTY_LAST_USED_SERVICE] = _tmp107_;
+	_tmp115_[CONFIGURABLE_PROPERTY_LAST_CROP_WIDTH] = _tmp116_;
 #line 70 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp108_ = _tmp106_[CONFIGURABLE_PROPERTY_LAST_USED_SERVICE];
+	_tmp117_ = _tmp115_[CONFIGURABLE_PROPERTY_LAST_CROP_WIDTH];
 #line 71 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp109_ = self->priv->schema_names;
+	_tmp118_ = self->priv->schema_names;
 #line 71 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp109__length1 = self->priv->schema_names_length1;
+	_tmp118__length1 = self->priv->schema_names_length1;
 #line 71 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp110_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_IMPORTING_SCHEMA_NAME);
+	_tmp119_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_SHARING_SCHEMA_NAME);
 #line 71 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp109_[CONFIGURABLE_PROPERTY_LAST_USED_DATAIMPORTS_SERVICE]);
+	_g_free0 (_tmp118_[CONFIGURABLE_PROPERTY_LAST_USED_SERVICE]);
 #line 71 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp109_[CONFIGURABLE_PROPERTY_LAST_USED_DATAIMPORTS_SERVICE] = _tmp110_;
+	_tmp118_[CONFIGURABLE_PROPERTY_LAST_USED_SERVICE] = _tmp119_;
 #line 71 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp111_ = _tmp109_[CONFIGURABLE_PROPERTY_LAST_USED_DATAIMPORTS_SERVICE];
+	_tmp120_ = _tmp118_[CONFIGURABLE_PROPERTY_LAST_USED_SERVICE];
 #line 72 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp112_ = self->priv->schema_names;
+	_tmp121_ = self->priv->schema_names;
 #line 72 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp112__length1 = self->priv->schema_names_length1;
+	_tmp121__length1 = self->priv->schema_names_length1;
 #line 72 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp113_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_UI_PREFS_SCHEMA_NAME);
+	_tmp122_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_IMPORTING_SCHEMA_NAME);
 #line 72 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp112_[CONFIGURABLE_PROPERTY_LIBRARY_PHOTOS_SORT_ASCENDING]);
+	_g_free0 (_tmp121_[CONFIGURABLE_PROPERTY_LAST_USED_DATAIMPORTS_SERVICE]);
 #line 72 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp112_[CONFIGURABLE_PROPERTY_LIBRARY_PHOTOS_SORT_ASCENDING] = _tmp113_;
+	_tmp121_[CONFIGURABLE_PROPERTY_LAST_USED_DATAIMPORTS_SERVICE] = _tmp122_;
 #line 72 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp114_ = _tmp112_[CONFIGURABLE_PROPERTY_LIBRARY_PHOTOS_SORT_ASCENDING];
+	_tmp123_ = _tmp121_[CONFIGURABLE_PROPERTY_LAST_USED_DATAIMPORTS_SERVICE];
 #line 73 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp115_ = self->priv->schema_names;
+	_tmp124_ = self->priv->schema_names;
 #line 73 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp115__length1 = self->priv->schema_names_length1;
+	_tmp124__length1 = self->priv->schema_names_length1;
 #line 73 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp116_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_UI_PREFS_SCHEMA_NAME);
+	_tmp125_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_UI_PREFS_SCHEMA_NAME);
 #line 73 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp115_[CONFIGURABLE_PROPERTY_LIBRARY_PHOTOS_SORT_BY]);
+	_g_free0 (_tmp124_[CONFIGURABLE_PROPERTY_LIBRARY_PHOTOS_SORT_ASCENDING]);
 #line 73 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp115_[CONFIGURABLE_PROPERTY_LIBRARY_PHOTOS_SORT_BY] = _tmp116_;
+	_tmp124_[CONFIGURABLE_PROPERTY_LIBRARY_PHOTOS_SORT_ASCENDING] = _tmp125_;
 #line 73 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp117_ = _tmp115_[CONFIGURABLE_PROPERTY_LIBRARY_PHOTOS_SORT_BY];
+	_tmp126_ = _tmp124_[CONFIGURABLE_PROPERTY_LIBRARY_PHOTOS_SORT_ASCENDING];
 #line 74 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp118_ = self->priv->schema_names;
+	_tmp127_ = self->priv->schema_names;
 #line 74 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp118__length1 = self->priv->schema_names_length1;
+	_tmp127__length1 = self->priv->schema_names_length1;
 #line 74 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp119_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_WINDOW_PREFS_SCHEMA_NAME);
+	_tmp128_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_UI_PREFS_SCHEMA_NAME);
 #line 74 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp118_[CONFIGURABLE_PROPERTY_LIBRARY_WINDOW_HEIGHT]);
+	_g_free0 (_tmp127_[CONFIGURABLE_PROPERTY_LIBRARY_PHOTOS_SORT_BY]);
 #line 74 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp118_[CONFIGURABLE_PROPERTY_LIBRARY_WINDOW_HEIGHT] = _tmp119_;
+	_tmp127_[CONFIGURABLE_PROPERTY_LIBRARY_PHOTOS_SORT_BY] = _tmp128_;
 #line 74 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp120_ = _tmp118_[CONFIGURABLE_PROPERTY_LIBRARY_WINDOW_HEIGHT];
+	_tmp129_ = _tmp127_[CONFIGURABLE_PROPERTY_LIBRARY_PHOTOS_SORT_BY];
 #line 75 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp121_ = self->priv->schema_names;
+	_tmp130_ = self->priv->schema_names;
 #line 75 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp121__length1 = self->priv->schema_names_length1;
+	_tmp130__length1 = self->priv->schema_names_length1;
 #line 75 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp122_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_WINDOW_PREFS_SCHEMA_NAME);
+	_tmp131_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_WINDOW_PREFS_SCHEMA_NAME);
 #line 75 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp121_[CONFIGURABLE_PROPERTY_LIBRARY_WINDOW_MAXIMIZE]);
+	_g_free0 (_tmp130_[CONFIGURABLE_PROPERTY_LIBRARY_WINDOW_HEIGHT]);
 #line 75 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp121_[CONFIGURABLE_PROPERTY_LIBRARY_WINDOW_MAXIMIZE] = _tmp122_;
+	_tmp130_[CONFIGURABLE_PROPERTY_LIBRARY_WINDOW_HEIGHT] = _tmp131_;
 #line 75 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp123_ = _tmp121_[CONFIGURABLE_PROPERTY_LIBRARY_WINDOW_MAXIMIZE];
+	_tmp132_ = _tmp130_[CONFIGURABLE_PROPERTY_LIBRARY_WINDOW_HEIGHT];
 #line 76 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp124_ = self->priv->schema_names;
+	_tmp133_ = self->priv->schema_names;
 #line 76 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp124__length1 = self->priv->schema_names_length1;
+	_tmp133__length1 = self->priv->schema_names_length1;
 #line 76 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp125_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_WINDOW_PREFS_SCHEMA_NAME);
+	_tmp134_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_WINDOW_PREFS_SCHEMA_NAME);
 #line 76 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp124_[CONFIGURABLE_PROPERTY_LIBRARY_WINDOW_WIDTH]);
+	_g_free0 (_tmp133_[CONFIGURABLE_PROPERTY_LIBRARY_WINDOW_MAXIMIZE]);
 #line 76 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp124_[CONFIGURABLE_PROPERTY_LIBRARY_WINDOW_WIDTH] = _tmp125_;
+	_tmp133_[CONFIGURABLE_PROPERTY_LIBRARY_WINDOW_MAXIMIZE] = _tmp134_;
 #line 76 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp126_ = _tmp124_[CONFIGURABLE_PROPERTY_LIBRARY_WINDOW_WIDTH];
+	_tmp135_ = _tmp133_[CONFIGURABLE_PROPERTY_LIBRARY_WINDOW_MAXIMIZE];
 #line 77 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp127_ = self->priv->schema_names;
+	_tmp136_ = self->priv->schema_names;
 #line 77 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp127__length1 = self->priv->schema_names_length1;
+	_tmp136__length1 = self->priv->schema_names_length1;
 #line 77 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp128_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_UI_PREFS_SCHEMA_NAME);
+	_tmp137_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_WINDOW_PREFS_SCHEMA_NAME);
 #line 77 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp127_[CONFIGURABLE_PROPERTY_MODIFY_ORIGINALS]);
+	_g_free0 (_tmp136_[CONFIGURABLE_PROPERTY_LIBRARY_WINDOW_WIDTH]);
 #line 77 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp127_[CONFIGURABLE_PROPERTY_MODIFY_ORIGINALS] = _tmp128_;
+	_tmp136_[CONFIGURABLE_PROPERTY_LIBRARY_WINDOW_WIDTH] = _tmp137_;
 #line 77 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp129_ = _tmp127_[CONFIGURABLE_PROPERTY_MODIFY_ORIGINALS];
+	_tmp138_ = _tmp136_[CONFIGURABLE_PROPERTY_LIBRARY_WINDOW_WIDTH];
 #line 78 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp130_ = self->priv->schema_names;
+	_tmp139_ = self->priv->schema_names;
 #line 78 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp130__length1 = self->priv->schema_names_length1;
+	_tmp139__length1 = self->priv->schema_names_length1;
 #line 78 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp131_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_UI_PREFS_SCHEMA_NAME);
+	_tmp140_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_UI_PREFS_SCHEMA_NAME);
 #line 78 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp130_[CONFIGURABLE_PROPERTY_PHOTO_THUMBNAIL_SCALE]);
+	_g_free0 (_tmp139_[CONFIGURABLE_PROPERTY_MODIFY_ORIGINALS]);
 #line 78 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp130_[CONFIGURABLE_PROPERTY_PHOTO_THUMBNAIL_SCALE] = _tmp131_;
+	_tmp139_[CONFIGURABLE_PROPERTY_MODIFY_ORIGINALS] = _tmp140_;
 #line 78 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp132_ = _tmp130_[CONFIGURABLE_PROPERTY_PHOTO_THUMBNAIL_SCALE];
+	_tmp141_ = _tmp139_[CONFIGURABLE_PROPERTY_MODIFY_ORIGINALS];
 #line 79 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp133_ = self->priv->schema_names;
+	_tmp142_ = self->priv->schema_names;
 #line 79 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp133__length1 = self->priv->schema_names_length1;
+	_tmp142__length1 = self->priv->schema_names_length1;
 #line 79 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp134_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_UI_PREFS_SCHEMA_NAME);
+	_tmp143_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_UI_PREFS_SCHEMA_NAME);
 #line 79 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp133_[CONFIGURABLE_PROPERTY_PIN_TOOLBAR_STATE]);
+	_g_free0 (_tmp142_[CONFIGURABLE_PROPERTY_PHOTO_THUMBNAIL_SCALE]);
 #line 79 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp133_[CONFIGURABLE_PROPERTY_PIN_TOOLBAR_STATE] = _tmp134_;
+	_tmp142_[CONFIGURABLE_PROPERTY_PHOTO_THUMBNAIL_SCALE] = _tmp143_;
 #line 79 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp135_ = _tmp133_[CONFIGURABLE_PROPERTY_PIN_TOOLBAR_STATE];
+	_tmp144_ = _tmp142_[CONFIGURABLE_PROPERTY_PHOTO_THUMBNAIL_SCALE];
 #line 80 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp136_ = self->priv->schema_names;
+	_tmp145_ = self->priv->schema_names;
 #line 80 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp136__length1 = self->priv->schema_names_length1;
+	_tmp145__length1 = self->priv->schema_names_length1;
 #line 80 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp137_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_PRINTING_SCHEMA_NAME);
+	_tmp146_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_UI_PREFS_SCHEMA_NAME);
 #line 80 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp136_[CONFIGURABLE_PROPERTY_PRINTING_CONTENT_HEIGHT]);
+	_g_free0 (_tmp145_[CONFIGURABLE_PROPERTY_PIN_TOOLBAR_STATE]);
 #line 80 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp136_[CONFIGURABLE_PROPERTY_PRINTING_CONTENT_HEIGHT] = _tmp137_;
+	_tmp145_[CONFIGURABLE_PROPERTY_PIN_TOOLBAR_STATE] = _tmp146_;
 #line 80 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp138_ = _tmp136_[CONFIGURABLE_PROPERTY_PRINTING_CONTENT_HEIGHT];
+	_tmp147_ = _tmp145_[CONFIGURABLE_PROPERTY_PIN_TOOLBAR_STATE];
 #line 81 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp139_ = self->priv->schema_names;
+	_tmp148_ = self->priv->schema_names;
 #line 81 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp139__length1 = self->priv->schema_names_length1;
+	_tmp148__length1 = self->priv->schema_names_length1;
 #line 81 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp140_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_PRINTING_SCHEMA_NAME);
+	_tmp149_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_PRINTING_SCHEMA_NAME);
 #line 81 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp139_[CONFIGURABLE_PROPERTY_PRINTING_CONTENT_LAYOUT]);
+	_g_free0 (_tmp148_[CONFIGURABLE_PROPERTY_PRINTING_CONTENT_HEIGHT]);
 #line 81 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp139_[CONFIGURABLE_PROPERTY_PRINTING_CONTENT_LAYOUT] = _tmp140_;
+	_tmp148_[CONFIGURABLE_PROPERTY_PRINTING_CONTENT_HEIGHT] = _tmp149_;
 #line 81 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp141_ = _tmp139_[CONFIGURABLE_PROPERTY_PRINTING_CONTENT_LAYOUT];
+	_tmp150_ = _tmp148_[CONFIGURABLE_PROPERTY_PRINTING_CONTENT_HEIGHT];
 #line 82 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp142_ = self->priv->schema_names;
+	_tmp151_ = self->priv->schema_names;
 #line 82 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp142__length1 = self->priv->schema_names_length1;
+	_tmp151__length1 = self->priv->schema_names_length1;
 #line 82 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp143_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_PRINTING_SCHEMA_NAME);
+	_tmp152_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_PRINTING_SCHEMA_NAME);
 #line 82 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp142_[CONFIGURABLE_PROPERTY_PRINTING_CONTENT_PPI]);
+	_g_free0 (_tmp151_[CONFIGURABLE_PROPERTY_PRINTING_CONTENT_LAYOUT]);
 #line 82 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp142_[CONFIGURABLE_PROPERTY_PRINTING_CONTENT_PPI] = _tmp143_;
+	_tmp151_[CONFIGURABLE_PROPERTY_PRINTING_CONTENT_LAYOUT] = _tmp152_;
 #line 82 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp144_ = _tmp142_[CONFIGURABLE_PROPERTY_PRINTING_CONTENT_PPI];
+	_tmp153_ = _tmp151_[CONFIGURABLE_PROPERTY_PRINTING_CONTENT_LAYOUT];
 #line 83 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp145_ = self->priv->schema_names;
+	_tmp154_ = self->priv->schema_names;
 #line 83 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp145__length1 = self->priv->schema_names_length1;
+	_tmp154__length1 = self->priv->schema_names_length1;
 #line 83 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp146_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_PRINTING_SCHEMA_NAME);
+	_tmp155_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_PRINTING_SCHEMA_NAME);
 #line 83 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp145_[CONFIGURABLE_PROPERTY_PRINTING_CONTENT_UNITS]);
+	_g_free0 (_tmp154_[CONFIGURABLE_PROPERTY_PRINTING_CONTENT_PPI]);
 #line 83 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp145_[CONFIGURABLE_PROPERTY_PRINTING_CONTENT_UNITS] = _tmp146_;
+	_tmp154_[CONFIGURABLE_PROPERTY_PRINTING_CONTENT_PPI] = _tmp155_;
 #line 83 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp147_ = _tmp145_[CONFIGURABLE_PROPERTY_PRINTING_CONTENT_UNITS];
+	_tmp156_ = _tmp154_[CONFIGURABLE_PROPERTY_PRINTING_CONTENT_PPI];
 #line 84 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp148_ = self->priv->schema_names;
+	_tmp157_ = self->priv->schema_names;
 #line 84 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp148__length1 = self->priv->schema_names_length1;
+	_tmp157__length1 = self->priv->schema_names_length1;
 #line 84 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp149_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_PRINTING_SCHEMA_NAME);
+	_tmp158_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_PRINTING_SCHEMA_NAME);
 #line 84 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp148_[CONFIGURABLE_PROPERTY_PRINTING_CONTENT_WIDTH]);
+	_g_free0 (_tmp157_[CONFIGURABLE_PROPERTY_PRINTING_CONTENT_UNITS]);
 #line 84 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp148_[CONFIGURABLE_PROPERTY_PRINTING_CONTENT_WIDTH] = _tmp149_;
+	_tmp157_[CONFIGURABLE_PROPERTY_PRINTING_CONTENT_UNITS] = _tmp158_;
 #line 84 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp150_ = _tmp148_[CONFIGURABLE_PROPERTY_PRINTING_CONTENT_WIDTH];
+	_tmp159_ = _tmp157_[CONFIGURABLE_PROPERTY_PRINTING_CONTENT_UNITS];
 #line 85 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp151_ = self->priv->schema_names;
+	_tmp160_ = self->priv->schema_names;
 #line 85 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp151__length1 = self->priv->schema_names_length1;
+	_tmp160__length1 = self->priv->schema_names_length1;
 #line 85 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp152_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_PRINTING_SCHEMA_NAME);
+	_tmp161_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_PRINTING_SCHEMA_NAME);
 #line 85 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp151_[CONFIGURABLE_PROPERTY_PRINTING_IMAGES_PER_PAGE]);
+	_g_free0 (_tmp160_[CONFIGURABLE_PROPERTY_PRINTING_CONTENT_WIDTH]);
 #line 85 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp151_[CONFIGURABLE_PROPERTY_PRINTING_IMAGES_PER_PAGE] = _tmp152_;
+	_tmp160_[CONFIGURABLE_PROPERTY_PRINTING_CONTENT_WIDTH] = _tmp161_;
 #line 85 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp153_ = _tmp151_[CONFIGURABLE_PROPERTY_PRINTING_IMAGES_PER_PAGE];
+	_tmp162_ = _tmp160_[CONFIGURABLE_PROPERTY_PRINTING_CONTENT_WIDTH];
 #line 86 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp154_ = self->priv->schema_names;
+	_tmp163_ = self->priv->schema_names;
 #line 86 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp154__length1 = self->priv->schema_names_length1;
+	_tmp163__length1 = self->priv->schema_names_length1;
 #line 86 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp155_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_PRINTING_SCHEMA_NAME);
+	_tmp164_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_PRINTING_SCHEMA_NAME);
 #line 86 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp154_[CONFIGURABLE_PROPERTY_PRINTING_MATCH_ASPECT_RATIO]);
+	_g_free0 (_tmp163_[CONFIGURABLE_PROPERTY_PRINTING_IMAGES_PER_PAGE]);
 #line 86 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp154_[CONFIGURABLE_PROPERTY_PRINTING_MATCH_ASPECT_RATIO] = _tmp155_;
+	_tmp163_[CONFIGURABLE_PROPERTY_PRINTING_IMAGES_PER_PAGE] = _tmp164_;
 #line 86 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp156_ = _tmp154_[CONFIGURABLE_PROPERTY_PRINTING_MATCH_ASPECT_RATIO];
+	_tmp165_ = _tmp163_[CONFIGURABLE_PROPERTY_PRINTING_IMAGES_PER_PAGE];
 #line 87 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp157_ = self->priv->schema_names;
+	_tmp166_ = self->priv->schema_names;
 #line 87 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp157__length1 = self->priv->schema_names_length1;
+	_tmp166__length1 = self->priv->schema_names_length1;
 #line 87 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp158_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_PRINTING_SCHEMA_NAME);
+	_tmp167_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_PRINTING_SCHEMA_NAME);
 #line 87 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp157_[CONFIGURABLE_PROPERTY_PRINTING_PRINT_TITLES]);
+	_g_free0 (_tmp166_[CONFIGURABLE_PROPERTY_PRINTING_MATCH_ASPECT_RATIO]);
 #line 87 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp157_[CONFIGURABLE_PROPERTY_PRINTING_PRINT_TITLES] = _tmp158_;
+	_tmp166_[CONFIGURABLE_PROPERTY_PRINTING_MATCH_ASPECT_RATIO] = _tmp167_;
 #line 87 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp159_ = _tmp157_[CONFIGURABLE_PROPERTY_PRINTING_PRINT_TITLES];
+	_tmp168_ = _tmp166_[CONFIGURABLE_PROPERTY_PRINTING_MATCH_ASPECT_RATIO];
 #line 88 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp160_ = self->priv->schema_names;
+	_tmp169_ = self->priv->schema_names;
 #line 88 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp160__length1 = self->priv->schema_names_length1;
+	_tmp169__length1 = self->priv->schema_names_length1;
 #line 88 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp161_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_PRINTING_SCHEMA_NAME);
+	_tmp170_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_PRINTING_SCHEMA_NAME);
 #line 88 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp160_[CONFIGURABLE_PROPERTY_PRINTING_SIZE_SELECTION]);
+	_g_free0 (_tmp169_[CONFIGURABLE_PROPERTY_PRINTING_PRINT_TITLES]);
 #line 88 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp160_[CONFIGURABLE_PROPERTY_PRINTING_SIZE_SELECTION] = _tmp161_;
+	_tmp169_[CONFIGURABLE_PROPERTY_PRINTING_PRINT_TITLES] = _tmp170_;
 #line 88 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp162_ = _tmp160_[CONFIGURABLE_PROPERTY_PRINTING_SIZE_SELECTION];
+	_tmp171_ = _tmp169_[CONFIGURABLE_PROPERTY_PRINTING_PRINT_TITLES];
 #line 89 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp163_ = self->priv->schema_names;
+	_tmp172_ = self->priv->schema_names;
 #line 89 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp163__length1 = self->priv->schema_names_length1;
+	_tmp172__length1 = self->priv->schema_names_length1;
 #line 89 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp164_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_PRINTING_SCHEMA_NAME);
+	_tmp173_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_PRINTING_SCHEMA_NAME);
 #line 89 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp163_[CONFIGURABLE_PROPERTY_PRINTING_TITLES_FONT]);
+	_g_free0 (_tmp172_[CONFIGURABLE_PROPERTY_PRINTING_SIZE_SELECTION]);
 #line 89 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp163_[CONFIGURABLE_PROPERTY_PRINTING_TITLES_FONT] = _tmp164_;
+	_tmp172_[CONFIGURABLE_PROPERTY_PRINTING_SIZE_SELECTION] = _tmp173_;
 #line 89 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp165_ = _tmp163_[CONFIGURABLE_PROPERTY_PRINTING_TITLES_FONT];
+	_tmp174_ = _tmp172_[CONFIGURABLE_PROPERTY_PRINTING_SIZE_SELECTION];
 #line 90 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp166_ = self->priv->schema_names;
+	_tmp175_ = self->priv->schema_names;
 #line 90 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp166__length1 = self->priv->schema_names_length1;
+	_tmp175__length1 = self->priv->schema_names_length1;
 #line 90 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp167_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_FILES_PREFS_SCHEMA_NAME);
+	_tmp176_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_PRINTING_SCHEMA_NAME);
 #line 90 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp166_[CONFIGURABLE_PROPERTY_RAW_DEVELOPER_DEFAULT]);
+	_g_free0 (_tmp175_[CONFIGURABLE_PROPERTY_PRINTING_TITLES_FONT]);
 #line 90 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp166_[CONFIGURABLE_PROPERTY_RAW_DEVELOPER_DEFAULT] = _tmp167_;
+	_tmp175_[CONFIGURABLE_PROPERTY_PRINTING_TITLES_FONT] = _tmp176_;
 #line 90 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp168_ = _tmp166_[CONFIGURABLE_PROPERTY_RAW_DEVELOPER_DEFAULT];
+	_tmp177_ = _tmp175_[CONFIGURABLE_PROPERTY_PRINTING_TITLES_FONT];
 #line 91 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp169_ = self->priv->schema_names;
+	_tmp178_ = self->priv->schema_names;
 #line 91 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp169__length1 = self->priv->schema_names_length1;
+	_tmp178__length1 = self->priv->schema_names_length1;
 #line 91 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp170_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_UI_PREFS_SCHEMA_NAME);
+	_tmp179_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_FILES_PREFS_SCHEMA_NAME);
 #line 91 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp169_[CONFIGURABLE_PROPERTY_SHOW_WELCOME_DIALOG]);
+	_g_free0 (_tmp178_[CONFIGURABLE_PROPERTY_RAW_DEVELOPER_DEFAULT]);
 #line 91 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp169_[CONFIGURABLE_PROPERTY_SHOW_WELCOME_DIALOG] = _tmp170_;
+	_tmp178_[CONFIGURABLE_PROPERTY_RAW_DEVELOPER_DEFAULT] = _tmp179_;
 #line 91 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp171_ = _tmp169_[CONFIGURABLE_PROPERTY_SHOW_WELCOME_DIALOG];
+	_tmp180_ = _tmp178_[CONFIGURABLE_PROPERTY_RAW_DEVELOPER_DEFAULT];
 #line 92 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp172_ = self->priv->schema_names;
+	_tmp181_ = self->priv->schema_names;
 #line 92 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp172__length1 = self->priv->schema_names_length1;
+	_tmp181__length1 = self->priv->schema_names_length1;
 #line 92 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp173_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_UI_PREFS_SCHEMA_NAME);
+	_tmp182_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_UI_PREFS_SCHEMA_NAME);
 #line 92 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp172_[CONFIGURABLE_PROPERTY_SIDEBAR_POSITION]);
+	_g_free0 (_tmp181_[CONFIGURABLE_PROPERTY_SHOW_WELCOME_DIALOG]);
 #line 92 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp172_[CONFIGURABLE_PROPERTY_SIDEBAR_POSITION] = _tmp173_;
+	_tmp181_[CONFIGURABLE_PROPERTY_SHOW_WELCOME_DIALOG] = _tmp182_;
 #line 92 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp174_ = _tmp172_[CONFIGURABLE_PROPERTY_SIDEBAR_POSITION];
+	_tmp183_ = _tmp181_[CONFIGURABLE_PROPERTY_SHOW_WELCOME_DIALOG];
 #line 93 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp175_ = self->priv->schema_names;
+	_tmp184_ = self->priv->schema_names;
 #line 93 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp175__length1 = self->priv->schema_names_length1;
+	_tmp184__length1 = self->priv->schema_names_length1;
 #line 93 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp176_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_SLIDESHOW_PREFS_SCHEMA_NAME);
+	_tmp185_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_UI_PREFS_SCHEMA_NAME);
 #line 93 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp175_[CONFIGURABLE_PROPERTY_SLIDESHOW_DELAY]);
+	_g_free0 (_tmp184_[CONFIGURABLE_PROPERTY_SIDEBAR_POSITION]);
 #line 93 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp175_[CONFIGURABLE_PROPERTY_SLIDESHOW_DELAY] = _tmp176_;
+	_tmp184_[CONFIGURABLE_PROPERTY_SIDEBAR_POSITION] = _tmp185_;
 #line 93 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp177_ = _tmp175_[CONFIGURABLE_PROPERTY_SLIDESHOW_DELAY];
+	_tmp186_ = _tmp184_[CONFIGURABLE_PROPERTY_SIDEBAR_POSITION];
 #line 94 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp178_ = self->priv->schema_names;
+	_tmp187_ = self->priv->schema_names;
 #line 94 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp178__length1 = self->priv->schema_names_length1;
+	_tmp187__length1 = self->priv->schema_names_length1;
 #line 94 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp179_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_SLIDESHOW_PREFS_SCHEMA_NAME);
+	_tmp188_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_SLIDESHOW_PREFS_SCHEMA_NAME);
 #line 94 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp178_[CONFIGURABLE_PROPERTY_SLIDESHOW_TRANSITION_DELAY]);
+	_g_free0 (_tmp187_[CONFIGURABLE_PROPERTY_SLIDESHOW_DELAY]);
 #line 94 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp178_[CONFIGURABLE_PROPERTY_SLIDESHOW_TRANSITION_DELAY] = _tmp179_;
+	_tmp187_[CONFIGURABLE_PROPERTY_SLIDESHOW_DELAY] = _tmp188_;
 #line 94 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp180_ = _tmp178_[CONFIGURABLE_PROPERTY_SLIDESHOW_TRANSITION_DELAY];
+	_tmp189_ = _tmp187_[CONFIGURABLE_PROPERTY_SLIDESHOW_DELAY];
 #line 95 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp181_ = self->priv->schema_names;
+	_tmp190_ = self->priv->schema_names;
 #line 95 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp181__length1 = self->priv->schema_names_length1;
+	_tmp190__length1 = self->priv->schema_names_length1;
 #line 95 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp182_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_SLIDESHOW_PREFS_SCHEMA_NAME);
+	_tmp191_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_SLIDESHOW_PREFS_SCHEMA_NAME);
 #line 95 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp181_[CONFIGURABLE_PROPERTY_SLIDESHOW_TRANSITION_EFFECT_ID]);
+	_g_free0 (_tmp190_[CONFIGURABLE_PROPERTY_SLIDESHOW_TRANSITION_DELAY]);
 #line 95 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp181_[CONFIGURABLE_PROPERTY_SLIDESHOW_TRANSITION_EFFECT_ID] = _tmp182_;
+	_tmp190_[CONFIGURABLE_PROPERTY_SLIDESHOW_TRANSITION_DELAY] = _tmp191_;
 #line 95 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp183_ = _tmp181_[CONFIGURABLE_PROPERTY_SLIDESHOW_TRANSITION_EFFECT_ID];
+	_tmp192_ = _tmp190_[CONFIGURABLE_PROPERTY_SLIDESHOW_TRANSITION_DELAY];
 #line 96 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp184_ = self->priv->schema_names;
+	_tmp193_ = self->priv->schema_names;
 #line 96 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp184__length1 = self->priv->schema_names_length1;
+	_tmp193__length1 = self->priv->schema_names_length1;
 #line 96 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp185_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_SLIDESHOW_PREFS_SCHEMA_NAME);
+	_tmp194_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_SLIDESHOW_PREFS_SCHEMA_NAME);
 #line 96 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp184_[CONFIGURABLE_PROPERTY_SLIDESHOW_SHOW_TITLE]);
+	_g_free0 (_tmp193_[CONFIGURABLE_PROPERTY_SLIDESHOW_TRANSITION_EFFECT_ID]);
 #line 96 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp184_[CONFIGURABLE_PROPERTY_SLIDESHOW_SHOW_TITLE] = _tmp185_;
+	_tmp193_[CONFIGURABLE_PROPERTY_SLIDESHOW_TRANSITION_EFFECT_ID] = _tmp194_;
 #line 96 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp186_ = _tmp184_[CONFIGURABLE_PROPERTY_SLIDESHOW_SHOW_TITLE];
+	_tmp195_ = _tmp193_[CONFIGURABLE_PROPERTY_SLIDESHOW_TRANSITION_EFFECT_ID];
 #line 97 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp187_ = self->priv->schema_names;
+	_tmp196_ = self->priv->schema_names;
 #line 97 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp187__length1 = self->priv->schema_names_length1;
+	_tmp196__length1 = self->priv->schema_names_length1;
 #line 97 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp188_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_UI_PREFS_SCHEMA_NAME);
+	_tmp197_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_SLIDESHOW_PREFS_SCHEMA_NAME);
 #line 97 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp187_[CONFIGURABLE_PROPERTY_USE_24_HOUR_TIME]);
+	_g_free0 (_tmp196_[CONFIGURABLE_PROPERTY_SLIDESHOW_SHOW_TITLE]);
 #line 97 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp187_[CONFIGURABLE_PROPERTY_USE_24_HOUR_TIME] = _tmp188_;
+	_tmp196_[CONFIGURABLE_PROPERTY_SLIDESHOW_SHOW_TITLE] = _tmp197_;
 #line 97 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp189_ = _tmp187_[CONFIGURABLE_PROPERTY_USE_24_HOUR_TIME];
+	_tmp198_ = _tmp196_[CONFIGURABLE_PROPERTY_SLIDESHOW_SHOW_TITLE];
 #line 98 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp190_ = self->priv->schema_names;
+	_tmp199_ = self->priv->schema_names;
 #line 98 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp190__length1 = self->priv->schema_names_length1;
+	_tmp199__length1 = self->priv->schema_names_length1;
 #line 98 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp191_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_FILES_PREFS_SCHEMA_NAME);
+	_tmp200_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_UI_PREFS_SCHEMA_NAME);
 #line 98 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp190_[CONFIGURABLE_PROPERTY_USE_LOWERCASE_FILENAMES]);
+	_g_free0 (_tmp199_[CONFIGURABLE_PROPERTY_USE_24_HOUR_TIME]);
 #line 98 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp190_[CONFIGURABLE_PROPERTY_USE_LOWERCASE_FILENAMES] = _tmp191_;
+	_tmp199_[CONFIGURABLE_PROPERTY_USE_24_HOUR_TIME] = _tmp200_;
 #line 98 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp192_ = _tmp190_[CONFIGURABLE_PROPERTY_USE_LOWERCASE_FILENAMES];
+	_tmp201_ = _tmp199_[CONFIGURABLE_PROPERTY_USE_24_HOUR_TIME];
 #line 99 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp193_ = self->priv->schema_names;
+	_tmp202_ = self->priv->schema_names;
 #line 99 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp193__length1 = self->priv->schema_names_length1;
+	_tmp202__length1 = self->priv->schema_names_length1;
 #line 99 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp194_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_VIDEO_SCHEMA_NAME);
+	_tmp203_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_FILES_PREFS_SCHEMA_NAME);
 #line 99 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp193_[CONFIGURABLE_PROPERTY_VIDEO_INTERPRETER_STATE_COOKIE]);
+	_g_free0 (_tmp202_[CONFIGURABLE_PROPERTY_USE_LOWERCASE_FILENAMES]);
 #line 99 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp193_[CONFIGURABLE_PROPERTY_VIDEO_INTERPRETER_STATE_COOKIE] = _tmp194_;
+	_tmp202_[CONFIGURABLE_PROPERTY_USE_LOWERCASE_FILENAMES] = _tmp203_;
 #line 99 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp195_ = _tmp193_[CONFIGURABLE_PROPERTY_VIDEO_INTERPRETER_STATE_COOKIE];
-#line 101 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp196_ = g_new0 (gchar*, CONFIGURABLE_PROPERTY_NUM_PROPERTIES + 1);
-#line 101 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+	_tmp204_ = _tmp202_[CONFIGURABLE_PROPERTY_USE_LOWERCASE_FILENAMES];
+#line 100 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+	_tmp205_ = self->priv->schema_names;
+#line 100 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+	_tmp205__length1 = self->priv->schema_names_length1;
+#line 100 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+	_tmp206_ = g_strdup (GSETTINGS_CONFIGURATION_ENGINE_VIDEO_SCHEMA_NAME);
+#line 100 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+	_g_free0 (_tmp205_[CONFIGURABLE_PROPERTY_VIDEO_INTERPRETER_STATE_COOKIE]);
+#line 100 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+	_tmp205_[CONFIGURABLE_PROPERTY_VIDEO_INTERPRETER_STATE_COOKIE] = _tmp206_;
+#line 100 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+	_tmp207_ = _tmp205_[CONFIGURABLE_PROPERTY_VIDEO_INTERPRETER_STATE_COOKIE];
+#line 102 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+	_tmp208_ = g_new0 (gchar*, CONFIGURABLE_PROPERTY_NUM_PROPERTIES + 1);
+#line 102 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	self->priv->key_names = (_vala_array_free (self->priv->key_names, self->priv->key_names_length1, (GDestroyNotify) g_free), NULL);
-#line 101 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	self->priv->key_names = _tmp196_;
-#line 101 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 102 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+	self->priv->key_names = _tmp208_;
+#line 102 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	self->priv->key_names_length1 = CONFIGURABLE_PROPERTY_NUM_PROPERTIES;
-#line 101 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 102 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	self->priv->_key_names_size_ = self->priv->key_names_length1;
-#line 103 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp197_ = self->priv->key_names;
-#line 103 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp197__length1 = self->priv->key_names_length1;
-#line 103 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp198_ = g_strdup ("auto-import");
-#line 103 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp197_[CONFIGURABLE_PROPERTY_AUTO_IMPORT_FROM_LIBRARY]);
-#line 103 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp197_[CONFIGURABLE_PROPERTY_AUTO_IMPORT_FROM_LIBRARY] = _tmp198_;
-#line 103 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp199_ = _tmp197_[CONFIGURABLE_PROPERTY_AUTO_IMPORT_FROM_LIBRARY];
 #line 104 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp200_ = self->priv->key_names;
+	_tmp209_ = self->priv->key_names;
 #line 104 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp200__length1 = self->priv->key_names_length1;
+	_tmp209__length1 = self->priv->key_names_length1;
 #line 104 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp201_ = g_strdup ("background-color");
+	_tmp210_ = g_strdup ("auto-import");
 #line 104 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp200_[CONFIGURABLE_PROPERTY_BG_COLOR_NAME]);
+	_g_free0 (_tmp209_[CONFIGURABLE_PROPERTY_AUTO_IMPORT_FROM_LIBRARY]);
 #line 104 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp200_[CONFIGURABLE_PROPERTY_BG_COLOR_NAME] = _tmp201_;
+	_tmp209_[CONFIGURABLE_PROPERTY_AUTO_IMPORT_FROM_LIBRARY] = _tmp210_;
 #line 104 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp202_ = _tmp200_[CONFIGURABLE_PROPERTY_BG_COLOR_NAME];
+	_tmp211_ = _tmp209_[CONFIGURABLE_PROPERTY_AUTO_IMPORT_FROM_LIBRARY];
 #line 105 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp203_ = self->priv->key_names;
+	_tmp212_ = self->priv->key_names;
 #line 105 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp203__length1 = self->priv->key_names_length1;
+	_tmp212__length1 = self->priv->key_names_length1;
 #line 105 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp204_ = g_strdup ("commit-metadata");
+	_tmp213_ = g_strdup ("background-color");
 #line 105 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp203_[CONFIGURABLE_PROPERTY_COMMIT_METADATA_TO_MASTERS]);
+	_g_free0 (_tmp212_[CONFIGURABLE_PROPERTY_BG_COLOR_NAME]);
 #line 105 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp203_[CONFIGURABLE_PROPERTY_COMMIT_METADATA_TO_MASTERS] = _tmp204_;
+	_tmp212_[CONFIGURABLE_PROPERTY_BG_COLOR_NAME] = _tmp213_;
 #line 105 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp205_ = _tmp203_[CONFIGURABLE_PROPERTY_COMMIT_METADATA_TO_MASTERS];
+	_tmp214_ = _tmp212_[CONFIGURABLE_PROPERTY_BG_COLOR_NAME];
 #line 106 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp206_ = self->priv->key_names;
+	_tmp215_ = self->priv->key_names;
 #line 106 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp206__length1 = self->priv->key_names_length1;
+	_tmp215__length1 = self->priv->key_names_length1;
 #line 106 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp207_ = g_strdup ("picture-uri");
+	_tmp216_ = g_strdup ("commit-metadata");
 #line 106 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp206_[CONFIGURABLE_PROPERTY_DESKTOP_BACKGROUND_FILE]);
+	_g_free0 (_tmp215_[CONFIGURABLE_PROPERTY_COMMIT_METADATA_TO_MASTERS]);
 #line 106 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp206_[CONFIGURABLE_PROPERTY_DESKTOP_BACKGROUND_FILE] = _tmp207_;
+	_tmp215_[CONFIGURABLE_PROPERTY_COMMIT_METADATA_TO_MASTERS] = _tmp216_;
 #line 106 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp208_ = _tmp206_[CONFIGURABLE_PROPERTY_DESKTOP_BACKGROUND_FILE];
+	_tmp217_ = _tmp215_[CONFIGURABLE_PROPERTY_COMMIT_METADATA_TO_MASTERS];
 #line 107 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp209_ = self->priv->key_names;
+	_tmp218_ = self->priv->key_names;
 #line 107 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp209__length1 = self->priv->key_names_length1;
+	_tmp218__length1 = self->priv->key_names_length1;
 #line 107 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp210_ = g_strdup ("picture-options");
+	_tmp219_ = g_strdup ("picture-uri");
 #line 107 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp209_[CONFIGURABLE_PROPERTY_DESKTOP_BACKGROUND_MODE]);
+	_g_free0 (_tmp218_[CONFIGURABLE_PROPERTY_DESKTOP_BACKGROUND_FILE]);
 #line 107 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp209_[CONFIGURABLE_PROPERTY_DESKTOP_BACKGROUND_MODE] = _tmp210_;
+	_tmp218_[CONFIGURABLE_PROPERTY_DESKTOP_BACKGROUND_FILE] = _tmp219_;
 #line 107 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp211_ = _tmp209_[CONFIGURABLE_PROPERTY_DESKTOP_BACKGROUND_MODE];
+	_tmp220_ = _tmp218_[CONFIGURABLE_PROPERTY_DESKTOP_BACKGROUND_FILE];
 #line 108 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp212_ = self->priv->key_names;
+	_tmp221_ = self->priv->key_names;
 #line 108 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp212__length1 = self->priv->key_names_length1;
+	_tmp221__length1 = self->priv->key_names_length1;
 #line 108 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp213_ = g_strdup ("picture-uri");
+	_tmp222_ = g_strdup ("picture-options");
 #line 108 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp212_[CONFIGURABLE_PROPERTY_SCREENSAVER_FILE]);
+	_g_free0 (_tmp221_[CONFIGURABLE_PROPERTY_DESKTOP_BACKGROUND_MODE]);
 #line 108 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp212_[CONFIGURABLE_PROPERTY_SCREENSAVER_FILE] = _tmp213_;
+	_tmp221_[CONFIGURABLE_PROPERTY_DESKTOP_BACKGROUND_MODE] = _tmp222_;
 #line 108 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp214_ = _tmp212_[CONFIGURABLE_PROPERTY_SCREENSAVER_FILE];
+	_tmp223_ = _tmp221_[CONFIGURABLE_PROPERTY_DESKTOP_BACKGROUND_MODE];
 #line 109 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp215_ = self->priv->key_names;
+	_tmp224_ = self->priv->key_names;
 #line 109 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp215__length1 = self->priv->key_names_length1;
+	_tmp224__length1 = self->priv->key_names_length1;
 #line 109 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp216_ = g_strdup ("picture-options");
+	_tmp225_ = g_strdup ("picture-uri");
 #line 109 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp215_[CONFIGURABLE_PROPERTY_SCREENSAVER_MODE]);
+	_g_free0 (_tmp224_[CONFIGURABLE_PROPERTY_SCREENSAVER_FILE]);
 #line 109 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp215_[CONFIGURABLE_PROPERTY_SCREENSAVER_MODE] = _tmp216_;
+	_tmp224_[CONFIGURABLE_PROPERTY_SCREENSAVER_FILE] = _tmp225_;
 #line 109 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp217_ = _tmp215_[CONFIGURABLE_PROPERTY_SCREENSAVER_MODE];
+	_tmp226_ = _tmp224_[CONFIGURABLE_PROPERTY_SCREENSAVER_FILE];
 #line 110 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp218_ = self->priv->key_names;
+	_tmp227_ = self->priv->key_names;
 #line 110 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp218__length1 = self->priv->key_names_length1;
+	_tmp227__length1 = self->priv->key_names_length1;
 #line 110 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp219_ = g_strdup ("directory-pattern");
+	_tmp228_ = g_strdup ("picture-options");
 #line 110 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp218_[CONFIGURABLE_PROPERTY_DIRECTORY_PATTERN]);
+	_g_free0 (_tmp227_[CONFIGURABLE_PROPERTY_SCREENSAVER_MODE]);
 #line 110 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp218_[CONFIGURABLE_PROPERTY_DIRECTORY_PATTERN] = _tmp219_;
+	_tmp227_[CONFIGURABLE_PROPERTY_SCREENSAVER_MODE] = _tmp228_;
 #line 110 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp220_ = _tmp218_[CONFIGURABLE_PROPERTY_DIRECTORY_PATTERN];
+	_tmp229_ = _tmp227_[CONFIGURABLE_PROPERTY_SCREENSAVER_MODE];
 #line 111 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp221_ = self->priv->key_names;
+	_tmp230_ = self->priv->key_names;
 #line 111 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp221__length1 = self->priv->key_names_length1;
+	_tmp230__length1 = self->priv->key_names_length1;
 #line 111 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp222_ = g_strdup ("directory-pattern-custom");
+	_tmp231_ = g_strdup ("directory-pattern");
 #line 111 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp221_[CONFIGURABLE_PROPERTY_DIRECTORY_PATTERN_CUSTOM]);
+	_g_free0 (_tmp230_[CONFIGURABLE_PROPERTY_DIRECTORY_PATTERN]);
 #line 111 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp221_[CONFIGURABLE_PROPERTY_DIRECTORY_PATTERN_CUSTOM] = _tmp222_;
+	_tmp230_[CONFIGURABLE_PROPERTY_DIRECTORY_PATTERN] = _tmp231_;
 #line 111 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp223_ = _tmp221_[CONFIGURABLE_PROPERTY_DIRECTORY_PATTERN_CUSTOM];
+	_tmp232_ = _tmp230_[CONFIGURABLE_PROPERTY_DIRECTORY_PATTERN];
 #line 112 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp224_ = self->priv->key_names;
+	_tmp233_ = self->priv->key_names;
 #line 112 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp224__length1 = self->priv->key_names_length1;
+	_tmp233__length1 = self->priv->key_names_length1;
 #line 112 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp225_ = g_strdup ("direct-height");
+	_tmp234_ = g_strdup ("directory-pattern-custom");
 #line 112 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp224_[CONFIGURABLE_PROPERTY_DIRECT_WINDOW_HEIGHT]);
+	_g_free0 (_tmp233_[CONFIGURABLE_PROPERTY_DIRECTORY_PATTERN_CUSTOM]);
 #line 112 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp224_[CONFIGURABLE_PROPERTY_DIRECT_WINDOW_HEIGHT] = _tmp225_;
+	_tmp233_[CONFIGURABLE_PROPERTY_DIRECTORY_PATTERN_CUSTOM] = _tmp234_;
 #line 112 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp226_ = _tmp224_[CONFIGURABLE_PROPERTY_DIRECT_WINDOW_HEIGHT];
+	_tmp235_ = _tmp233_[CONFIGURABLE_PROPERTY_DIRECTORY_PATTERN_CUSTOM];
 #line 113 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp227_ = self->priv->key_names;
+	_tmp236_ = self->priv->key_names;
 #line 113 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp227__length1 = self->priv->key_names_length1;
+	_tmp236__length1 = self->priv->key_names_length1;
 #line 113 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp228_ = g_strdup ("direct-maximize");
+	_tmp237_ = g_strdup ("direct-height");
 #line 113 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp227_[CONFIGURABLE_PROPERTY_DIRECT_WINDOW_MAXIMIZE]);
+	_g_free0 (_tmp236_[CONFIGURABLE_PROPERTY_DIRECT_WINDOW_HEIGHT]);
 #line 113 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp227_[CONFIGURABLE_PROPERTY_DIRECT_WINDOW_MAXIMIZE] = _tmp228_;
+	_tmp236_[CONFIGURABLE_PROPERTY_DIRECT_WINDOW_HEIGHT] = _tmp237_;
 #line 113 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp229_ = _tmp227_[CONFIGURABLE_PROPERTY_DIRECT_WINDOW_MAXIMIZE];
+	_tmp238_ = _tmp236_[CONFIGURABLE_PROPERTY_DIRECT_WINDOW_HEIGHT];
 #line 114 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp230_ = self->priv->key_names;
+	_tmp239_ = self->priv->key_names;
 #line 114 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp230__length1 = self->priv->key_names_length1;
+	_tmp239__length1 = self->priv->key_names_length1;
 #line 114 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp231_ = g_strdup ("direct-width");
+	_tmp240_ = g_strdup ("direct-maximize");
 #line 114 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp230_[CONFIGURABLE_PROPERTY_DIRECT_WINDOW_WIDTH]);
+	_g_free0 (_tmp239_[CONFIGURABLE_PROPERTY_DIRECT_WINDOW_MAXIMIZE]);
 #line 114 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp230_[CONFIGURABLE_PROPERTY_DIRECT_WINDOW_WIDTH] = _tmp231_;
+	_tmp239_[CONFIGURABLE_PROPERTY_DIRECT_WINDOW_MAXIMIZE] = _tmp240_;
 #line 114 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp232_ = _tmp230_[CONFIGURABLE_PROPERTY_DIRECT_WINDOW_WIDTH];
+	_tmp241_ = _tmp239_[CONFIGURABLE_PROPERTY_DIRECT_WINDOW_MAXIMIZE];
 #line 115 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp233_ = self->priv->key_names;
+	_tmp242_ = self->priv->key_names;
 #line 115 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp233__length1 = self->priv->key_names_length1;
+	_tmp242__length1 = self->priv->key_names_length1;
 #line 115 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp234_ = g_strdup ("display-basic-properties");
+	_tmp243_ = g_strdup ("direct-width");
 #line 115 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp233_[CONFIGURABLE_PROPERTY_DISPLAY_BASIC_PROPERTIES]);
+	_g_free0 (_tmp242_[CONFIGURABLE_PROPERTY_DIRECT_WINDOW_WIDTH]);
 #line 115 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp233_[CONFIGURABLE_PROPERTY_DISPLAY_BASIC_PROPERTIES] = _tmp234_;
+	_tmp242_[CONFIGURABLE_PROPERTY_DIRECT_WINDOW_WIDTH] = _tmp243_;
 #line 115 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp235_ = _tmp233_[CONFIGURABLE_PROPERTY_DISPLAY_BASIC_PROPERTIES];
+	_tmp244_ = _tmp242_[CONFIGURABLE_PROPERTY_DIRECT_WINDOW_WIDTH];
 #line 116 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp236_ = self->priv->key_names;
+	_tmp245_ = self->priv->key_names;
 #line 116 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp236__length1 = self->priv->key_names_length1;
+	_tmp245__length1 = self->priv->key_names_length1;
 #line 116 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp237_ = g_strdup ("display-extended-properties");
+	_tmp246_ = g_strdup ("display-basic-properties");
 #line 116 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp236_[CONFIGURABLE_PROPERTY_DISPLAY_EXTENDED_PROPERTIES]);
+	_g_free0 (_tmp245_[CONFIGURABLE_PROPERTY_DISPLAY_BASIC_PROPERTIES]);
 #line 116 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp236_[CONFIGURABLE_PROPERTY_DISPLAY_EXTENDED_PROPERTIES] = _tmp237_;
+	_tmp245_[CONFIGURABLE_PROPERTY_DISPLAY_BASIC_PROPERTIES] = _tmp246_;
 #line 116 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp238_ = _tmp236_[CONFIGURABLE_PROPERTY_DISPLAY_EXTENDED_PROPERTIES];
+	_tmp247_ = _tmp245_[CONFIGURABLE_PROPERTY_DISPLAY_BASIC_PROPERTIES];
 #line 117 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp239_ = self->priv->key_names;
+	_tmp248_ = self->priv->key_names;
 #line 117 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp239__length1 = self->priv->key_names_length1;
+	_tmp248__length1 = self->priv->key_names_length1;
 #line 117 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp240_ = g_strdup ("display-sidebar");
+	_tmp249_ = g_strdup ("display-extended-properties");
 #line 117 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp239_[CONFIGURABLE_PROPERTY_DISPLAY_SIDEBAR]);
+	_g_free0 (_tmp248_[CONFIGURABLE_PROPERTY_DISPLAY_EXTENDED_PROPERTIES]);
 #line 117 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp239_[CONFIGURABLE_PROPERTY_DISPLAY_SIDEBAR] = _tmp240_;
+	_tmp248_[CONFIGURABLE_PROPERTY_DISPLAY_EXTENDED_PROPERTIES] = _tmp249_;
 #line 117 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp241_ = _tmp239_[CONFIGURABLE_PROPERTY_DISPLAY_SIDEBAR];
+	_tmp250_ = _tmp248_[CONFIGURABLE_PROPERTY_DISPLAY_EXTENDED_PROPERTIES];
 #line 118 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp242_ = self->priv->key_names;
+	_tmp251_ = self->priv->key_names;
 #line 118 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp242__length1 = self->priv->key_names_length1;
+	_tmp251__length1 = self->priv->key_names_length1;
 #line 118 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp243_ = g_strdup ("display-toolbar");
+	_tmp252_ = g_strdup ("display-sidebar");
 #line 118 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp242_[CONFIGURABLE_PROPERTY_DISPLAY_TOOLBAR]);
+	_g_free0 (_tmp251_[CONFIGURABLE_PROPERTY_DISPLAY_SIDEBAR]);
 #line 118 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp242_[CONFIGURABLE_PROPERTY_DISPLAY_TOOLBAR] = _tmp243_;
+	_tmp251_[CONFIGURABLE_PROPERTY_DISPLAY_SIDEBAR] = _tmp252_;
 #line 118 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp244_ = _tmp242_[CONFIGURABLE_PROPERTY_DISPLAY_TOOLBAR];
+	_tmp253_ = _tmp251_[CONFIGURABLE_PROPERTY_DISPLAY_SIDEBAR];
 #line 119 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp245_ = self->priv->key_names;
+	_tmp254_ = self->priv->key_names;
 #line 119 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp245__length1 = self->priv->key_names_length1;
+	_tmp254__length1 = self->priv->key_names_length1;
 #line 119 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp246_ = g_strdup ("display-search-bar");
+	_tmp255_ = g_strdup ("display-toolbar");
 #line 119 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp245_[CONFIGURABLE_PROPERTY_DISPLAY_SEARCH_BAR]);
+	_g_free0 (_tmp254_[CONFIGURABLE_PROPERTY_DISPLAY_TOOLBAR]);
 #line 119 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp245_[CONFIGURABLE_PROPERTY_DISPLAY_SEARCH_BAR] = _tmp246_;
+	_tmp254_[CONFIGURABLE_PROPERTY_DISPLAY_TOOLBAR] = _tmp255_;
 #line 119 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp247_ = _tmp245_[CONFIGURABLE_PROPERTY_DISPLAY_SEARCH_BAR];
+	_tmp256_ = _tmp254_[CONFIGURABLE_PROPERTY_DISPLAY_TOOLBAR];
 #line 120 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp248_ = self->priv->key_names;
+	_tmp257_ = self->priv->key_names;
 #line 120 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp248__length1 = self->priv->key_names_length1;
+	_tmp257__length1 = self->priv->key_names_length1;
 #line 120 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp249_ = g_strdup ("display-photo-ratings");
+	_tmp258_ = g_strdup ("display-search-bar");
 #line 120 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp248_[CONFIGURABLE_PROPERTY_DISPLAY_PHOTO_RATINGS]);
+	_g_free0 (_tmp257_[CONFIGURABLE_PROPERTY_DISPLAY_SEARCH_BAR]);
 #line 120 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp248_[CONFIGURABLE_PROPERTY_DISPLAY_PHOTO_RATINGS] = _tmp249_;
+	_tmp257_[CONFIGURABLE_PROPERTY_DISPLAY_SEARCH_BAR] = _tmp258_;
 #line 120 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp250_ = _tmp248_[CONFIGURABLE_PROPERTY_DISPLAY_PHOTO_RATINGS];
+	_tmp259_ = _tmp257_[CONFIGURABLE_PROPERTY_DISPLAY_SEARCH_BAR];
 #line 121 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp251_ = self->priv->key_names;
+	_tmp260_ = self->priv->key_names;
 #line 121 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp251__length1 = self->priv->key_names_length1;
+	_tmp260__length1 = self->priv->key_names_length1;
 #line 121 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp252_ = g_strdup ("display-photo-tags");
+	_tmp261_ = g_strdup ("display-photo-ratings");
 #line 121 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp251_[CONFIGURABLE_PROPERTY_DISPLAY_PHOTO_TAGS]);
+	_g_free0 (_tmp260_[CONFIGURABLE_PROPERTY_DISPLAY_PHOTO_RATINGS]);
 #line 121 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp251_[CONFIGURABLE_PROPERTY_DISPLAY_PHOTO_TAGS] = _tmp252_;
+	_tmp260_[CONFIGURABLE_PROPERTY_DISPLAY_PHOTO_RATINGS] = _tmp261_;
 #line 121 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp253_ = _tmp251_[CONFIGURABLE_PROPERTY_DISPLAY_PHOTO_TAGS];
+	_tmp262_ = _tmp260_[CONFIGURABLE_PROPERTY_DISPLAY_PHOTO_RATINGS];
 #line 122 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp254_ = self->priv->key_names;
+	_tmp263_ = self->priv->key_names;
 #line 122 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp254__length1 = self->priv->key_names_length1;
+	_tmp263__length1 = self->priv->key_names_length1;
 #line 122 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp255_ = g_strdup ("display-photo-titles");
+	_tmp264_ = g_strdup ("display-photo-tags");
 #line 122 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp254_[CONFIGURABLE_PROPERTY_DISPLAY_PHOTO_TITLES]);
+	_g_free0 (_tmp263_[CONFIGURABLE_PROPERTY_DISPLAY_PHOTO_TAGS]);
 #line 122 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp254_[CONFIGURABLE_PROPERTY_DISPLAY_PHOTO_TITLES] = _tmp255_;
+	_tmp263_[CONFIGURABLE_PROPERTY_DISPLAY_PHOTO_TAGS] = _tmp264_;
 #line 122 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp256_ = _tmp254_[CONFIGURABLE_PROPERTY_DISPLAY_PHOTO_TITLES];
+	_tmp265_ = _tmp263_[CONFIGURABLE_PROPERTY_DISPLAY_PHOTO_TAGS];
 #line 123 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp257_ = self->priv->key_names;
+	_tmp266_ = self->priv->key_names;
 #line 123 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp257__length1 = self->priv->key_names_length1;
+	_tmp266__length1 = self->priv->key_names_length1;
 #line 123 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp258_ = g_strdup ("display-photo-comments");
+	_tmp267_ = g_strdup ("display-photo-titles");
 #line 123 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp257_[CONFIGURABLE_PROPERTY_DISPLAY_PHOTO_COMMENTS]);
+	_g_free0 (_tmp266_[CONFIGURABLE_PROPERTY_DISPLAY_PHOTO_TITLES]);
 #line 123 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp257_[CONFIGURABLE_PROPERTY_DISPLAY_PHOTO_COMMENTS] = _tmp258_;
+	_tmp266_[CONFIGURABLE_PROPERTY_DISPLAY_PHOTO_TITLES] = _tmp267_;
 #line 123 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp259_ = _tmp257_[CONFIGURABLE_PROPERTY_DISPLAY_PHOTO_COMMENTS];
+	_tmp268_ = _tmp266_[CONFIGURABLE_PROPERTY_DISPLAY_PHOTO_TITLES];
 #line 124 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp260_ = self->priv->key_names;
+	_tmp269_ = self->priv->key_names;
 #line 124 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp260__length1 = self->priv->key_names_length1;
+	_tmp269__length1 = self->priv->key_names_length1;
 #line 124 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp261_ = g_strdup ("display-event-comments");
+	_tmp270_ = g_strdup ("display-photo-comments");
 #line 124 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp260_[CONFIGURABLE_PROPERTY_DISPLAY_EVENT_COMMENTS]);
+	_g_free0 (_tmp269_[CONFIGURABLE_PROPERTY_DISPLAY_PHOTO_COMMENTS]);
 #line 124 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp260_[CONFIGURABLE_PROPERTY_DISPLAY_EVENT_COMMENTS] = _tmp261_;
+	_tmp269_[CONFIGURABLE_PROPERTY_DISPLAY_PHOTO_COMMENTS] = _tmp270_;
 #line 124 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp262_ = _tmp260_[CONFIGURABLE_PROPERTY_DISPLAY_EVENT_COMMENTS];
+	_tmp271_ = _tmp269_[CONFIGURABLE_PROPERTY_DISPLAY_PHOTO_COMMENTS];
 #line 125 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp263_ = self->priv->key_names;
+	_tmp272_ = self->priv->key_names;
 #line 125 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp263__length1 = self->priv->key_names_length1;
+	_tmp272__length1 = self->priv->key_names_length1;
 #line 125 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp264_ = g_strdup ("event-photos-sort-ascending");
+	_tmp273_ = g_strdup ("display-event-comments");
 #line 125 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp263_[CONFIGURABLE_PROPERTY_EVENT_PHOTOS_SORT_ASCENDING]);
+	_g_free0 (_tmp272_[CONFIGURABLE_PROPERTY_DISPLAY_EVENT_COMMENTS]);
 #line 125 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp263_[CONFIGURABLE_PROPERTY_EVENT_PHOTOS_SORT_ASCENDING] = _tmp264_;
+	_tmp272_[CONFIGURABLE_PROPERTY_DISPLAY_EVENT_COMMENTS] = _tmp273_;
 #line 125 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp265_ = _tmp263_[CONFIGURABLE_PROPERTY_EVENT_PHOTOS_SORT_ASCENDING];
+	_tmp274_ = _tmp272_[CONFIGURABLE_PROPERTY_DISPLAY_EVENT_COMMENTS];
 #line 126 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp266_ = self->priv->key_names;
+	_tmp275_ = self->priv->key_names;
 #line 126 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp266__length1 = self->priv->key_names_length1;
+	_tmp275__length1 = self->priv->key_names_length1;
 #line 126 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp267_ = g_strdup ("event-photos-sort-by");
+	_tmp276_ = g_strdup ("event-photos-sort-ascending");
 #line 126 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp266_[CONFIGURABLE_PROPERTY_EVENT_PHOTOS_SORT_BY]);
+	_g_free0 (_tmp275_[CONFIGURABLE_PROPERTY_EVENT_PHOTOS_SORT_ASCENDING]);
 #line 126 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp266_[CONFIGURABLE_PROPERTY_EVENT_PHOTOS_SORT_BY] = _tmp267_;
+	_tmp275_[CONFIGURABLE_PROPERTY_EVENT_PHOTOS_SORT_ASCENDING] = _tmp276_;
 #line 126 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp268_ = _tmp266_[CONFIGURABLE_PROPERTY_EVENT_PHOTOS_SORT_BY];
+	_tmp277_ = _tmp275_[CONFIGURABLE_PROPERTY_EVENT_PHOTOS_SORT_ASCENDING];
 #line 127 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp269_ = self->priv->key_names;
+	_tmp278_ = self->priv->key_names;
 #line 127 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp269__length1 = self->priv->key_names_length1;
+	_tmp278__length1 = self->priv->key_names_length1;
 #line 127 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp270_ = g_strdup ("events-sort-ascending");
+	_tmp279_ = g_strdup ("event-photos-sort-by");
 #line 127 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp269_[CONFIGURABLE_PROPERTY_EVENTS_SORT_ASCENDING]);
+	_g_free0 (_tmp278_[CONFIGURABLE_PROPERTY_EVENT_PHOTOS_SORT_BY]);
 #line 127 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp269_[CONFIGURABLE_PROPERTY_EVENTS_SORT_ASCENDING] = _tmp270_;
+	_tmp278_[CONFIGURABLE_PROPERTY_EVENT_PHOTOS_SORT_BY] = _tmp279_;
 #line 127 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp271_ = _tmp269_[CONFIGURABLE_PROPERTY_EVENTS_SORT_ASCENDING];
+	_tmp280_ = _tmp278_[CONFIGURABLE_PROPERTY_EVENT_PHOTOS_SORT_BY];
 #line 128 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp272_ = self->priv->key_names;
+	_tmp281_ = self->priv->key_names;
 #line 128 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp272__length1 = self->priv->key_names_length1;
+	_tmp281__length1 = self->priv->key_names_length1;
 #line 128 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp273_ = g_strdup ("external-photo-editor");
+	_tmp282_ = g_strdup ("events-sort-ascending");
 #line 128 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp272_[CONFIGURABLE_PROPERTY_EXTERNAL_PHOTO_APP]);
+	_g_free0 (_tmp281_[CONFIGURABLE_PROPERTY_EVENTS_SORT_ASCENDING]);
 #line 128 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp272_[CONFIGURABLE_PROPERTY_EXTERNAL_PHOTO_APP] = _tmp273_;
+	_tmp281_[CONFIGURABLE_PROPERTY_EVENTS_SORT_ASCENDING] = _tmp282_;
 #line 128 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp274_ = _tmp272_[CONFIGURABLE_PROPERTY_EXTERNAL_PHOTO_APP];
+	_tmp283_ = _tmp281_[CONFIGURABLE_PROPERTY_EVENTS_SORT_ASCENDING];
 #line 129 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp275_ = self->priv->key_names;
+	_tmp284_ = self->priv->key_names;
 #line 129 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp275__length1 = self->priv->key_names_length1;
+	_tmp284__length1 = self->priv->key_names_length1;
 #line 129 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp276_ = g_strdup ("external-raw-editor");
+	_tmp285_ = g_strdup ("constraint");
 #line 129 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp275_[CONFIGURABLE_PROPERTY_EXTERNAL_RAW_APP]);
+	_g_free0 (_tmp284_[CONFIGURABLE_PROPERTY_EXPORT_CONSTRAINT]);
 #line 129 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp275_[CONFIGURABLE_PROPERTY_EXTERNAL_RAW_APP] = _tmp276_;
+	_tmp284_[CONFIGURABLE_PROPERTY_EXPORT_CONSTRAINT] = _tmp285_;
 #line 129 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp277_ = _tmp275_[CONFIGURABLE_PROPERTY_EXTERNAL_RAW_APP];
+	_tmp286_ = _tmp284_[CONFIGURABLE_PROPERTY_EXPORT_CONSTRAINT];
 #line 130 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp278_ = self->priv->key_names;
+	_tmp287_ = self->priv->key_names;
 #line 130 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp278__length1 = self->priv->key_names_length1;
+	_tmp287__length1 = self->priv->key_names_length1;
 #line 130 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp279_ = g_strdup ("hide-photos-already-imported");
+	_tmp288_ = g_strdup ("export-format-mode");
 #line 130 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp278_[CONFIGURABLE_PROPERTY_HIDE_PHOTOS_ALREADY_IMPORTED]);
+	_g_free0 (_tmp287_[CONFIGURABLE_PROPERTY_EXPORT_EXPORT_FORMAT_MODE]);
 #line 130 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp278_[CONFIGURABLE_PROPERTY_HIDE_PHOTOS_ALREADY_IMPORTED] = _tmp279_;
+	_tmp287_[CONFIGURABLE_PROPERTY_EXPORT_EXPORT_FORMAT_MODE] = _tmp288_;
 #line 130 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp280_ = _tmp278_[CONFIGURABLE_PROPERTY_HIDE_PHOTOS_ALREADY_IMPORTED];
+	_tmp289_ = _tmp287_[CONFIGURABLE_PROPERTY_EXPORT_EXPORT_FORMAT_MODE];
 #line 131 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp281_ = self->priv->key_names;
+	_tmp290_ = self->priv->key_names;
 #line 131 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp281__length1 = self->priv->key_names_length1;
+	_tmp290__length1 = self->priv->key_names_length1;
 #line 131 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp282_ = g_strdup ("import-dir");
+	_tmp291_ = g_strdup ("export-metadata");
 #line 131 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp281_[CONFIGURABLE_PROPERTY_IMPORT_DIR]);
+	_g_free0 (_tmp290_[CONFIGURABLE_PROPERTY_EXPORT_EXPORT_METADATA]);
 #line 131 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp281_[CONFIGURABLE_PROPERTY_IMPORT_DIR] = _tmp282_;
+	_tmp290_[CONFIGURABLE_PROPERTY_EXPORT_EXPORT_METADATA] = _tmp291_;
 #line 131 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp283_ = _tmp281_[CONFIGURABLE_PROPERTY_IMPORT_DIR];
+	_tmp292_ = _tmp290_[CONFIGURABLE_PROPERTY_EXPORT_EXPORT_METADATA];
 #line 132 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp284_ = self->priv->key_names;
+	_tmp293_ = self->priv->key_names;
 #line 132 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp284__length1 = self->priv->key_names_length1;
+	_tmp293__length1 = self->priv->key_names_length1;
 #line 132 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp285_ = g_strdup ("keep-relativity");
+	_tmp294_ = g_strdup ("photo-file-format");
 #line 132 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp284_[CONFIGURABLE_PROPERTY_KEEP_RELATIVITY]);
+	_g_free0 (_tmp293_[CONFIGURABLE_PROPERTY_EXPORT_PHOTO_FILE_FORMAT]);
 #line 132 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp284_[CONFIGURABLE_PROPERTY_KEEP_RELATIVITY] = _tmp285_;
+	_tmp293_[CONFIGURABLE_PROPERTY_EXPORT_PHOTO_FILE_FORMAT] = _tmp294_;
 #line 132 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp286_ = _tmp284_[CONFIGURABLE_PROPERTY_KEEP_RELATIVITY];
+	_tmp295_ = _tmp293_[CONFIGURABLE_PROPERTY_EXPORT_PHOTO_FILE_FORMAT];
 #line 133 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp287_ = self->priv->key_names;
+	_tmp296_ = self->priv->key_names;
 #line 133 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp287__length1 = self->priv->key_names_length1;
+	_tmp296__length1 = self->priv->key_names_length1;
 #line 133 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp288_ = g_strdup ("last-crop-height");
+	_tmp297_ = g_strdup ("quality");
 #line 133 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp287_[CONFIGURABLE_PROPERTY_LAST_CROP_HEIGHT]);
+	_g_free0 (_tmp296_[CONFIGURABLE_PROPERTY_EXPORT_QUALITY]);
 #line 133 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp287_[CONFIGURABLE_PROPERTY_LAST_CROP_HEIGHT] = _tmp288_;
+	_tmp296_[CONFIGURABLE_PROPERTY_EXPORT_QUALITY] = _tmp297_;
 #line 133 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp289_ = _tmp287_[CONFIGURABLE_PROPERTY_LAST_CROP_HEIGHT];
+	_tmp298_ = _tmp296_[CONFIGURABLE_PROPERTY_EXPORT_QUALITY];
 #line 134 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp290_ = self->priv->key_names;
+	_tmp299_ = self->priv->key_names;
 #line 134 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp290__length1 = self->priv->key_names_length1;
+	_tmp299__length1 = self->priv->key_names_length1;
 #line 134 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp291_ = g_strdup ("last-crop-menu-choice");
+	_tmp300_ = g_strdup ("scale");
 #line 134 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp290_[CONFIGURABLE_PROPERTY_LAST_CROP_MENU_CHOICE]);
+	_g_free0 (_tmp299_[CONFIGURABLE_PROPERTY_EXPORT_SCALE]);
 #line 134 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp290_[CONFIGURABLE_PROPERTY_LAST_CROP_MENU_CHOICE] = _tmp291_;
+	_tmp299_[CONFIGURABLE_PROPERTY_EXPORT_SCALE] = _tmp300_;
 #line 134 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp292_ = _tmp290_[CONFIGURABLE_PROPERTY_LAST_CROP_MENU_CHOICE];
+	_tmp301_ = _tmp299_[CONFIGURABLE_PROPERTY_EXPORT_SCALE];
 #line 135 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp293_ = self->priv->key_names;
+	_tmp302_ = self->priv->key_names;
 #line 135 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp293__length1 = self->priv->key_names_length1;
+	_tmp302__length1 = self->priv->key_names_length1;
 #line 135 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp294_ = g_strdup ("last-crop-width");
+	_tmp303_ = g_strdup ("external-photo-editor");
 #line 135 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp293_[CONFIGURABLE_PROPERTY_LAST_CROP_WIDTH]);
+	_g_free0 (_tmp302_[CONFIGURABLE_PROPERTY_EXTERNAL_PHOTO_APP]);
 #line 135 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp293_[CONFIGURABLE_PROPERTY_LAST_CROP_WIDTH] = _tmp294_;
+	_tmp302_[CONFIGURABLE_PROPERTY_EXTERNAL_PHOTO_APP] = _tmp303_;
 #line 135 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp295_ = _tmp293_[CONFIGURABLE_PROPERTY_LAST_CROP_WIDTH];
+	_tmp304_ = _tmp302_[CONFIGURABLE_PROPERTY_EXTERNAL_PHOTO_APP];
 #line 136 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp296_ = self->priv->key_names;
+	_tmp305_ = self->priv->key_names;
 #line 136 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp296__length1 = self->priv->key_names_length1;
+	_tmp305__length1 = self->priv->key_names_length1;
 #line 136 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp297_ = g_strdup ("last-used-service");
+	_tmp306_ = g_strdup ("external-raw-editor");
 #line 136 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp296_[CONFIGURABLE_PROPERTY_LAST_USED_SERVICE]);
+	_g_free0 (_tmp305_[CONFIGURABLE_PROPERTY_EXTERNAL_RAW_APP]);
 #line 136 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp296_[CONFIGURABLE_PROPERTY_LAST_USED_SERVICE] = _tmp297_;
+	_tmp305_[CONFIGURABLE_PROPERTY_EXTERNAL_RAW_APP] = _tmp306_;
 #line 136 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp298_ = _tmp296_[CONFIGURABLE_PROPERTY_LAST_USED_SERVICE];
+	_tmp307_ = _tmp305_[CONFIGURABLE_PROPERTY_EXTERNAL_RAW_APP];
 #line 137 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp299_ = self->priv->key_names;
+	_tmp308_ = self->priv->key_names;
 #line 137 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp299__length1 = self->priv->key_names_length1;
+	_tmp308__length1 = self->priv->key_names_length1;
 #line 137 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp300_ = g_strdup ("last-used-dataimports-service");
+	_tmp309_ = g_strdup ("hide-photos-already-imported");
 #line 137 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp299_[CONFIGURABLE_PROPERTY_LAST_USED_DATAIMPORTS_SERVICE]);
+	_g_free0 (_tmp308_[CONFIGURABLE_PROPERTY_HIDE_PHOTOS_ALREADY_IMPORTED]);
 #line 137 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp299_[CONFIGURABLE_PROPERTY_LAST_USED_DATAIMPORTS_SERVICE] = _tmp300_;
+	_tmp308_[CONFIGURABLE_PROPERTY_HIDE_PHOTOS_ALREADY_IMPORTED] = _tmp309_;
 #line 137 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp301_ = _tmp299_[CONFIGURABLE_PROPERTY_LAST_USED_DATAIMPORTS_SERVICE];
+	_tmp310_ = _tmp308_[CONFIGURABLE_PROPERTY_HIDE_PHOTOS_ALREADY_IMPORTED];
 #line 138 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp302_ = self->priv->key_names;
+	_tmp311_ = self->priv->key_names;
 #line 138 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp302__length1 = self->priv->key_names_length1;
+	_tmp311__length1 = self->priv->key_names_length1;
 #line 138 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp303_ = g_strdup ("library-photos-sort-ascending");
+	_tmp312_ = g_strdup ("import-dir");
 #line 138 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp302_[CONFIGURABLE_PROPERTY_LIBRARY_PHOTOS_SORT_ASCENDING]);
+	_g_free0 (_tmp311_[CONFIGURABLE_PROPERTY_IMPORT_DIR]);
 #line 138 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp302_[CONFIGURABLE_PROPERTY_LIBRARY_PHOTOS_SORT_ASCENDING] = _tmp303_;
+	_tmp311_[CONFIGURABLE_PROPERTY_IMPORT_DIR] = _tmp312_;
 #line 138 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp304_ = _tmp302_[CONFIGURABLE_PROPERTY_LIBRARY_PHOTOS_SORT_ASCENDING];
+	_tmp313_ = _tmp311_[CONFIGURABLE_PROPERTY_IMPORT_DIR];
 #line 139 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp305_ = self->priv->key_names;
+	_tmp314_ = self->priv->key_names;
 #line 139 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp305__length1 = self->priv->key_names_length1;
+	_tmp314__length1 = self->priv->key_names_length1;
 #line 139 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp306_ = g_strdup ("library-photos-sort-by");
+	_tmp315_ = g_strdup ("keep-relativity");
 #line 139 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp305_[CONFIGURABLE_PROPERTY_LIBRARY_PHOTOS_SORT_BY]);
+	_g_free0 (_tmp314_[CONFIGURABLE_PROPERTY_KEEP_RELATIVITY]);
 #line 139 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp305_[CONFIGURABLE_PROPERTY_LIBRARY_PHOTOS_SORT_BY] = _tmp306_;
+	_tmp314_[CONFIGURABLE_PROPERTY_KEEP_RELATIVITY] = _tmp315_;
 #line 139 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp307_ = _tmp305_[CONFIGURABLE_PROPERTY_LIBRARY_PHOTOS_SORT_BY];
+	_tmp316_ = _tmp314_[CONFIGURABLE_PROPERTY_KEEP_RELATIVITY];
 #line 140 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp308_ = self->priv->key_names;
+	_tmp317_ = self->priv->key_names;
 #line 140 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp308__length1 = self->priv->key_names_length1;
+	_tmp317__length1 = self->priv->key_names_length1;
 #line 140 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp309_ = g_strdup ("library-height");
+	_tmp318_ = g_strdup ("last-crop-height");
 #line 140 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp308_[CONFIGURABLE_PROPERTY_LIBRARY_WINDOW_HEIGHT]);
+	_g_free0 (_tmp317_[CONFIGURABLE_PROPERTY_LAST_CROP_HEIGHT]);
 #line 140 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp308_[CONFIGURABLE_PROPERTY_LIBRARY_WINDOW_HEIGHT] = _tmp309_;
+	_tmp317_[CONFIGURABLE_PROPERTY_LAST_CROP_HEIGHT] = _tmp318_;
 #line 140 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp310_ = _tmp308_[CONFIGURABLE_PROPERTY_LIBRARY_WINDOW_HEIGHT];
+	_tmp319_ = _tmp317_[CONFIGURABLE_PROPERTY_LAST_CROP_HEIGHT];
 #line 141 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp311_ = self->priv->key_names;
+	_tmp320_ = self->priv->key_names;
 #line 141 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp311__length1 = self->priv->key_names_length1;
+	_tmp320__length1 = self->priv->key_names_length1;
 #line 141 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp312_ = g_strdup ("library-maximize");
+	_tmp321_ = g_strdup ("last-crop-menu-choice");
 #line 141 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp311_[CONFIGURABLE_PROPERTY_LIBRARY_WINDOW_MAXIMIZE]);
+	_g_free0 (_tmp320_[CONFIGURABLE_PROPERTY_LAST_CROP_MENU_CHOICE]);
 #line 141 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp311_[CONFIGURABLE_PROPERTY_LIBRARY_WINDOW_MAXIMIZE] = _tmp312_;
+	_tmp320_[CONFIGURABLE_PROPERTY_LAST_CROP_MENU_CHOICE] = _tmp321_;
 #line 141 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp313_ = _tmp311_[CONFIGURABLE_PROPERTY_LIBRARY_WINDOW_MAXIMIZE];
+	_tmp322_ = _tmp320_[CONFIGURABLE_PROPERTY_LAST_CROP_MENU_CHOICE];
 #line 142 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp314_ = self->priv->key_names;
+	_tmp323_ = self->priv->key_names;
 #line 142 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp314__length1 = self->priv->key_names_length1;
+	_tmp323__length1 = self->priv->key_names_length1;
 #line 142 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp315_ = g_strdup ("library-width");
+	_tmp324_ = g_strdup ("last-crop-width");
 #line 142 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp314_[CONFIGURABLE_PROPERTY_LIBRARY_WINDOW_WIDTH]);
+	_g_free0 (_tmp323_[CONFIGURABLE_PROPERTY_LAST_CROP_WIDTH]);
 #line 142 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp314_[CONFIGURABLE_PROPERTY_LIBRARY_WINDOW_WIDTH] = _tmp315_;
+	_tmp323_[CONFIGURABLE_PROPERTY_LAST_CROP_WIDTH] = _tmp324_;
 #line 142 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp316_ = _tmp314_[CONFIGURABLE_PROPERTY_LIBRARY_WINDOW_WIDTH];
+	_tmp325_ = _tmp323_[CONFIGURABLE_PROPERTY_LAST_CROP_WIDTH];
 #line 143 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp317_ = self->priv->key_names;
+	_tmp326_ = self->priv->key_names;
 #line 143 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp317__length1 = self->priv->key_names_length1;
+	_tmp326__length1 = self->priv->key_names_length1;
 #line 143 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp318_ = g_strdup ("modify-originals");
+	_tmp327_ = g_strdup ("last-used-service");
 #line 143 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp317_[CONFIGURABLE_PROPERTY_MODIFY_ORIGINALS]);
+	_g_free0 (_tmp326_[CONFIGURABLE_PROPERTY_LAST_USED_SERVICE]);
 #line 143 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp317_[CONFIGURABLE_PROPERTY_MODIFY_ORIGINALS] = _tmp318_;
+	_tmp326_[CONFIGURABLE_PROPERTY_LAST_USED_SERVICE] = _tmp327_;
 #line 143 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp319_ = _tmp317_[CONFIGURABLE_PROPERTY_MODIFY_ORIGINALS];
+	_tmp328_ = _tmp326_[CONFIGURABLE_PROPERTY_LAST_USED_SERVICE];
 #line 144 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp320_ = self->priv->key_names;
+	_tmp329_ = self->priv->key_names;
 #line 144 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp320__length1 = self->priv->key_names_length1;
+	_tmp329__length1 = self->priv->key_names_length1;
 #line 144 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp321_ = g_strdup ("photo-thumbnail-scale");
+	_tmp330_ = g_strdup ("last-used-dataimports-service");
 #line 144 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp320_[CONFIGURABLE_PROPERTY_PHOTO_THUMBNAIL_SCALE]);
+	_g_free0 (_tmp329_[CONFIGURABLE_PROPERTY_LAST_USED_DATAIMPORTS_SERVICE]);
 #line 144 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp320_[CONFIGURABLE_PROPERTY_PHOTO_THUMBNAIL_SCALE] = _tmp321_;
+	_tmp329_[CONFIGURABLE_PROPERTY_LAST_USED_DATAIMPORTS_SERVICE] = _tmp330_;
 #line 144 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp322_ = _tmp320_[CONFIGURABLE_PROPERTY_PHOTO_THUMBNAIL_SCALE];
+	_tmp331_ = _tmp329_[CONFIGURABLE_PROPERTY_LAST_USED_DATAIMPORTS_SERVICE];
 #line 145 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp323_ = self->priv->key_names;
+	_tmp332_ = self->priv->key_names;
 #line 145 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp323__length1 = self->priv->key_names_length1;
+	_tmp332__length1 = self->priv->key_names_length1;
 #line 145 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp324_ = g_strdup ("pin-toolbar-state");
+	_tmp333_ = g_strdup ("library-photos-sort-ascending");
 #line 145 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp323_[CONFIGURABLE_PROPERTY_PIN_TOOLBAR_STATE]);
+	_g_free0 (_tmp332_[CONFIGURABLE_PROPERTY_LIBRARY_PHOTOS_SORT_ASCENDING]);
 #line 145 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp323_[CONFIGURABLE_PROPERTY_PIN_TOOLBAR_STATE] = _tmp324_;
+	_tmp332_[CONFIGURABLE_PROPERTY_LIBRARY_PHOTOS_SORT_ASCENDING] = _tmp333_;
 #line 145 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp325_ = _tmp323_[CONFIGURABLE_PROPERTY_PIN_TOOLBAR_STATE];
+	_tmp334_ = _tmp332_[CONFIGURABLE_PROPERTY_LIBRARY_PHOTOS_SORT_ASCENDING];
 #line 146 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp326_ = self->priv->key_names;
+	_tmp335_ = self->priv->key_names;
 #line 146 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp326__length1 = self->priv->key_names_length1;
+	_tmp335__length1 = self->priv->key_names_length1;
 #line 146 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp327_ = g_strdup ("content-height");
+	_tmp336_ = g_strdup ("library-photos-sort-by");
 #line 146 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp326_[CONFIGURABLE_PROPERTY_PRINTING_CONTENT_HEIGHT]);
+	_g_free0 (_tmp335_[CONFIGURABLE_PROPERTY_LIBRARY_PHOTOS_SORT_BY]);
 #line 146 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp326_[CONFIGURABLE_PROPERTY_PRINTING_CONTENT_HEIGHT] = _tmp327_;
+	_tmp335_[CONFIGURABLE_PROPERTY_LIBRARY_PHOTOS_SORT_BY] = _tmp336_;
 #line 146 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp328_ = _tmp326_[CONFIGURABLE_PROPERTY_PRINTING_CONTENT_HEIGHT];
+	_tmp337_ = _tmp335_[CONFIGURABLE_PROPERTY_LIBRARY_PHOTOS_SORT_BY];
 #line 147 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp329_ = self->priv->key_names;
+	_tmp338_ = self->priv->key_names;
 #line 147 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp329__length1 = self->priv->key_names_length1;
+	_tmp338__length1 = self->priv->key_names_length1;
 #line 147 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp330_ = g_strdup ("content-layout");
+	_tmp339_ = g_strdup ("library-height");
 #line 147 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp329_[CONFIGURABLE_PROPERTY_PRINTING_CONTENT_LAYOUT]);
+	_g_free0 (_tmp338_[CONFIGURABLE_PROPERTY_LIBRARY_WINDOW_HEIGHT]);
 #line 147 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp329_[CONFIGURABLE_PROPERTY_PRINTING_CONTENT_LAYOUT] = _tmp330_;
+	_tmp338_[CONFIGURABLE_PROPERTY_LIBRARY_WINDOW_HEIGHT] = _tmp339_;
 #line 147 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp331_ = _tmp329_[CONFIGURABLE_PROPERTY_PRINTING_CONTENT_LAYOUT];
+	_tmp340_ = _tmp338_[CONFIGURABLE_PROPERTY_LIBRARY_WINDOW_HEIGHT];
 #line 148 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp332_ = self->priv->key_names;
+	_tmp341_ = self->priv->key_names;
 #line 148 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp332__length1 = self->priv->key_names_length1;
+	_tmp341__length1 = self->priv->key_names_length1;
 #line 148 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp333_ = g_strdup ("content-ppi");
+	_tmp342_ = g_strdup ("library-maximize");
 #line 148 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp332_[CONFIGURABLE_PROPERTY_PRINTING_CONTENT_PPI]);
+	_g_free0 (_tmp341_[CONFIGURABLE_PROPERTY_LIBRARY_WINDOW_MAXIMIZE]);
 #line 148 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp332_[CONFIGURABLE_PROPERTY_PRINTING_CONTENT_PPI] = _tmp333_;
+	_tmp341_[CONFIGURABLE_PROPERTY_LIBRARY_WINDOW_MAXIMIZE] = _tmp342_;
 #line 148 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp334_ = _tmp332_[CONFIGURABLE_PROPERTY_PRINTING_CONTENT_PPI];
+	_tmp343_ = _tmp341_[CONFIGURABLE_PROPERTY_LIBRARY_WINDOW_MAXIMIZE];
 #line 149 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp335_ = self->priv->key_names;
+	_tmp344_ = self->priv->key_names;
 #line 149 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp335__length1 = self->priv->key_names_length1;
+	_tmp344__length1 = self->priv->key_names_length1;
 #line 149 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp336_ = g_strdup ("content-units");
+	_tmp345_ = g_strdup ("library-width");
 #line 149 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp335_[CONFIGURABLE_PROPERTY_PRINTING_CONTENT_UNITS]);
+	_g_free0 (_tmp344_[CONFIGURABLE_PROPERTY_LIBRARY_WINDOW_WIDTH]);
 #line 149 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp335_[CONFIGURABLE_PROPERTY_PRINTING_CONTENT_UNITS] = _tmp336_;
+	_tmp344_[CONFIGURABLE_PROPERTY_LIBRARY_WINDOW_WIDTH] = _tmp345_;
 #line 149 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp337_ = _tmp335_[CONFIGURABLE_PROPERTY_PRINTING_CONTENT_UNITS];
+	_tmp346_ = _tmp344_[CONFIGURABLE_PROPERTY_LIBRARY_WINDOW_WIDTH];
 #line 150 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp338_ = self->priv->key_names;
+	_tmp347_ = self->priv->key_names;
 #line 150 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp338__length1 = self->priv->key_names_length1;
+	_tmp347__length1 = self->priv->key_names_length1;
 #line 150 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp339_ = g_strdup ("content-width");
+	_tmp348_ = g_strdup ("modify-originals");
 #line 150 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp338_[CONFIGURABLE_PROPERTY_PRINTING_CONTENT_WIDTH]);
+	_g_free0 (_tmp347_[CONFIGURABLE_PROPERTY_MODIFY_ORIGINALS]);
 #line 150 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp338_[CONFIGURABLE_PROPERTY_PRINTING_CONTENT_WIDTH] = _tmp339_;
+	_tmp347_[CONFIGURABLE_PROPERTY_MODIFY_ORIGINALS] = _tmp348_;
 #line 150 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp340_ = _tmp338_[CONFIGURABLE_PROPERTY_PRINTING_CONTENT_WIDTH];
+	_tmp349_ = _tmp347_[CONFIGURABLE_PROPERTY_MODIFY_ORIGINALS];
 #line 151 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp341_ = self->priv->key_names;
+	_tmp350_ = self->priv->key_names;
 #line 151 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp341__length1 = self->priv->key_names_length1;
+	_tmp350__length1 = self->priv->key_names_length1;
 #line 151 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp342_ = g_strdup ("images-per-page");
+	_tmp351_ = g_strdup ("photo-thumbnail-scale");
 #line 151 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp341_[CONFIGURABLE_PROPERTY_PRINTING_IMAGES_PER_PAGE]);
+	_g_free0 (_tmp350_[CONFIGURABLE_PROPERTY_PHOTO_THUMBNAIL_SCALE]);
 #line 151 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp341_[CONFIGURABLE_PROPERTY_PRINTING_IMAGES_PER_PAGE] = _tmp342_;
+	_tmp350_[CONFIGURABLE_PROPERTY_PHOTO_THUMBNAIL_SCALE] = _tmp351_;
 #line 151 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp343_ = _tmp341_[CONFIGURABLE_PROPERTY_PRINTING_IMAGES_PER_PAGE];
+	_tmp352_ = _tmp350_[CONFIGURABLE_PROPERTY_PHOTO_THUMBNAIL_SCALE];
 #line 152 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp344_ = self->priv->key_names;
+	_tmp353_ = self->priv->key_names;
 #line 152 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp344__length1 = self->priv->key_names_length1;
+	_tmp353__length1 = self->priv->key_names_length1;
 #line 152 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp345_ = g_strdup ("match-aspect-ratio");
+	_tmp354_ = g_strdup ("pin-toolbar-state");
 #line 152 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp344_[CONFIGURABLE_PROPERTY_PRINTING_MATCH_ASPECT_RATIO]);
+	_g_free0 (_tmp353_[CONFIGURABLE_PROPERTY_PIN_TOOLBAR_STATE]);
 #line 152 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp344_[CONFIGURABLE_PROPERTY_PRINTING_MATCH_ASPECT_RATIO] = _tmp345_;
+	_tmp353_[CONFIGURABLE_PROPERTY_PIN_TOOLBAR_STATE] = _tmp354_;
 #line 152 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp346_ = _tmp344_[CONFIGURABLE_PROPERTY_PRINTING_MATCH_ASPECT_RATIO];
+	_tmp355_ = _tmp353_[CONFIGURABLE_PROPERTY_PIN_TOOLBAR_STATE];
 #line 153 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp347_ = self->priv->key_names;
+	_tmp356_ = self->priv->key_names;
 #line 153 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp347__length1 = self->priv->key_names_length1;
+	_tmp356__length1 = self->priv->key_names_length1;
 #line 153 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp348_ = g_strdup ("print-titles");
+	_tmp357_ = g_strdup ("content-height");
 #line 153 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp347_[CONFIGURABLE_PROPERTY_PRINTING_PRINT_TITLES]);
+	_g_free0 (_tmp356_[CONFIGURABLE_PROPERTY_PRINTING_CONTENT_HEIGHT]);
 #line 153 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp347_[CONFIGURABLE_PROPERTY_PRINTING_PRINT_TITLES] = _tmp348_;
+	_tmp356_[CONFIGURABLE_PROPERTY_PRINTING_CONTENT_HEIGHT] = _tmp357_;
 #line 153 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp349_ = _tmp347_[CONFIGURABLE_PROPERTY_PRINTING_PRINT_TITLES];
+	_tmp358_ = _tmp356_[CONFIGURABLE_PROPERTY_PRINTING_CONTENT_HEIGHT];
 #line 154 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp350_ = self->priv->key_names;
+	_tmp359_ = self->priv->key_names;
 #line 154 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp350__length1 = self->priv->key_names_length1;
+	_tmp359__length1 = self->priv->key_names_length1;
 #line 154 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp351_ = g_strdup ("size-selection");
+	_tmp360_ = g_strdup ("content-layout");
 #line 154 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp350_[CONFIGURABLE_PROPERTY_PRINTING_SIZE_SELECTION]);
+	_g_free0 (_tmp359_[CONFIGURABLE_PROPERTY_PRINTING_CONTENT_LAYOUT]);
 #line 154 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp350_[CONFIGURABLE_PROPERTY_PRINTING_SIZE_SELECTION] = _tmp351_;
+	_tmp359_[CONFIGURABLE_PROPERTY_PRINTING_CONTENT_LAYOUT] = _tmp360_;
 #line 154 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp352_ = _tmp350_[CONFIGURABLE_PROPERTY_PRINTING_SIZE_SELECTION];
+	_tmp361_ = _tmp359_[CONFIGURABLE_PROPERTY_PRINTING_CONTENT_LAYOUT];
 #line 155 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp353_ = self->priv->key_names;
+	_tmp362_ = self->priv->key_names;
 #line 155 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp353__length1 = self->priv->key_names_length1;
+	_tmp362__length1 = self->priv->key_names_length1;
 #line 155 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp354_ = g_strdup ("titles-font");
+	_tmp363_ = g_strdup ("content-ppi");
 #line 155 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp353_[CONFIGURABLE_PROPERTY_PRINTING_TITLES_FONT]);
+	_g_free0 (_tmp362_[CONFIGURABLE_PROPERTY_PRINTING_CONTENT_PPI]);
 #line 155 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp353_[CONFIGURABLE_PROPERTY_PRINTING_TITLES_FONT] = _tmp354_;
+	_tmp362_[CONFIGURABLE_PROPERTY_PRINTING_CONTENT_PPI] = _tmp363_;
 #line 155 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp355_ = _tmp353_[CONFIGURABLE_PROPERTY_PRINTING_TITLES_FONT];
+	_tmp364_ = _tmp362_[CONFIGURABLE_PROPERTY_PRINTING_CONTENT_PPI];
 #line 156 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp356_ = self->priv->key_names;
+	_tmp365_ = self->priv->key_names;
 #line 156 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp356__length1 = self->priv->key_names_length1;
+	_tmp365__length1 = self->priv->key_names_length1;
 #line 156 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp357_ = g_strdup ("raw-developer-default");
+	_tmp366_ = g_strdup ("content-units");
 #line 156 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp356_[CONFIGURABLE_PROPERTY_RAW_DEVELOPER_DEFAULT]);
+	_g_free0 (_tmp365_[CONFIGURABLE_PROPERTY_PRINTING_CONTENT_UNITS]);
 #line 156 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp356_[CONFIGURABLE_PROPERTY_RAW_DEVELOPER_DEFAULT] = _tmp357_;
+	_tmp365_[CONFIGURABLE_PROPERTY_PRINTING_CONTENT_UNITS] = _tmp366_;
 #line 156 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp358_ = _tmp356_[CONFIGURABLE_PROPERTY_RAW_DEVELOPER_DEFAULT];
+	_tmp367_ = _tmp365_[CONFIGURABLE_PROPERTY_PRINTING_CONTENT_UNITS];
 #line 157 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp359_ = self->priv->key_names;
+	_tmp368_ = self->priv->key_names;
 #line 157 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp359__length1 = self->priv->key_names_length1;
+	_tmp368__length1 = self->priv->key_names_length1;
 #line 157 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp360_ = g_strdup ("show-welcome-dialog");
+	_tmp369_ = g_strdup ("content-width");
 #line 157 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp359_[CONFIGURABLE_PROPERTY_SHOW_WELCOME_DIALOG]);
+	_g_free0 (_tmp368_[CONFIGURABLE_PROPERTY_PRINTING_CONTENT_WIDTH]);
 #line 157 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp359_[CONFIGURABLE_PROPERTY_SHOW_WELCOME_DIALOG] = _tmp360_;
+	_tmp368_[CONFIGURABLE_PROPERTY_PRINTING_CONTENT_WIDTH] = _tmp369_;
 #line 157 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp361_ = _tmp359_[CONFIGURABLE_PROPERTY_SHOW_WELCOME_DIALOG];
+	_tmp370_ = _tmp368_[CONFIGURABLE_PROPERTY_PRINTING_CONTENT_WIDTH];
 #line 158 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp362_ = self->priv->key_names;
+	_tmp371_ = self->priv->key_names;
 #line 158 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp362__length1 = self->priv->key_names_length1;
+	_tmp371__length1 = self->priv->key_names_length1;
 #line 158 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp363_ = g_strdup ("sidebar-position");
+	_tmp372_ = g_strdup ("images-per-page");
 #line 158 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp362_[CONFIGURABLE_PROPERTY_SIDEBAR_POSITION]);
+	_g_free0 (_tmp371_[CONFIGURABLE_PROPERTY_PRINTING_IMAGES_PER_PAGE]);
 #line 158 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp362_[CONFIGURABLE_PROPERTY_SIDEBAR_POSITION] = _tmp363_;
+	_tmp371_[CONFIGURABLE_PROPERTY_PRINTING_IMAGES_PER_PAGE] = _tmp372_;
 #line 158 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp364_ = _tmp362_[CONFIGURABLE_PROPERTY_SIDEBAR_POSITION];
+	_tmp373_ = _tmp371_[CONFIGURABLE_PROPERTY_PRINTING_IMAGES_PER_PAGE];
 #line 159 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp365_ = self->priv->key_names;
+	_tmp374_ = self->priv->key_names;
 #line 159 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp365__length1 = self->priv->key_names_length1;
+	_tmp374__length1 = self->priv->key_names_length1;
 #line 159 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp366_ = g_strdup ("delay");
+	_tmp375_ = g_strdup ("match-aspect-ratio");
 #line 159 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp365_[CONFIGURABLE_PROPERTY_SLIDESHOW_DELAY]);
+	_g_free0 (_tmp374_[CONFIGURABLE_PROPERTY_PRINTING_MATCH_ASPECT_RATIO]);
 #line 159 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp365_[CONFIGURABLE_PROPERTY_SLIDESHOW_DELAY] = _tmp366_;
+	_tmp374_[CONFIGURABLE_PROPERTY_PRINTING_MATCH_ASPECT_RATIO] = _tmp375_;
 #line 159 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp367_ = _tmp365_[CONFIGURABLE_PROPERTY_SLIDESHOW_DELAY];
+	_tmp376_ = _tmp374_[CONFIGURABLE_PROPERTY_PRINTING_MATCH_ASPECT_RATIO];
 #line 160 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp368_ = self->priv->key_names;
+	_tmp377_ = self->priv->key_names;
 #line 160 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp368__length1 = self->priv->key_names_length1;
+	_tmp377__length1 = self->priv->key_names_length1;
 #line 160 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp369_ = g_strdup ("transition-delay");
+	_tmp378_ = g_strdup ("print-titles");
 #line 160 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp368_[CONFIGURABLE_PROPERTY_SLIDESHOW_TRANSITION_DELAY]);
+	_g_free0 (_tmp377_[CONFIGURABLE_PROPERTY_PRINTING_PRINT_TITLES]);
 #line 160 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp368_[CONFIGURABLE_PROPERTY_SLIDESHOW_TRANSITION_DELAY] = _tmp369_;
+	_tmp377_[CONFIGURABLE_PROPERTY_PRINTING_PRINT_TITLES] = _tmp378_;
 #line 160 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp370_ = _tmp368_[CONFIGURABLE_PROPERTY_SLIDESHOW_TRANSITION_DELAY];
+	_tmp379_ = _tmp377_[CONFIGURABLE_PROPERTY_PRINTING_PRINT_TITLES];
 #line 161 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp371_ = self->priv->key_names;
+	_tmp380_ = self->priv->key_names;
 #line 161 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp371__length1 = self->priv->key_names_length1;
+	_tmp380__length1 = self->priv->key_names_length1;
 #line 161 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp372_ = g_strdup ("transition-effect-id");
+	_tmp381_ = g_strdup ("size-selection");
 #line 161 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp371_[CONFIGURABLE_PROPERTY_SLIDESHOW_TRANSITION_EFFECT_ID]);
+	_g_free0 (_tmp380_[CONFIGURABLE_PROPERTY_PRINTING_SIZE_SELECTION]);
 #line 161 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp371_[CONFIGURABLE_PROPERTY_SLIDESHOW_TRANSITION_EFFECT_ID] = _tmp372_;
+	_tmp380_[CONFIGURABLE_PROPERTY_PRINTING_SIZE_SELECTION] = _tmp381_;
 #line 161 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp373_ = _tmp371_[CONFIGURABLE_PROPERTY_SLIDESHOW_TRANSITION_EFFECT_ID];
+	_tmp382_ = _tmp380_[CONFIGURABLE_PROPERTY_PRINTING_SIZE_SELECTION];
 #line 162 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp374_ = self->priv->key_names;
+	_tmp383_ = self->priv->key_names;
 #line 162 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp374__length1 = self->priv->key_names_length1;
+	_tmp383__length1 = self->priv->key_names_length1;
 #line 162 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp375_ = g_strdup ("show-title");
+	_tmp384_ = g_strdup ("titles-font");
 #line 162 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp374_[CONFIGURABLE_PROPERTY_SLIDESHOW_SHOW_TITLE]);
+	_g_free0 (_tmp383_[CONFIGURABLE_PROPERTY_PRINTING_TITLES_FONT]);
 #line 162 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp374_[CONFIGURABLE_PROPERTY_SLIDESHOW_SHOW_TITLE] = _tmp375_;
+	_tmp383_[CONFIGURABLE_PROPERTY_PRINTING_TITLES_FONT] = _tmp384_;
 #line 162 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp376_ = _tmp374_[CONFIGURABLE_PROPERTY_SLIDESHOW_SHOW_TITLE];
+	_tmp385_ = _tmp383_[CONFIGURABLE_PROPERTY_PRINTING_TITLES_FONT];
 #line 163 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp377_ = self->priv->key_names;
+	_tmp386_ = self->priv->key_names;
 #line 163 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp377__length1 = self->priv->key_names_length1;
+	_tmp386__length1 = self->priv->key_names_length1;
 #line 163 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp378_ = g_strdup ("use-24-hour-time");
+	_tmp387_ = g_strdup ("raw-developer-default");
 #line 163 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp377_[CONFIGURABLE_PROPERTY_USE_24_HOUR_TIME]);
+	_g_free0 (_tmp386_[CONFIGURABLE_PROPERTY_RAW_DEVELOPER_DEFAULT]);
 #line 163 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp377_[CONFIGURABLE_PROPERTY_USE_24_HOUR_TIME] = _tmp378_;
+	_tmp386_[CONFIGURABLE_PROPERTY_RAW_DEVELOPER_DEFAULT] = _tmp387_;
 #line 163 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp379_ = _tmp377_[CONFIGURABLE_PROPERTY_USE_24_HOUR_TIME];
+	_tmp388_ = _tmp386_[CONFIGURABLE_PROPERTY_RAW_DEVELOPER_DEFAULT];
 #line 164 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp380_ = self->priv->key_names;
+	_tmp389_ = self->priv->key_names;
 #line 164 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp380__length1 = self->priv->key_names_length1;
+	_tmp389__length1 = self->priv->key_names_length1;
 #line 164 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp381_ = g_strdup ("use-lowercase-filenames");
+	_tmp390_ = g_strdup ("show-welcome-dialog");
 #line 164 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp380_[CONFIGURABLE_PROPERTY_USE_LOWERCASE_FILENAMES]);
+	_g_free0 (_tmp389_[CONFIGURABLE_PROPERTY_SHOW_WELCOME_DIALOG]);
 #line 164 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp380_[CONFIGURABLE_PROPERTY_USE_LOWERCASE_FILENAMES] = _tmp381_;
+	_tmp389_[CONFIGURABLE_PROPERTY_SHOW_WELCOME_DIALOG] = _tmp390_;
 #line 164 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp382_ = _tmp380_[CONFIGURABLE_PROPERTY_USE_LOWERCASE_FILENAMES];
+	_tmp391_ = _tmp389_[CONFIGURABLE_PROPERTY_SHOW_WELCOME_DIALOG];
 #line 165 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp383_ = self->priv->key_names;
+	_tmp392_ = self->priv->key_names;
 #line 165 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp383__length1 = self->priv->key_names_length1;
+	_tmp392__length1 = self->priv->key_names_length1;
 #line 165 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp384_ = g_strdup ("interpreter-state-cookie");
+	_tmp393_ = g_strdup ("sidebar-position");
 #line 165 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_free0 (_tmp383_[CONFIGURABLE_PROPERTY_VIDEO_INTERPRETER_STATE_COOKIE]);
+	_g_free0 (_tmp392_[CONFIGURABLE_PROPERTY_SIDEBAR_POSITION]);
 #line 165 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp383_[CONFIGURABLE_PROPERTY_VIDEO_INTERPRETER_STATE_COOKIE] = _tmp384_;
+	_tmp392_[CONFIGURABLE_PROPERTY_SIDEBAR_POSITION] = _tmp393_;
 #line 165 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp385_ = _tmp383_[CONFIGURABLE_PROPERTY_VIDEO_INTERPRETER_STATE_COOKIE];
-#line 29 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	return self;
-#line 2333 "GSettingsEngine.c"
-}
-
-
-GSettingsConfigurationEngine* gsettings_configuration_engine_new (void) {
-#line 29 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	return gsettings_configuration_engine_construct (TYPE_GSETTINGS_CONFIGURATION_ENGINE);
-#line 2340 "GSettingsEngine.c"
-}
-
-
-static gboolean gsettings_configuration_engine_schema_has_key (GSettingsConfigurationEngine* self, GSettings* schema_object, const gchar* key) {
-	gboolean result = FALSE;
-	GSettings* _tmp0_ = NULL;
-	gchar** _tmp1_ = NULL;
-	gchar** _tmp2_ = NULL;
+	_tmp394_ = _tmp392_[CONFIGURABLE_PROPERTY_SIDEBAR_POSITION];
+#line 166 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+	_tmp395_ = self->priv->key_names;
+#line 166 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+	_tmp395__length1 = self->priv->key_names_length1;
+#line 166 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+	_tmp396_ = g_strdup ("delay");
+#line 166 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+	_g_free0 (_tmp395_[CONFIGURABLE_PROPERTY_SLIDESHOW_DELAY]);
+#line 166 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+	_tmp395_[CONFIGURABLE_PROPERTY_SLIDESHOW_DELAY] = _tmp396_;
+#line 166 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+	_tmp397_ = _tmp395_[CONFIGURABLE_PROPERTY_SLIDESHOW_DELAY];
+#line 167 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+	_tmp398_ = self->priv->key_names;
+#line 167 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+	_tmp398__length1 = self->priv->key_names_length1;
+#line 167 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+	_tmp399_ = g_strdup ("transition-delay");
+#line 167 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+	_g_free0 (_tmp398_[CONFIGURABLE_PROPERTY_SLIDESHOW_TRANSITION_DELAY]);
+#line 167 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+	_tmp398_[CONFIGURABLE_PROPERTY_SLIDESHOW_TRANSITION_DELAY] = _tmp399_;
+#line 167 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+	_tmp400_ = _tmp398_[CONFIGURABLE_PROPERTY_SLIDESHOW_TRANSITION_DELAY];
 #line 168 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	g_return_val_if_fail (IS_GSETTINGS_CONFIGURATION_ENGINE (self), FALSE);
+	_tmp401_ = self->priv->key_names;
 #line 168 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	g_return_val_if_fail (G_IS_SETTINGS (schema_object), FALSE);
+	_tmp401__length1 = self->priv->key_names_length1;
 #line 168 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	g_return_val_if_fail (key != NULL, FALSE);
-#line 169 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp0_ = schema_object;
+	_tmp402_ = g_strdup ("transition-effect-id");
+#line 168 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+	_g_free0 (_tmp401_[CONFIGURABLE_PROPERTY_SLIDESHOW_TRANSITION_EFFECT_ID]);
+#line 168 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+	_tmp401_[CONFIGURABLE_PROPERTY_SLIDESHOW_TRANSITION_EFFECT_ID] = _tmp402_;
+#line 168 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+	_tmp403_ = _tmp401_[CONFIGURABLE_PROPERTY_SLIDESHOW_TRANSITION_EFFECT_ID];
 #line 169 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp2_ = _tmp1_ = g_settings_list_keys (_tmp0_);
-#line 2359 "GSettingsEngine.c"
-	{
-		gchar** current_key_collection = NULL;
-		gint current_key_collection_length1 = 0;
-		gint _current_key_collection_size_ = 0;
-		gint current_key_it = 0;
+	_tmp404_ = self->priv->key_names;
 #line 169 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-		current_key_collection = _tmp2_;
+	_tmp404__length1 = self->priv->key_names_length1;
 #line 169 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-		current_key_collection_length1 = _vala_array_length (_tmp1_);
+	_tmp405_ = g_strdup ("show-title");
 #line 169 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-		for (current_key_it = 0; current_key_it < _vala_array_length (_tmp1_); current_key_it = current_key_it + 1) {
-#line 2371 "GSettingsEngine.c"
-			gchar* _tmp3_ = NULL;
-			gchar* current_key = NULL;
+	_g_free0 (_tmp404_[CONFIGURABLE_PROPERTY_SLIDESHOW_SHOW_TITLE]);
 #line 169 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-			_tmp3_ = g_strdup (current_key_collection[current_key_it]);
+	_tmp404_[CONFIGURABLE_PROPERTY_SLIDESHOW_SHOW_TITLE] = _tmp405_;
 #line 169 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-			current_key = _tmp3_;
-#line 2378 "GSettingsEngine.c"
-			{
-				const gchar* _tmp4_ = NULL;
-				const gchar* _tmp5_ = NULL;
+	_tmp406_ = _tmp404_[CONFIGURABLE_PROPERTY_SLIDESHOW_SHOW_TITLE];
+#line 170 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+	_tmp407_ = self->priv->key_names;
+#line 170 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+	_tmp407__length1 = self->priv->key_names_length1;
+#line 170 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+	_tmp408_ = g_strdup ("use-24-hour-time");
 #line 170 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-				_tmp4_ = current_key;
+	_g_free0 (_tmp407_[CONFIGURABLE_PROPERTY_USE_24_HOUR_TIME]);
 #line 170 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-				_tmp5_ = key;
+	_tmp407_[CONFIGURABLE_PROPERTY_USE_24_HOUR_TIME] = _tmp408_;
 #line 170 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-				if (g_strcmp0 (_tmp4_, _tmp5_) == 0) {
+	_tmp409_ = _tmp407_[CONFIGURABLE_PROPERTY_USE_24_HOUR_TIME];
 #line 171 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-					result = TRUE;
+	_tmp410_ = self->priv->key_names;
 #line 171 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-					_g_free0 (current_key);
+	_tmp410__length1 = self->priv->key_names_length1;
 #line 171 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-					current_key_collection = (_vala_array_free (current_key_collection, current_key_collection_length1, (GDestroyNotify) g_free), NULL);
+	_tmp411_ = g_strdup ("use-lowercase-filenames");
 #line 171 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-					return result;
-#line 2396 "GSettingsEngine.c"
-				}
-#line 169 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-				_g_free0 (current_key);
-#line 2400 "GSettingsEngine.c"
-			}
-		}
-#line 169 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-		current_key_collection = (_vala_array_free (current_key_collection, current_key_collection_length1, (GDestroyNotify) g_free), NULL);
-#line 2405 "GSettingsEngine.c"
-	}
-#line 174 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	result = FALSE;
-#line 174 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	return result;
-#line 2411 "GSettingsEngine.c"
+	_g_free0 (_tmp410_[CONFIGURABLE_PROPERTY_USE_LOWERCASE_FILENAMES]);
+#line 171 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+	_tmp410_[CONFIGURABLE_PROPERTY_USE_LOWERCASE_FILENAMES] = _tmp411_;
+#line 171 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+	_tmp412_ = _tmp410_[CONFIGURABLE_PROPERTY_USE_LOWERCASE_FILENAMES];
+#line 172 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+	_tmp413_ = self->priv->key_names;
+#line 172 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+	_tmp413__length1 = self->priv->key_names_length1;
+#line 172 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+	_tmp414_ = g_strdup ("interpreter-state-cookie");
+#line 172 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+	_g_free0 (_tmp413_[CONFIGURABLE_PROPERTY_VIDEO_INTERPRETER_STATE_COOKIE]);
+#line 172 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+	_tmp413_[CONFIGURABLE_PROPERTY_VIDEO_INTERPRETER_STATE_COOKIE] = _tmp414_;
+#line 172 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+	_tmp415_ = _tmp413_[CONFIGURABLE_PROPERTY_VIDEO_INTERPRETER_STATE_COOKIE];
+#line 29 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+	return self;
+#line 2490 "GSettingsEngine.c"
+}
+
+
+GSettingsConfigurationEngine* gsettings_configuration_engine_new (void) {
+#line 29 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+	return gsettings_configuration_engine_construct (TYPE_GSETTINGS_CONFIGURATION_ENGINE);
+#line 2497 "GSettingsEngine.c"
+}
+
+
+static gpointer _g_settings_schema_source_ref0 (gpointer self) {
+#line 176 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+	return self ? g_settings_schema_source_ref (self) : NULL;
+#line 2504 "GSettingsEngine.c"
 }
 
 
 static void gsettings_configuration_engine_check_key_valid (GSettingsConfigurationEngine* self, const gchar* schema, const gchar* key, GError** error) {
-	GeeSet* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
-	GSettings* schema_object = NULL;
-	const gchar* _tmp8_ = NULL;
-	GSettings* _tmp9_ = NULL;
-	GSettings* _tmp10_ = NULL;
-	const gchar* _tmp11_ = NULL;
-	gboolean _tmp12_ = FALSE;
+	GSettingsSchemaSource* schema_source = NULL;
+	GSettingsSchemaSource* _tmp0_ = NULL;
+	GSettingsSchemaSource* _tmp1_ = NULL;
+	GSettingsSchema* settings_scheme = NULL;
+	GSettingsSchemaSource* _tmp2_ = NULL;
+	const gchar* _tmp3_ = NULL;
+	GSettingsSchema* _tmp4_ = NULL;
+	GSettingsSchema* _tmp5_ = NULL;
+	GSettingsSchema* _tmp11_ = NULL;
+	const gchar* _tmp12_ = NULL;
+	gboolean _tmp13_ = FALSE;
 	GError * _inner_error_ = NULL;
-#line 177 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 175 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	g_return_if_fail (IS_GSETTINGS_CONFIGURATION_ENGINE (self));
-#line 177 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 175 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	g_return_if_fail (schema != NULL);
-#line 177 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 175 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	g_return_if_fail (key != NULL);
+#line 176 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+	_tmp0_ = g_settings_schema_source_get_default ();
+#line 176 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+	_tmp1_ = _g_settings_schema_source_ref0 (_tmp0_);
+#line 176 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+	schema_source = _tmp1_;
+#line 177 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+	_tmp2_ = schema_source;
+#line 177 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+	_tmp3_ = schema;
+#line 177 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+	_tmp4_ = g_settings_schema_source_lookup (_tmp2_, _tmp3_, TRUE);
+#line 177 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+	settings_scheme = _tmp4_;
 #line 178 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp0_ = self->priv->known_schemas;
-#line 178 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp1_ = schema;
-#line 178 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp2_ = gee_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection), _tmp1_);
+	_tmp5_ = settings_scheme;
 #line 178 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	if (!_tmp2_) {
-#line 2440 "GSettingsEngine.c"
-		const gchar* _tmp3_ = NULL;
-		gchar* _tmp4_ = NULL;
-		gchar* _tmp5_ = NULL;
-		GError* _tmp6_ = NULL;
-		GError* _tmp7_ = NULL;
+	if (_tmp5_ == NULL) {
+#line 2545 "GSettingsEngine.c"
+		const gchar* _tmp6_ = NULL;
+		gchar* _tmp7_ = NULL;
+		gchar* _tmp8_ = NULL;
+		GError* _tmp9_ = NULL;
+		GError* _tmp10_ = NULL;
 #line 179 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-		_tmp3_ = schema;
+		_tmp6_ = schema;
 #line 179 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-		_tmp4_ = g_strdup_printf ("schema '%s' is not installed", _tmp3_);
+		_tmp7_ = g_strdup_printf ("schema '%s' is not installed", _tmp6_);
 #line 179 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-		_tmp5_ = _tmp4_;
+		_tmp8_ = _tmp7_;
 #line 179 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-		_tmp6_ = g_error_new_literal (CONFIGURATION_ERROR, CONFIGURATION_ERROR_ENGINE_ERROR, _tmp5_);
+		_tmp9_ = g_error_new_literal (CONFIGURATION_ERROR, CONFIGURATION_ERROR_ENGINE_ERROR, _tmp8_);
 #line 179 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-		_tmp7_ = _tmp6_;
+		_tmp10_ = _tmp9_;
 #line 179 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-		_g_free0 (_tmp5_);
+		_g_free0 (_tmp8_);
 #line 179 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-		_inner_error_ = _tmp7_;
+		_inner_error_ = _tmp10_;
 #line 179 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		if (_inner_error_->domain == CONFIGURATION_ERROR) {
 #line 179 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			g_propagate_error (error, _inner_error_);
 #line 179 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+			_g_settings_schema_unref0 (settings_scheme);
+#line 179 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+			_g_settings_schema_source_unref0 (schema_source);
+#line 179 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			return;
-#line 2466 "GSettingsEngine.c"
+#line 2575 "GSettingsEngine.c"
 		} else {
 #line 179 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+			_g_settings_schema_unref0 (settings_scheme);
+#line 179 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+			_g_settings_schema_source_unref0 (schema_source);
+#line 179 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 179 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			g_clear_error (&_inner_error_);
 #line 179 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			return;
-#line 2474 "GSettingsEngine.c"
+#line 2587 "GSettingsEngine.c"
 		}
 	}
-#line 181 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp8_ = schema;
-#line 181 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp9_ = g_settings_new (_tmp8_);
-#line 181 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	schema_object = _tmp9_;
+#line 182 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+	_tmp11_ = settings_scheme;
+#line 182 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+	_tmp12_ = key;
+#line 182 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+	_tmp13_ = g_settings_schema_has_key (_tmp11_, _tmp12_);
+#line 182 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+	if (!_tmp13_) {
+#line 2598 "GSettingsEngine.c"
+		const gchar* _tmp14_ = NULL;
+		const gchar* _tmp15_ = NULL;
+		gchar* _tmp16_ = NULL;
+		gchar* _tmp17_ = NULL;
+		GError* _tmp18_ = NULL;
+		GError* _tmp19_ = NULL;
 #line 183 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp10_ = schema_object;
+		_tmp14_ = schema;
 #line 183 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp11_ = key;
+		_tmp15_ = key;
 #line 183 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_tmp12_ = gsettings_configuration_engine_schema_has_key (self, _tmp10_, _tmp11_);
+		_tmp16_ = g_strdup_printf ("schema '%s' does not define key '%s'", _tmp14_, _tmp15_);
+#line 183 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+		_tmp17_ = _tmp16_;
+#line 183 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+		_tmp18_ = g_error_new_literal (CONFIGURATION_ERROR, CONFIGURATION_ERROR_ENGINE_ERROR, _tmp17_);
+#line 183 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+		_tmp19_ = _tmp18_;
+#line 183 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+		_g_free0 (_tmp17_);
+#line 183 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+		_inner_error_ = _tmp19_;
 #line 183 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	if (!_tmp12_) {
-#line 2491 "GSettingsEngine.c"
-		const gchar* _tmp13_ = NULL;
-		const gchar* _tmp14_ = NULL;
-		gchar* _tmp15_ = NULL;
-		gchar* _tmp16_ = NULL;
-		GError* _tmp17_ = NULL;
-		GError* _tmp18_ = NULL;
-#line 184 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-		_tmp13_ = schema;
-#line 184 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-		_tmp14_ = key;
-#line 184 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-		_tmp15_ = g_strdup_printf ("schema '%s' does not define key '%s'", _tmp13_, _tmp14_);
-#line 184 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-		_tmp16_ = _tmp15_;
-#line 184 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-		_tmp17_ = g_error_new_literal (CONFIGURATION_ERROR, CONFIGURATION_ERROR_ENGINE_ERROR, _tmp16_);
-#line 184 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-		_tmp18_ = _tmp17_;
-#line 184 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-		_g_free0 (_tmp16_);
-#line 184 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-		_inner_error_ = _tmp18_;
-#line 184 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 184 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 183 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			g_propagate_error (error, _inner_error_);
-#line 184 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-			_g_object_unref0 (schema_object);
-#line 184 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 183 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+			_g_settings_schema_unref0 (settings_scheme);
+#line 183 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+			_g_settings_schema_source_unref0 (schema_source);
+#line 183 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			return;
-#line 2522 "GSettingsEngine.c"
+#line 2631 "GSettingsEngine.c"
 		} else {
-#line 184 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-			_g_object_unref0 (schema_object);
-#line 184 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 183 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+			_g_settings_schema_unref0 (settings_scheme);
+#line 183 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+			_g_settings_schema_source_unref0 (schema_source);
+#line 183 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 184 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 183 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			g_clear_error (&_inner_error_);
-#line 184 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 183 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			return;
-#line 2532 "GSettingsEngine.c"
+#line 2643 "GSettingsEngine.c"
 		}
 	}
-#line 177 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_object_unref0 (schema_object);
-#line 2537 "GSettingsEngine.c"
+#line 175 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+	_g_settings_schema_unref0 (settings_scheme);
+#line 175 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+	_g_settings_schema_source_unref0 (schema_source);
+#line 2650 "GSettingsEngine.c"
 }
 
 
@@ -2548,56 +2661,56 @@ static gboolean gsettings_configuration_engine_get_gs_bool (GSettingsConfigurati
 	const gchar* _tmp5_ = NULL;
 	gboolean _tmp6_ = FALSE;
 	GError * _inner_error_ = NULL;
-#line 188 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 187 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	g_return_val_if_fail (IS_GSETTINGS_CONFIGURATION_ENGINE (self), FALSE);
-#line 188 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 187 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	g_return_val_if_fail (schema != NULL, FALSE);
-#line 188 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 187 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	g_return_val_if_fail (key != NULL, FALSE);
-#line 189 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 188 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp0_ = schema;
-#line 189 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 188 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp1_ = key;
-#line 189 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 188 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	gsettings_configuration_engine_check_key_valid (self, _tmp0_, _tmp1_, &_inner_error_);
-#line 189 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 188 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 189 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 188 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 189 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 188 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			g_propagate_error (error, _inner_error_);
-#line 189 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 188 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			return FALSE;
-#line 2572 "GSettingsEngine.c"
+#line 2685 "GSettingsEngine.c"
 		} else {
-#line 189 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 188 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 189 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 188 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			g_clear_error (&_inner_error_);
-#line 189 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 188 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			return FALSE;
-#line 2580 "GSettingsEngine.c"
+#line 2693 "GSettingsEngine.c"
 		}
 	}
-#line 191 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 190 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp2_ = schema;
-#line 191 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 190 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp3_ = g_settings_new (_tmp2_);
-#line 191 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 190 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	schema_object = _tmp3_;
-#line 193 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 192 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp4_ = schema_object;
-#line 193 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 192 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp5_ = key;
-#line 193 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 192 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp6_ = g_settings_get_boolean (_tmp4_, _tmp5_);
-#line 193 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 192 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	result = _tmp6_;
-#line 193 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 192 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_g_object_unref0 (schema_object);
-#line 193 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 192 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	return result;
-#line 2601 "GSettingsEngine.c"
+#line 2714 "GSettingsEngine.c"
 }
 
 
@@ -2611,54 +2724,179 @@ static void gsettings_configuration_engine_set_gs_bool (GSettingsConfigurationEn
 	const gchar* _tmp5_ = NULL;
 	gboolean _tmp6_ = FALSE;
 	GError * _inner_error_ = NULL;
-#line 196 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 195 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	g_return_if_fail (IS_GSETTINGS_CONFIGURATION_ENGINE (self));
-#line 196 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 195 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	g_return_if_fail (schema != NULL);
-#line 196 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 195 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	g_return_if_fail (key != NULL);
-#line 197 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 196 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp0_ = schema;
-#line 197 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 196 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp1_ = key;
-#line 197 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 196 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	gsettings_configuration_engine_check_key_valid (self, _tmp0_, _tmp1_, &_inner_error_);
-#line 197 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 196 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 197 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 196 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 197 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 196 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			g_propagate_error (error, _inner_error_);
-#line 197 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 196 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			return;
-#line 2635 "GSettingsEngine.c"
+#line 2748 "GSettingsEngine.c"
 		} else {
-#line 197 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 196 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 197 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 196 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			g_clear_error (&_inner_error_);
-#line 197 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 196 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			return;
-#line 2643 "GSettingsEngine.c"
+#line 2756 "GSettingsEngine.c"
 		}
 	}
-#line 199 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 198 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp2_ = schema;
-#line 199 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 198 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp3_ = g_settings_new (_tmp2_);
-#line 199 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 198 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	schema_object = _tmp3_;
-#line 201 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 200 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp4_ = schema_object;
-#line 201 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 200 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp5_ = key;
-#line 201 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 200 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp6_ = value;
-#line 201 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 200 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	g_settings_set_boolean (_tmp4_, _tmp5_, _tmp6_);
-#line 196 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 195 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_g_object_unref0 (schema_object);
-#line 2662 "GSettingsEngine.c"
+#line 2775 "GSettingsEngine.c"
+}
+
+
+static void gsettings_configuration_engine_set_gs_enum (GSettingsConfigurationEngine* self, const gchar* schema, const gchar* key, gint value, GError** error) {
+	const gchar* _tmp0_ = NULL;
+	const gchar* _tmp1_ = NULL;
+	GSettings* schema_object = NULL;
+	const gchar* _tmp2_ = NULL;
+	GSettings* _tmp3_ = NULL;
+	GSettings* _tmp4_ = NULL;
+	const gchar* _tmp5_ = NULL;
+	gint _tmp6_ = 0;
+	GError * _inner_error_ = NULL;
+#line 203 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+	g_return_if_fail (IS_GSETTINGS_CONFIGURATION_ENGINE (self));
+#line 203 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+	g_return_if_fail (schema != NULL);
+#line 203 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+	g_return_if_fail (key != NULL);
+#line 204 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+	_tmp0_ = schema;
+#line 204 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+	_tmp1_ = key;
+#line 204 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+	gsettings_configuration_engine_check_key_valid (self, _tmp0_, _tmp1_, &_inner_error_);
+#line 204 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+	if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 204 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+		if (_inner_error_->domain == CONFIGURATION_ERROR) {
+#line 204 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+			g_propagate_error (error, _inner_error_);
+#line 204 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+			return;
+#line 2809 "GSettingsEngine.c"
+		} else {
+#line 204 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
+#line 204 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+			g_clear_error (&_inner_error_);
+#line 204 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+			return;
+#line 2817 "GSettingsEngine.c"
+		}
+	}
+#line 206 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+	_tmp2_ = schema;
+#line 206 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+	_tmp3_ = g_settings_new (_tmp2_);
+#line 206 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+	schema_object = _tmp3_;
+#line 207 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+	_tmp4_ = schema_object;
+#line 207 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+	_tmp5_ = key;
+#line 207 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+	_tmp6_ = value;
+#line 207 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+	g_settings_set_enum (_tmp4_, _tmp5_, _tmp6_);
+#line 203 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+	_g_object_unref0 (schema_object);
+#line 2836 "GSettingsEngine.c"
+}
+
+
+static gint gsettings_configuration_engine_get_gs_enum (GSettingsConfigurationEngine* self, const gchar* schema, const gchar* key, GError** error) {
+	gint result = 0;
+	const gchar* _tmp0_ = NULL;
+	const gchar* _tmp1_ = NULL;
+	GSettings* schema_object = NULL;
+	const gchar* _tmp2_ = NULL;
+	GSettings* _tmp3_ = NULL;
+	GSettings* _tmp4_ = NULL;
+	const gchar* _tmp5_ = NULL;
+	gint _tmp6_ = 0;
+	GError * _inner_error_ = NULL;
+#line 210 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+	g_return_val_if_fail (IS_GSETTINGS_CONFIGURATION_ENGINE (self), 0);
+#line 210 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+	g_return_val_if_fail (schema != NULL, 0);
+#line 210 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+	g_return_val_if_fail (key != NULL, 0);
+#line 211 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+	_tmp0_ = schema;
+#line 211 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+	_tmp1_ = key;
+#line 211 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+	gsettings_configuration_engine_check_key_valid (self, _tmp0_, _tmp1_, &_inner_error_);
+#line 211 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+	if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 211 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+		if (_inner_error_->domain == CONFIGURATION_ERROR) {
+#line 211 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+			g_propagate_error (error, _inner_error_);
+#line 211 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+			return 0;
+#line 2871 "GSettingsEngine.c"
+		} else {
+#line 211 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
+#line 211 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+			g_clear_error (&_inner_error_);
+#line 211 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+			return 0;
+#line 2879 "GSettingsEngine.c"
+		}
+	}
+#line 213 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+	_tmp2_ = schema;
+#line 213 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+	_tmp3_ = g_settings_new (_tmp2_);
+#line 213 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+	schema_object = _tmp3_;
+#line 214 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+	_tmp4_ = schema_object;
+#line 214 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+	_tmp5_ = key;
+#line 214 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+	_tmp6_ = g_settings_get_enum (_tmp4_, _tmp5_);
+#line 214 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+	result = _tmp6_;
+#line 214 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+	_g_object_unref0 (schema_object);
+#line 214 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+	return result;
+#line 2900 "GSettingsEngine.c"
 }
 
 
@@ -2673,56 +2911,56 @@ static gint gsettings_configuration_engine_get_gs_int (GSettingsConfigurationEng
 	const gchar* _tmp5_ = NULL;
 	gint _tmp6_ = 0;
 	GError * _inner_error_ = NULL;
-#line 204 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 217 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	g_return_val_if_fail (IS_GSETTINGS_CONFIGURATION_ENGINE (self), 0);
-#line 204 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 217 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	g_return_val_if_fail (schema != NULL, 0);
-#line 204 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 217 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	g_return_val_if_fail (key != NULL, 0);
-#line 205 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 218 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp0_ = schema;
-#line 205 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 218 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp1_ = key;
-#line 205 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 218 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	gsettings_configuration_engine_check_key_valid (self, _tmp0_, _tmp1_, &_inner_error_);
-#line 205 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 218 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 205 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 218 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 205 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 218 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			g_propagate_error (error, _inner_error_);
-#line 205 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 218 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			return 0;
-#line 2697 "GSettingsEngine.c"
+#line 2935 "GSettingsEngine.c"
 		} else {
-#line 205 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 218 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 205 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 218 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			g_clear_error (&_inner_error_);
-#line 205 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 218 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			return 0;
-#line 2705 "GSettingsEngine.c"
+#line 2943 "GSettingsEngine.c"
 		}
 	}
-#line 207 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 220 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp2_ = schema;
-#line 207 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 220 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp3_ = g_settings_new (_tmp2_);
-#line 207 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 220 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	schema_object = _tmp3_;
-#line 209 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 222 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp4_ = schema_object;
-#line 209 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 222 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp5_ = key;
-#line 209 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 222 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp6_ = g_settings_get_int (_tmp4_, _tmp5_);
-#line 209 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 222 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	result = _tmp6_;
-#line 209 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 222 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_g_object_unref0 (schema_object);
-#line 209 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 222 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	return result;
-#line 2726 "GSettingsEngine.c"
+#line 2964 "GSettingsEngine.c"
 }
 
 
@@ -2736,54 +2974,54 @@ static void gsettings_configuration_engine_set_gs_int (GSettingsConfigurationEng
 	const gchar* _tmp5_ = NULL;
 	gint _tmp6_ = 0;
 	GError * _inner_error_ = NULL;
-#line 212 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 225 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	g_return_if_fail (IS_GSETTINGS_CONFIGURATION_ENGINE (self));
-#line 212 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 225 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	g_return_if_fail (schema != NULL);
-#line 212 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 225 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	g_return_if_fail (key != NULL);
-#line 213 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 226 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp0_ = schema;
-#line 213 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 226 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp1_ = key;
-#line 213 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 226 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	gsettings_configuration_engine_check_key_valid (self, _tmp0_, _tmp1_, &_inner_error_);
-#line 213 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 226 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 213 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 226 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 213 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 226 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			g_propagate_error (error, _inner_error_);
-#line 213 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 226 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			return;
-#line 2760 "GSettingsEngine.c"
+#line 2998 "GSettingsEngine.c"
 		} else {
-#line 213 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 226 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 213 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 226 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			g_clear_error (&_inner_error_);
-#line 213 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 226 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			return;
-#line 2768 "GSettingsEngine.c"
+#line 3006 "GSettingsEngine.c"
 		}
 	}
-#line 215 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 228 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp2_ = schema;
-#line 215 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 228 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp3_ = g_settings_new (_tmp2_);
-#line 215 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 228 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	schema_object = _tmp3_;
-#line 217 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 230 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp4_ = schema_object;
-#line 217 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 230 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp5_ = key;
-#line 217 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 230 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp6_ = value;
-#line 217 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 230 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	g_settings_set_int (_tmp4_, _tmp5_, _tmp6_);
-#line 212 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 225 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_g_object_unref0 (schema_object);
-#line 2787 "GSettingsEngine.c"
+#line 3025 "GSettingsEngine.c"
 }
 
 
@@ -2798,56 +3036,56 @@ static gdouble gsettings_configuration_engine_get_gs_double (GSettingsConfigurat
 	const gchar* _tmp5_ = NULL;
 	gdouble _tmp6_ = 0.0;
 	GError * _inner_error_ = NULL;
-#line 220 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 233 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	g_return_val_if_fail (IS_GSETTINGS_CONFIGURATION_ENGINE (self), 0.0);
-#line 220 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 233 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	g_return_val_if_fail (schema != NULL, 0.0);
-#line 220 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 233 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	g_return_val_if_fail (key != NULL, 0.0);
-#line 221 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 234 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp0_ = schema;
-#line 221 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 234 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp1_ = key;
-#line 221 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 234 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	gsettings_configuration_engine_check_key_valid (self, _tmp0_, _tmp1_, &_inner_error_);
-#line 221 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 234 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 221 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 234 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 221 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 234 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			g_propagate_error (error, _inner_error_);
-#line 221 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 234 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			return 0.0;
-#line 2822 "GSettingsEngine.c"
+#line 3060 "GSettingsEngine.c"
 		} else {
-#line 221 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 234 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 221 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 234 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			g_clear_error (&_inner_error_);
-#line 221 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 234 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			return 0.0;
-#line 2830 "GSettingsEngine.c"
+#line 3068 "GSettingsEngine.c"
 		}
 	}
-#line 223 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 236 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp2_ = schema;
-#line 223 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 236 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp3_ = g_settings_new (_tmp2_);
-#line 223 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 236 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	schema_object = _tmp3_;
-#line 225 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 238 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp4_ = schema_object;
-#line 225 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 238 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp5_ = key;
-#line 225 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 238 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp6_ = g_settings_get_double (_tmp4_, _tmp5_);
-#line 225 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 238 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	result = _tmp6_;
-#line 225 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 238 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_g_object_unref0 (schema_object);
-#line 225 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 238 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	return result;
-#line 2851 "GSettingsEngine.c"
+#line 3089 "GSettingsEngine.c"
 }
 
 
@@ -2861,54 +3099,54 @@ static void gsettings_configuration_engine_set_gs_double (GSettingsConfiguration
 	const gchar* _tmp5_ = NULL;
 	gdouble _tmp6_ = 0.0;
 	GError * _inner_error_ = NULL;
-#line 228 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 241 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	g_return_if_fail (IS_GSETTINGS_CONFIGURATION_ENGINE (self));
-#line 228 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 241 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	g_return_if_fail (schema != NULL);
-#line 228 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 241 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	g_return_if_fail (key != NULL);
-#line 229 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 242 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp0_ = schema;
-#line 229 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 242 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp1_ = key;
-#line 229 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 242 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	gsettings_configuration_engine_check_key_valid (self, _tmp0_, _tmp1_, &_inner_error_);
-#line 229 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 242 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 229 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 242 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 229 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 242 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			g_propagate_error (error, _inner_error_);
-#line 229 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 242 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			return;
-#line 2885 "GSettingsEngine.c"
+#line 3123 "GSettingsEngine.c"
 		} else {
-#line 229 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 242 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 229 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 242 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			g_clear_error (&_inner_error_);
-#line 229 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 242 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			return;
-#line 2893 "GSettingsEngine.c"
+#line 3131 "GSettingsEngine.c"
 		}
 	}
-#line 231 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 244 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp2_ = schema;
-#line 231 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 244 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp3_ = g_settings_new (_tmp2_);
-#line 231 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 244 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	schema_object = _tmp3_;
-#line 233 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 246 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp4_ = schema_object;
-#line 233 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 246 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp5_ = key;
-#line 233 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 246 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp6_ = value;
-#line 233 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 246 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	g_settings_set_double (_tmp4_, _tmp5_, _tmp6_);
-#line 228 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 241 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_g_object_unref0 (schema_object);
-#line 2912 "GSettingsEngine.c"
+#line 3150 "GSettingsEngine.c"
 }
 
 
@@ -2923,56 +3161,56 @@ static gchar* gsettings_configuration_engine_get_gs_string (GSettingsConfigurati
 	const gchar* _tmp5_ = NULL;
 	gchar* _tmp6_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 236 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 249 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	g_return_val_if_fail (IS_GSETTINGS_CONFIGURATION_ENGINE (self), NULL);
-#line 236 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 249 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	g_return_val_if_fail (schema != NULL, NULL);
-#line 236 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 249 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	g_return_val_if_fail (key != NULL, NULL);
-#line 237 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 250 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp0_ = schema;
-#line 237 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 250 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp1_ = key;
-#line 237 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 250 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	gsettings_configuration_engine_check_key_valid (self, _tmp0_, _tmp1_, &_inner_error_);
-#line 237 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 250 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 237 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 250 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 237 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 250 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			g_propagate_error (error, _inner_error_);
-#line 237 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 250 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			return NULL;
-#line 2947 "GSettingsEngine.c"
+#line 3185 "GSettingsEngine.c"
 		} else {
-#line 237 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 250 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 237 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 250 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			g_clear_error (&_inner_error_);
-#line 237 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 250 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			return NULL;
-#line 2955 "GSettingsEngine.c"
+#line 3193 "GSettingsEngine.c"
 		}
 	}
-#line 239 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 252 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp2_ = schema;
-#line 239 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 252 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp3_ = g_settings_new (_tmp2_);
-#line 239 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 252 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	schema_object = _tmp3_;
-#line 241 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 254 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp4_ = schema_object;
-#line 241 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 254 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp5_ = key;
-#line 241 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 254 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp6_ = g_settings_get_string (_tmp4_, _tmp5_);
-#line 241 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 254 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	result = _tmp6_;
-#line 241 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 254 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_g_object_unref0 (schema_object);
-#line 241 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 254 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	return result;
-#line 2976 "GSettingsEngine.c"
+#line 3214 "GSettingsEngine.c"
 }
 
 
@@ -2986,56 +3224,56 @@ static void gsettings_configuration_engine_set_gs_string (GSettingsConfiguration
 	const gchar* _tmp5_ = NULL;
 	const gchar* _tmp6_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 244 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 257 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	g_return_if_fail (IS_GSETTINGS_CONFIGURATION_ENGINE (self));
-#line 244 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 257 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	g_return_if_fail (schema != NULL);
-#line 244 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 257 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	g_return_if_fail (key != NULL);
-#line 244 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 257 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	g_return_if_fail (value != NULL);
-#line 245 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 258 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp0_ = schema;
-#line 245 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 258 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp1_ = key;
-#line 245 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 258 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	gsettings_configuration_engine_check_key_valid (self, _tmp0_, _tmp1_, &_inner_error_);
-#line 245 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 258 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 245 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 258 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 245 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 258 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			g_propagate_error (error, _inner_error_);
-#line 245 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 258 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			return;
-#line 3012 "GSettingsEngine.c"
+#line 3250 "GSettingsEngine.c"
 		} else {
-#line 245 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 258 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 245 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 258 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			g_clear_error (&_inner_error_);
-#line 245 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 258 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			return;
-#line 3020 "GSettingsEngine.c"
+#line 3258 "GSettingsEngine.c"
 		}
 	}
-#line 247 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 260 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp2_ = schema;
-#line 247 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 260 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp3_ = g_settings_new (_tmp2_);
-#line 247 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 260 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	schema_object = _tmp3_;
-#line 249 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 262 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp4_ = schema_object;
-#line 249 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 262 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp5_ = key;
-#line 249 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 262 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp6_ = value;
-#line 249 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 262 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	g_settings_set_string (_tmp4_, _tmp5_, _tmp6_);
-#line 244 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 257 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_g_object_unref0 (schema_object);
-#line 3039 "GSettingsEngine.c"
+#line 3277 "GSettingsEngine.c"
 }
 
 
@@ -3048,52 +3286,52 @@ static void gsettings_configuration_engine_reset_gs_to_default (GSettingsConfigu
 	GSettings* _tmp4_ = NULL;
 	const gchar* _tmp5_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 252 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 265 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	g_return_if_fail (IS_GSETTINGS_CONFIGURATION_ENGINE (self));
-#line 252 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 265 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	g_return_if_fail (schema != NULL);
-#line 252 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 265 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	g_return_if_fail (key != NULL);
-#line 253 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 266 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp0_ = schema;
-#line 253 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 266 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp1_ = key;
-#line 253 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 266 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	gsettings_configuration_engine_check_key_valid (self, _tmp0_, _tmp1_, &_inner_error_);
-#line 253 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 266 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 253 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 266 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 253 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 266 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			g_propagate_error (error, _inner_error_);
-#line 253 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 266 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			return;
-#line 3072 "GSettingsEngine.c"
+#line 3310 "GSettingsEngine.c"
 		} else {
-#line 253 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 266 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 253 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 266 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			g_clear_error (&_inner_error_);
-#line 253 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 266 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			return;
-#line 3080 "GSettingsEngine.c"
+#line 3318 "GSettingsEngine.c"
 		}
 	}
-#line 255 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 268 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp2_ = schema;
-#line 255 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 268 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp3_ = g_settings_new (_tmp2_);
-#line 255 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 268 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	schema_object = _tmp3_;
-#line 257 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 270 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp4_ = schema_object;
-#line 257 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 270 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp5_ = key;
-#line 257 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 270 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	g_settings_reset (_tmp4_, _tmp5_);
-#line 252 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 265 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_g_object_unref0 (schema_object);
-#line 3097 "GSettingsEngine.c"
+#line 3335 "GSettingsEngine.c"
 }
 
 
@@ -3106,7 +3344,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 3110 "GSettingsEngine.c"
+#line 3348 "GSettingsEngine.c"
 	{
 		GRegex* regex = NULL;
 		const gchar* _tmp0_ = NULL;
@@ -3137,8 +3375,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 3141 "GSettingsEngine.c"
-				goto __catch189_g_regex_error;
+#line 3379 "GSettingsEngine.c"
+				goto __catch202_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);
@@ -3146,7 +3384,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 3150 "GSettingsEngine.c"
+#line 3388 "GSettingsEngine.c"
 		}
 #line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp6_ = regex;
@@ -3162,8 +3400,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 3166 "GSettingsEngine.c"
-				goto __catch189_g_regex_error;
+#line 3404 "GSettingsEngine.c"
+				goto __catch202_g_regex_error;
 			}
 #line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			_g_regex_unref0 (regex);
@@ -3173,7 +3411,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 3177 "GSettingsEngine.c"
+#line 3415 "GSettingsEngine.c"
 		}
 #line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp9_ = _tmp5_;
@@ -3187,10 +3425,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 3191 "GSettingsEngine.c"
+#line 3429 "GSettingsEngine.c"
 	}
-	goto __finally189;
-	__catch189_g_regex_error:
+	goto __finally202;
+	__catch202_g_regex_error:
 	{
 		GError* e = NULL;
 #line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -3201,9 +3439,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 3205 "GSettingsEngine.c"
+#line 3443 "GSettingsEngine.c"
 	}
-	__finally189:
+	__finally202:
 #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"
@@ -3212,7 +3450,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 3216 "GSettingsEngine.c"
+#line 3454 "GSettingsEngine.c"
 	}
 }
 
@@ -3236,7 +3474,7 @@ static gchar* string_strip (const gchar* self) {
 	result = _result_;
 #line 1210 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
-#line 3240 "GSettingsEngine.c"
+#line 3478 "GSettingsEngine.c"
 }
 
 
@@ -3251,49 +3489,49 @@ static gchar* gsettings_configuration_engine_clean_plugin_id (const gchar* id) {
 	const gchar* _tmp5_ = NULL;
 	gboolean _tmp6_ = FALSE;
 	gchar* _tmp8_ = NULL;
-#line 260 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 273 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	g_return_val_if_fail (id != NULL, NULL);
-#line 261 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 274 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp0_ = id;
-#line 261 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 274 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp1_ = string_replace (_tmp0_, "/", "-");
-#line 261 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 274 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	cleaned = _tmp1_;
-#line 262 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 275 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp2_ = cleaned;
-#line 262 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 275 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp3_ = string_strip (_tmp2_);
-#line 262 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 275 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_g_free0 (cleaned);
-#line 262 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 275 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	cleaned = _tmp3_;
-#line 264 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 277 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp5_ = cleaned;
-#line 264 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 277 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp6_ = is_string_empty (_tmp5_);
-#line 264 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 277 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	if (!_tmp6_) {
-#line 3277 "GSettingsEngine.c"
+#line 3515 "GSettingsEngine.c"
 		const gchar* _tmp7_ = NULL;
-#line 264 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 277 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp7_ = cleaned;
-#line 264 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 277 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp4_ = _tmp7_;
-#line 3283 "GSettingsEngine.c"
+#line 3521 "GSettingsEngine.c"
 	} else {
-#line 264 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 277 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp4_ = NULL;
-#line 3287 "GSettingsEngine.c"
+#line 3525 "GSettingsEngine.c"
 	}
-#line 264 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 277 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp8_ = g_strdup (_tmp4_);
-#line 264 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 277 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	result = _tmp8_;
-#line 264 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 277 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_g_free0 (cleaned);
-#line 264 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 277 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	return result;
-#line 3297 "GSettingsEngine.c"
+#line 3535 "GSettingsEngine.c"
 }
 
 
@@ -3307,49 +3545,49 @@ static gchar* gsettings_configuration_engine_get_plugin_enable_disable_name (con
 	gchar* _tmp5_ = NULL;
 	const gchar* _tmp6_ = NULL;
 	gchar* _tmp7_ = NULL;
-#line 267 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 280 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	g_return_val_if_fail (id != NULL, NULL);
-#line 268 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 281 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp0_ = id;
-#line 268 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 281 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp1_ = gsettings_configuration_engine_clean_plugin_id (_tmp0_);
-#line 268 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 281 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	cleaned_id = _tmp1_;
-#line 269 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 282 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp2_ = cleaned_id;
-#line 269 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 282 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	if (_tmp2_ == NULL) {
-#line 3323 "GSettingsEngine.c"
+#line 3561 "GSettingsEngine.c"
 		gchar* _tmp3_ = NULL;
-#line 270 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 283 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp3_ = g_strdup ("default");
-#line 270 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 283 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_g_free0 (cleaned_id);
-#line 270 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 283 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		cleaned_id = _tmp3_;
-#line 3331 "GSettingsEngine.c"
+#line 3569 "GSettingsEngine.c"
 	}
-#line 272 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 285 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp4_ = cleaned_id;
-#line 272 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 285 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp5_ = string_replace (_tmp4_, "org.yorba.shotwell.", "");
-#line 272 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 285 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_g_free0 (cleaned_id);
-#line 272 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 285 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	cleaned_id = _tmp5_;
-#line 273 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 286 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp6_ = cleaned_id;
-#line 273 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 286 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp7_ = string_replace (_tmp6_, ".", "-");
-#line 273 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 286 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_g_free0 (cleaned_id);
-#line 273 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 286 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	cleaned_id = _tmp7_;
-#line 275 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 288 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	result = cleaned_id;
-#line 275 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 288 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	return result;
-#line 3353 "GSettingsEngine.c"
+#line 3591 "GSettingsEngine.c"
 }
 
 
@@ -3364,51 +3602,51 @@ static gchar* gsettings_configuration_engine_make_plugin_schema_name (const gcha
 	const gchar* _tmp6_ = NULL;
 	const gchar* _tmp7_ = NULL;
 	gchar* _tmp8_ = NULL;
-#line 278 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 291 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	g_return_val_if_fail (domain != NULL, NULL);
-#line 278 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 291 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	g_return_val_if_fail (id != NULL, NULL);
-#line 279 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 292 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp0_ = id;
-#line 279 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 292 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp1_ = gsettings_configuration_engine_clean_plugin_id (_tmp0_);
-#line 279 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 292 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	cleaned_id = _tmp1_;
-#line 280 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 293 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp2_ = cleaned_id;
-#line 280 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 293 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	if (_tmp2_ == NULL) {
-#line 3382 "GSettingsEngine.c"
+#line 3620 "GSettingsEngine.c"
 		gchar* _tmp3_ = NULL;
-#line 281 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 294 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp3_ = g_strdup ("default");
-#line 281 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 294 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_g_free0 (cleaned_id);
-#line 281 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 294 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		cleaned_id = _tmp3_;
-#line 3390 "GSettingsEngine.c"
+#line 3628 "GSettingsEngine.c"
 	}
-#line 282 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 295 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp4_ = cleaned_id;
-#line 282 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 295 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp5_ = string_replace (_tmp4_, ".", "-");
-#line 282 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 295 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_g_free0 (cleaned_id);
-#line 282 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 295 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	cleaned_id = _tmp5_;
-#line 284 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 297 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp6_ = domain;
-#line 284 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 297 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp7_ = cleaned_id;
-#line 284 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 297 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp8_ = g_strdup_printf ("org.yorba.shotwell.%s.%s", _tmp6_, _tmp7_);
-#line 284 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 297 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	result = _tmp8_;
-#line 284 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 297 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_g_free0 (cleaned_id);
-#line 284 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 297 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	return result;
-#line 3412 "GSettingsEngine.c"
+#line 3650 "GSettingsEngine.c"
 }
 
 
@@ -3416,17 +3654,17 @@ static gchar* gsettings_configuration_engine_make_gsettings_key (const gchar* gc
 	gchar* result = NULL;
 	const gchar* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
-#line 287 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 300 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	g_return_val_if_fail (gconf_key != NULL, NULL);
-#line 288 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 301 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp0_ = gconf_key;
-#line 288 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 301 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp1_ = string_replace (_tmp0_, "_", "-");
-#line 288 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 301 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	result = _tmp1_;
-#line 288 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 301 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	return result;
-#line 3430 "GSettingsEngine.c"
+#line 3668 "GSettingsEngine.c"
 }
 
 
@@ -3434,15 +3672,140 @@ static gchar* gsettings_configuration_engine_real_get_name (ConfigurationEngine*
 	GSettingsConfigurationEngine * self;
 	gchar* result = NULL;
 	gchar* _tmp0_ = NULL;
-#line 291 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 304 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_GSETTINGS_CONFIGURATION_ENGINE, GSettingsConfigurationEngine);
-#line 292 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 305 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp0_ = g_strdup ("GSettings");
-#line 292 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 305 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	result = _tmp0_;
-#line 292 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 305 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+	return result;
+#line 3684 "GSettingsEngine.c"
+}
+
+
+static gint gsettings_configuration_engine_real_get_enum_property (ConfigurationEngine* base, ConfigurableProperty p, GError** error) {
+	GSettingsConfigurationEngine * self;
+	gint result = 0;
+	gint _tmp0_ = 0;
+	gchar** _tmp1_ = NULL;
+	gint _tmp1__length1 = 0;
+	ConfigurableProperty _tmp2_ = 0;
+	const gchar* _tmp3_ = NULL;
+	gchar** _tmp4_ = NULL;
+	gint _tmp4__length1 = 0;
+	ConfigurableProperty _tmp5_ = 0;
+	const gchar* _tmp6_ = NULL;
+	gint _tmp7_ = 0;
+	GError * _inner_error_ = NULL;
+#line 308 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_GSETTINGS_CONFIGURATION_ENGINE, GSettingsConfigurationEngine);
+#line 309 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+	_tmp1_ = self->priv->schema_names;
+#line 309 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+	_tmp1__length1 = self->priv->schema_names_length1;
+#line 309 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+	_tmp2_ = p;
+#line 309 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+	_tmp3_ = _tmp1_[_tmp2_];
+#line 309 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+	_tmp4_ = self->priv->key_names;
+#line 309 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+	_tmp4__length1 = self->priv->key_names_length1;
+#line 309 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+	_tmp5_ = p;
+#line 309 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+	_tmp6_ = _tmp4_[_tmp5_];
+#line 309 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+	_tmp7_ = gsettings_configuration_engine_get_gs_enum (self, _tmp3_, _tmp6_, &_inner_error_);
+#line 309 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+	_tmp0_ = _tmp7_;
+#line 309 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+	if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 309 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+		if (_inner_error_->domain == CONFIGURATION_ERROR) {
+#line 309 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+			g_propagate_error (error, _inner_error_);
+#line 309 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+			return 0;
+#line 3732 "GSettingsEngine.c"
+		} else {
+#line 309 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
+#line 309 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+			g_clear_error (&_inner_error_);
+#line 309 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+			return 0;
+#line 3740 "GSettingsEngine.c"
+		}
+	}
+#line 309 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+	result = _tmp0_;
+#line 309 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	return result;
-#line 3446 "GSettingsEngine.c"
+#line 3747 "GSettingsEngine.c"
+}
+
+
+static void gsettings_configuration_engine_real_set_enum_property (ConfigurationEngine* base, ConfigurableProperty p, gint val, GError** error) {
+	GSettingsConfigurationEngine * self;
+	gchar** _tmp0_ = NULL;
+	gint _tmp0__length1 = 0;
+	ConfigurableProperty _tmp1_ = 0;
+	const gchar* _tmp2_ = NULL;
+	gchar** _tmp3_ = NULL;
+	gint _tmp3__length1 = 0;
+	ConfigurableProperty _tmp4_ = 0;
+	const gchar* _tmp5_ = NULL;
+	gint _tmp6_ = 0;
+	ConfigurableProperty _tmp7_ = 0;
+	GError * _inner_error_ = NULL;
+#line 312 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_GSETTINGS_CONFIGURATION_ENGINE, GSettingsConfigurationEngine);
+#line 313 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+	_tmp0_ = self->priv->schema_names;
+#line 313 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+	_tmp0__length1 = self->priv->schema_names_length1;
+#line 313 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+	_tmp1_ = p;
+#line 313 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+	_tmp2_ = _tmp0_[_tmp1_];
+#line 313 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+	_tmp3_ = self->priv->key_names;
+#line 313 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+	_tmp3__length1 = self->priv->key_names_length1;
+#line 313 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+	_tmp4_ = p;
+#line 313 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+	_tmp5_ = _tmp3_[_tmp4_];
+#line 313 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+	_tmp6_ = val;
+#line 313 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+	gsettings_configuration_engine_set_gs_enum (self, _tmp2_, _tmp5_, _tmp6_, &_inner_error_);
+#line 313 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+	if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 313 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+		if (_inner_error_->domain == CONFIGURATION_ERROR) {
+#line 313 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+			g_propagate_error (error, _inner_error_);
+#line 313 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+			return;
+#line 3794 "GSettingsEngine.c"
+		} else {
+#line 313 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
+#line 313 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+			g_clear_error (&_inner_error_);
+#line 313 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+			return;
+#line 3802 "GSettingsEngine.c"
+		}
+	}
+#line 314 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+	_tmp7_ = p;
+#line 314 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+	g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CONFIGURATION_ENGINE, ConfigurationEngine), "property-changed", _tmp7_);
+#line 3809 "GSettingsEngine.c"
 }
 
 
@@ -3460,52 +3823,52 @@ static gint gsettings_configuration_engine_real_get_int_property (ConfigurationE
 	const gchar* _tmp6_ = NULL;
 	gint _tmp7_ = 0;
 	GError * _inner_error_ = NULL;
-#line 295 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 317 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_GSETTINGS_CONFIGURATION_ENGINE, GSettingsConfigurationEngine);
-#line 296 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 318 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp1_ = self->priv->schema_names;
-#line 296 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 318 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp1__length1 = self->priv->schema_names_length1;
-#line 296 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 318 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp2_ = p;
-#line 296 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 318 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp3_ = _tmp1_[_tmp2_];
-#line 296 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 318 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp4_ = self->priv->key_names;
-#line 296 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 318 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp4__length1 = self->priv->key_names_length1;
-#line 296 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 318 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp5_ = p;
-#line 296 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 318 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp6_ = _tmp4_[_tmp5_];
-#line 296 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 318 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp7_ = gsettings_configuration_engine_get_gs_int (self, _tmp3_, _tmp6_, &_inner_error_);
-#line 296 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 318 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp0_ = _tmp7_;
-#line 296 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 318 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 296 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 318 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 296 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 318 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			g_propagate_error (error, _inner_error_);
-#line 296 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 318 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			return 0;
-#line 3494 "GSettingsEngine.c"
+#line 3857 "GSettingsEngine.c"
 		} else {
-#line 296 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 318 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 296 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 318 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			g_clear_error (&_inner_error_);
-#line 296 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 318 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			return 0;
-#line 3502 "GSettingsEngine.c"
+#line 3865 "GSettingsEngine.c"
 		}
 	}
-#line 296 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 318 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	result = _tmp0_;
-#line 296 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 318 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	return result;
-#line 3509 "GSettingsEngine.c"
+#line 3872 "GSettingsEngine.c"
 }
 
 
@@ -3522,52 +3885,52 @@ static void gsettings_configuration_engine_real_set_int_property (ConfigurationE
 	gint _tmp6_ = 0;
 	ConfigurableProperty _tmp7_ = 0;
 	GError * _inner_error_ = NULL;
-#line 299 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 321 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_GSETTINGS_CONFIGURATION_ENGINE, GSettingsConfigurationEngine);
-#line 300 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 322 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp0_ = self->priv->schema_names;
-#line 300 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 322 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp0__length1 = self->priv->schema_names_length1;
-#line 300 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 322 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp1_ = p;
-#line 300 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 322 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp2_ = _tmp0_[_tmp1_];
-#line 300 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 322 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp3_ = self->priv->key_names;
-#line 300 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 322 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp3__length1 = self->priv->key_names_length1;
-#line 300 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 322 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp4_ = p;
-#line 300 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 322 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp5_ = _tmp3_[_tmp4_];
-#line 300 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 322 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp6_ = val;
-#line 300 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 322 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	gsettings_configuration_engine_set_gs_int (self, _tmp2_, _tmp5_, _tmp6_, &_inner_error_);
-#line 300 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 322 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 300 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 322 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 300 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 322 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			g_propagate_error (error, _inner_error_);
-#line 300 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 322 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			return;
-#line 3556 "GSettingsEngine.c"
+#line 3919 "GSettingsEngine.c"
 		} else {
-#line 300 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 322 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 300 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 322 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			g_clear_error (&_inner_error_);
-#line 300 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 322 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			return;
-#line 3564 "GSettingsEngine.c"
+#line 3927 "GSettingsEngine.c"
 		}
 	}
-#line 301 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 323 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp7_ = p;
-#line 301 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 323 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CONFIGURATION_ENGINE, ConfigurationEngine), "property-changed", _tmp7_);
-#line 3571 "GSettingsEngine.c"
+#line 3934 "GSettingsEngine.c"
 }
 
 
@@ -3590,7 +3953,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 3594 "GSettingsEngine.c"
+#line 3957 "GSettingsEngine.c"
 		glong _tmp4_ = 0L;
 #line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp4_ = maxlen;
@@ -3598,7 +3961,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 3602 "GSettingsEngine.c"
+#line 3965 "GSettingsEngine.c"
 	} else {
 		gchar* _tmp5_ = NULL;
 		gchar* _tmp6_ = NULL;
@@ -3610,7 +3973,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 3614 "GSettingsEngine.c"
+#line 3977 "GSettingsEngine.c"
 	}
 }
 
@@ -3634,21 +3997,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 3638 "GSettingsEngine.c"
+#line 4001 "GSettingsEngine.c"
 		glong _tmp2_ = 0L;
 #line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp2_ = len;
 #line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp0_ = _tmp2_ >= ((glong) 0);
-#line 3644 "GSettingsEngine.c"
+#line 4007 "GSettingsEngine.c"
 	} else {
 #line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp0_ = FALSE;
-#line 3648 "GSettingsEngine.c"
+#line 4011 "GSettingsEngine.c"
 	}
 #line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp0_) {
-#line 3652 "GSettingsEngine.c"
+#line 4015 "GSettingsEngine.c"
 		glong _tmp3_ = 0L;
 		glong _tmp4_ = 0L;
 		glong _tmp5_ = 0L;
@@ -3660,7 +4023,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 3664 "GSettingsEngine.c"
+#line 4027 "GSettingsEngine.c"
 	} else {
 		gint _tmp6_ = 0;
 		gint _tmp7_ = 0;
@@ -3670,13 +4033,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 3674 "GSettingsEngine.c"
+#line 4037 "GSettingsEngine.c"
 	}
 #line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp8_ = offset;
 #line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp8_ < ((glong) 0)) {
-#line 3680 "GSettingsEngine.c"
+#line 4043 "GSettingsEngine.c"
 		glong _tmp9_ = 0L;
 		glong _tmp10_ = 0L;
 		glong _tmp11_ = 0L;
@@ -3690,7 +4053,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 3694 "GSettingsEngine.c"
+#line 4057 "GSettingsEngine.c"
 	} else {
 		glong _tmp12_ = 0L;
 		glong _tmp13_ = 0L;
@@ -3700,13 +4063,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 3704 "GSettingsEngine.c"
+#line 4067 "GSettingsEngine.c"
 	}
 #line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp14_ = len;
 #line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp14_ < ((glong) 0)) {
-#line 3710 "GSettingsEngine.c"
+#line 4073 "GSettingsEngine.c"
 		glong _tmp15_ = 0L;
 		glong _tmp16_ = 0L;
 #line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -3715,7 +4078,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 3719 "GSettingsEngine.c"
+#line 4082 "GSettingsEngine.c"
 	}
 #line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp17_ = offset;
@@ -3735,7 +4098,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 3739 "GSettingsEngine.c"
+#line 4102 "GSettingsEngine.c"
 }
 
 
@@ -3756,72 +4119,72 @@ static gchar* gsettings_configuration_engine_real_get_string_property (Configura
 	gchar* _tmp7_ = NULL;
 	ConfigurableProperty _tmp8_ = 0;
 	GError * _inner_error_ = NULL;
-#line 304 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 326 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_GSETTINGS_CONFIGURATION_ENGINE, GSettingsConfigurationEngine);
-#line 305 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 327 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp0_ = self->priv->schema_names;
-#line 305 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 327 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp0__length1 = self->priv->schema_names_length1;
-#line 305 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 327 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp1_ = p;
-#line 305 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 327 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp2_ = _tmp0_[_tmp1_];
-#line 305 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 327 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp3_ = self->priv->key_names;
-#line 305 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 327 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp3__length1 = self->priv->key_names_length1;
-#line 305 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 327 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp4_ = p;
-#line 305 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 327 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp5_ = _tmp3_[_tmp4_];
-#line 305 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 327 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp6_ = gsettings_configuration_engine_get_gs_string (self, _tmp2_, _tmp5_, &_inner_error_);
-#line 305 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 327 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	gs_result = _tmp6_;
-#line 305 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 327 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 305 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 327 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 305 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 327 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			g_propagate_error (error, _inner_error_);
-#line 305 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 327 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			return NULL;
-#line 3790 "GSettingsEngine.c"
+#line 4153 "GSettingsEngine.c"
 		} else {
-#line 305 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 327 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 305 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 327 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			g_clear_error (&_inner_error_);
-#line 305 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 327 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			return NULL;
-#line 3798 "GSettingsEngine.c"
+#line 4161 "GSettingsEngine.c"
 		}
 	}
-#line 309 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 331 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp7_ = g_strdup (gs_result);
-#line 309 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 331 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_result_ = _tmp7_;
-#line 310 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 332 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp8_ = p;
-#line 310 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 332 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	if (_tmp8_ == CONFIGURABLE_PROPERTY_DESKTOP_BACKGROUND_FILE) {
-#line 3809 "GSettingsEngine.c"
+#line 4172 "GSettingsEngine.c"
 		gchar* _tmp9_ = NULL;
-#line 311 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 333 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp9_ = string_substring (gs_result, (glong) 7, (glong) -1);
-#line 311 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 333 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_g_free0 (_result_);
-#line 311 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 333 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_result_ = _tmp9_;
-#line 3817 "GSettingsEngine.c"
+#line 4180 "GSettingsEngine.c"
 	}
-#line 314 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 336 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	result = _result_;
-#line 314 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 336 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_g_free0 (gs_result);
-#line 314 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 336 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	return result;
-#line 3825 "GSettingsEngine.c"
+#line 4188 "GSettingsEngine.c"
 }
 
 
@@ -3843,96 +4206,96 @@ static void gsettings_configuration_engine_real_set_string_property (Configurati
 	const gchar* _tmp13_ = NULL;
 	ConfigurableProperty _tmp14_ = 0;
 	GError * _inner_error_ = NULL;
-#line 317 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 339 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_GSETTINGS_CONFIGURATION_ENGINE, GSettingsConfigurationEngine);
-#line 317 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 339 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	g_return_if_fail (val != NULL);
-#line 319 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 341 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp0_ = val;
-#line 319 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 341 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 319 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 341 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	converted_val = _tmp1_;
-#line 320 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 342 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp3_ = p;
-#line 320 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 342 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	if (_tmp3_ == CONFIGURABLE_PROPERTY_DESKTOP_BACKGROUND_FILE) {
-#line 320 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 342 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp2_ = TRUE;
-#line 3863 "GSettingsEngine.c"
+#line 4226 "GSettingsEngine.c"
 	} else {
 		ConfigurableProperty _tmp4_ = 0;
-#line 321 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 343 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp4_ = p;
-#line 321 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 343 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp2_ = _tmp4_ == CONFIGURABLE_PROPERTY_SCREENSAVER_FILE;
-#line 3870 "GSettingsEngine.c"
+#line 4233 "GSettingsEngine.c"
 	}
-#line 320 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 342 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	if (_tmp2_) {
-#line 3874 "GSettingsEngine.c"
+#line 4237 "GSettingsEngine.c"
 		const gchar* _tmp5_ = NULL;
 		gchar* _tmp6_ = NULL;
-#line 322 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 344 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp5_ = val;
-#line 322 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 344 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp6_ = g_strconcat ("file://", _tmp5_, NULL);
-#line 322 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 344 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_g_free0 (converted_val);
-#line 322 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 344 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		converted_val = _tmp6_;
-#line 3885 "GSettingsEngine.c"
+#line 4248 "GSettingsEngine.c"
 	}
-#line 325 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 347 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp7_ = self->priv->schema_names;
-#line 325 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 347 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp7__length1 = self->priv->schema_names_length1;
-#line 325 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 347 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp8_ = p;
-#line 325 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 347 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp9_ = _tmp7_[_tmp8_];
-#line 325 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 347 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp10_ = self->priv->key_names;
-#line 325 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 347 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp10__length1 = self->priv->key_names_length1;
-#line 325 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 347 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp11_ = p;
-#line 325 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 347 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp12_ = _tmp10_[_tmp11_];
-#line 325 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 347 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp13_ = converted_val;
-#line 325 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 347 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	gsettings_configuration_engine_set_gs_string (self, _tmp9_, _tmp12_, _tmp13_, &_inner_error_);
-#line 325 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 347 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 325 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 347 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 325 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 347 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			g_propagate_error (error, _inner_error_);
-#line 325 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 347 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			_g_free0 (converted_val);
-#line 325 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 347 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			return;
-#line 3917 "GSettingsEngine.c"
+#line 4280 "GSettingsEngine.c"
 		} else {
-#line 325 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 347 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			_g_free0 (converted_val);
-#line 325 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 347 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 325 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 347 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			g_clear_error (&_inner_error_);
-#line 325 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 347 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			return;
-#line 3927 "GSettingsEngine.c"
+#line 4290 "GSettingsEngine.c"
 		}
 	}
-#line 326 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 348 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp14_ = p;
-#line 326 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 348 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CONFIGURATION_ENGINE, ConfigurationEngine), "property-changed", _tmp14_);
-#line 317 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 339 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_g_free0 (converted_val);
-#line 3936 "GSettingsEngine.c"
+#line 4299 "GSettingsEngine.c"
 }
 
 
@@ -3950,52 +4313,52 @@ static gboolean gsettings_configuration_engine_real_get_bool_property (Configura
 	const gchar* _tmp6_ = NULL;
 	gboolean _tmp7_ = FALSE;
 	GError * _inner_error_ = NULL;
-#line 329 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 351 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_GSETTINGS_CONFIGURATION_ENGINE, GSettingsConfigurationEngine);
-#line 330 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 352 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp1_ = self->priv->schema_names;
-#line 330 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 352 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp1__length1 = self->priv->schema_names_length1;
-#line 330 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 352 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp2_ = p;
-#line 330 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 352 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp3_ = _tmp1_[_tmp2_];
-#line 330 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 352 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp4_ = self->priv->key_names;
-#line 330 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 352 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp4__length1 = self->priv->key_names_length1;
-#line 330 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 352 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp5_ = p;
-#line 330 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 352 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp6_ = _tmp4_[_tmp5_];
-#line 330 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 352 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp7_ = gsettings_configuration_engine_get_gs_bool (self, _tmp3_, _tmp6_, &_inner_error_);
-#line 330 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 352 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp0_ = _tmp7_;
-#line 330 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 352 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 330 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 352 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 330 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 352 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			g_propagate_error (error, _inner_error_);
-#line 330 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 352 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			return FALSE;
-#line 3984 "GSettingsEngine.c"
+#line 4347 "GSettingsEngine.c"
 		} else {
-#line 330 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 352 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 330 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 352 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			g_clear_error (&_inner_error_);
-#line 330 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 352 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			return FALSE;
-#line 3992 "GSettingsEngine.c"
+#line 4355 "GSettingsEngine.c"
 		}
 	}
-#line 330 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 352 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	result = _tmp0_;
-#line 330 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 352 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	return result;
-#line 3999 "GSettingsEngine.c"
+#line 4362 "GSettingsEngine.c"
 }
 
 
@@ -4012,52 +4375,52 @@ static void gsettings_configuration_engine_real_set_bool_property (Configuration
 	gboolean _tmp6_ = FALSE;
 	ConfigurableProperty _tmp7_ = 0;
 	GError * _inner_error_ = NULL;
-#line 333 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 355 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_GSETTINGS_CONFIGURATION_ENGINE, GSettingsConfigurationEngine);
-#line 334 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 356 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp0_ = self->priv->schema_names;
-#line 334 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 356 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp0__length1 = self->priv->schema_names_length1;
-#line 334 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 356 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp1_ = p;
-#line 334 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 356 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp2_ = _tmp0_[_tmp1_];
-#line 334 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 356 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp3_ = self->priv->key_names;
-#line 334 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 356 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp3__length1 = self->priv->key_names_length1;
-#line 334 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 356 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp4_ = p;
-#line 334 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 356 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp5_ = _tmp3_[_tmp4_];
-#line 334 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 356 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp6_ = val;
-#line 334 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 356 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	gsettings_configuration_engine_set_gs_bool (self, _tmp2_, _tmp5_, _tmp6_, &_inner_error_);
-#line 334 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 356 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 334 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 356 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 334 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 356 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			g_propagate_error (error, _inner_error_);
-#line 334 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 356 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			return;
-#line 4046 "GSettingsEngine.c"
+#line 4409 "GSettingsEngine.c"
 		} else {
-#line 334 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 356 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 334 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 356 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			g_clear_error (&_inner_error_);
-#line 334 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 356 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			return;
-#line 4054 "GSettingsEngine.c"
+#line 4417 "GSettingsEngine.c"
 		}
 	}
-#line 335 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 357 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp7_ = p;
-#line 335 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 357 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CONFIGURATION_ENGINE, ConfigurationEngine), "property-changed", _tmp7_);
-#line 4061 "GSettingsEngine.c"
+#line 4424 "GSettingsEngine.c"
 }
 
 
@@ -4075,52 +4438,52 @@ static gdouble gsettings_configuration_engine_real_get_double_property (Configur
 	const gchar* _tmp6_ = NULL;
 	gdouble _tmp7_ = 0.0;
 	GError * _inner_error_ = NULL;
-#line 338 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 360 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_GSETTINGS_CONFIGURATION_ENGINE, GSettingsConfigurationEngine);
-#line 339 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 361 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp1_ = self->priv->schema_names;
-#line 339 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 361 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp1__length1 = self->priv->schema_names_length1;
-#line 339 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 361 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp2_ = p;
-#line 339 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 361 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp3_ = _tmp1_[_tmp2_];
-#line 339 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 361 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp4_ = self->priv->key_names;
-#line 339 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 361 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp4__length1 = self->priv->key_names_length1;
-#line 339 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 361 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp5_ = p;
-#line 339 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 361 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp6_ = _tmp4_[_tmp5_];
-#line 339 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 361 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp7_ = gsettings_configuration_engine_get_gs_double (self, _tmp3_, _tmp6_, &_inner_error_);
-#line 339 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 361 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp0_ = _tmp7_;
-#line 339 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 361 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 339 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 361 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 339 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 361 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			g_propagate_error (error, _inner_error_);
-#line 339 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 361 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			return 0.0;
-#line 4109 "GSettingsEngine.c"
+#line 4472 "GSettingsEngine.c"
 		} else {
-#line 339 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 361 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 339 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 361 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			g_clear_error (&_inner_error_);
-#line 339 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 361 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			return 0.0;
-#line 4117 "GSettingsEngine.c"
+#line 4480 "GSettingsEngine.c"
 		}
 	}
-#line 339 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 361 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	result = _tmp0_;
-#line 339 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 361 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	return result;
-#line 4124 "GSettingsEngine.c"
+#line 4487 "GSettingsEngine.c"
 }
 
 
@@ -4137,52 +4500,52 @@ static void gsettings_configuration_engine_real_set_double_property (Configurati
 	gdouble _tmp6_ = 0.0;
 	ConfigurableProperty _tmp7_ = 0;
 	GError * _inner_error_ = NULL;
-#line 342 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 364 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_GSETTINGS_CONFIGURATION_ENGINE, GSettingsConfigurationEngine);
-#line 343 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 365 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp0_ = self->priv->schema_names;
-#line 343 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 365 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp0__length1 = self->priv->schema_names_length1;
-#line 343 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 365 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp1_ = p;
-#line 343 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 365 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp2_ = _tmp0_[_tmp1_];
-#line 343 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 365 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp3_ = self->priv->key_names;
-#line 343 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 365 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp3__length1 = self->priv->key_names_length1;
-#line 343 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 365 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp4_ = p;
-#line 343 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 365 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp5_ = _tmp3_[_tmp4_];
-#line 343 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 365 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp6_ = val;
-#line 343 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 365 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	gsettings_configuration_engine_set_gs_double (self, _tmp2_, _tmp5_, _tmp6_, &_inner_error_);
-#line 343 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 365 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 343 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 365 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 343 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 365 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			g_propagate_error (error, _inner_error_);
-#line 343 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 365 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			return;
-#line 4171 "GSettingsEngine.c"
+#line 4534 "GSettingsEngine.c"
 		} else {
-#line 343 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 365 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 343 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 365 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			g_clear_error (&_inner_error_);
-#line 343 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 365 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			return;
-#line 4179 "GSettingsEngine.c"
+#line 4542 "GSettingsEngine.c"
 		}
 	}
-#line 344 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 366 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp7_ = p;
-#line 344 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 366 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CONFIGURATION_ENGINE, ConfigurationEngine), "property-changed", _tmp7_);
-#line 4186 "GSettingsEngine.c"
+#line 4549 "GSettingsEngine.c"
 }
 
 
@@ -4194,23 +4557,23 @@ static gboolean gsettings_configuration_engine_real_get_plugin_bool (Configurati
 	const gchar* _tmp1_ = NULL;
 	gchar* _tmp2_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 347 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 369 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_GSETTINGS_CONFIGURATION_ENGINE, GSettingsConfigurationEngine);
-#line 347 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 369 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	g_return_val_if_fail (domain != NULL, FALSE);
-#line 347 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 369 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	g_return_val_if_fail (id != NULL, FALSE);
-#line 347 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 369 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	g_return_val_if_fail (key != NULL, FALSE);
-#line 348 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 370 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp0_ = domain;
-#line 348 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 370 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp1_ = id;
-#line 348 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 370 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp2_ = gsettings_configuration_engine_make_plugin_schema_name (_tmp0_, _tmp1_);
-#line 348 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 370 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	schema_name = _tmp2_;
-#line 4214 "GSettingsEngine.c"
+#line 4577 "GSettingsEngine.c"
 	{
 		gboolean _tmp3_ = FALSE;
 		const gchar* _tmp4_ = NULL;
@@ -4218,84 +4581,84 @@ static gboolean gsettings_configuration_engine_real_get_plugin_bool (Configurati
 		gchar* _tmp6_ = NULL;
 		gboolean _tmp7_ = FALSE;
 		gboolean _tmp8_ = FALSE;
-#line 351 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 373 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp4_ = key;
-#line 351 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 373 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp5_ = gsettings_configuration_engine_make_gsettings_key (_tmp4_);
-#line 351 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 373 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp6_ = _tmp5_;
-#line 351 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 373 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp7_ = gsettings_configuration_engine_get_gs_bool (self, schema_name, _tmp6_, &_inner_error_);
-#line 351 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 373 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp8_ = _tmp7_;
-#line 351 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 373 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_g_free0 (_tmp6_);
-#line 351 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 373 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp3_ = _tmp8_;
-#line 351 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 373 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 351 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 373 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 4240 "GSettingsEngine.c"
-				goto __catch190_configuration_error;
+#line 4603 "GSettingsEngine.c"
+				goto __catch203_configuration_error;
 			}
-#line 351 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 373 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			_g_free0 (schema_name);
-#line 351 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 373 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			g_critical ("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 351 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 373 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			g_clear_error (&_inner_error_);
-#line 351 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 373 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			return FALSE;
-#line 4251 "GSettingsEngine.c"
+#line 4614 "GSettingsEngine.c"
 		}
-#line 351 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 373 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		result = _tmp3_;
-#line 351 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 373 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_g_free0 (schema_name);
-#line 351 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 373 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		return result;
-#line 4259 "GSettingsEngine.c"
+#line 4622 "GSettingsEngine.c"
 	}
-	goto __finally190;
-	__catch190_configuration_error:
+	goto __finally203;
+	__catch203_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp9_ = NULL;
 		const gchar* _tmp10_ = NULL;
 		gboolean _tmp11_ = FALSE;
-#line 350 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 372 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		err = _inner_error_;
-#line 350 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 372 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_inner_error_ = NULL;
-#line 353 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 375 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp9_ = err;
-#line 353 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 375 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp10_ = _tmp9_->message;
-#line 353 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-		g_critical ("GSettingsEngine.vala:353: GSettingsConfigurationEngine: error: %s", _tmp10_);
-#line 354 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 375 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+		g_critical ("GSettingsEngine.vala:375: GSettingsConfigurationEngine: error: %s", _tmp10_);
+#line 376 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp11_ = def;
-#line 354 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 376 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		result = _tmp11_;
-#line 354 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 376 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_g_error_free0 (err);
-#line 354 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 376 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_g_free0 (schema_name);
-#line 354 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 376 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		return result;
-#line 4288 "GSettingsEngine.c"
+#line 4651 "GSettingsEngine.c"
 	}
-	__finally190:
-#line 350 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+	__finally203:
+#line 372 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_g_free0 (schema_name);
-#line 350 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 372 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 350 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 372 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	g_clear_error (&_inner_error_);
-#line 350 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 372 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	return FALSE;
-#line 4299 "GSettingsEngine.c"
+#line 4662 "GSettingsEngine.c"
 }
 
 
@@ -4306,94 +4669,94 @@ static void gsettings_configuration_engine_real_set_plugin_bool (ConfigurationEn
 	const gchar* _tmp1_ = NULL;
 	gchar* _tmp2_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 358 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 380 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_GSETTINGS_CONFIGURATION_ENGINE, GSettingsConfigurationEngine);
-#line 358 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 380 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	g_return_if_fail (domain != NULL);
-#line 358 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 380 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	g_return_if_fail (id != NULL);
-#line 358 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 380 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	g_return_if_fail (key != NULL);
-#line 359 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 381 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp0_ = domain;
-#line 359 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 381 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp1_ = id;
-#line 359 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 381 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp2_ = gsettings_configuration_engine_make_plugin_schema_name (_tmp0_, _tmp1_);
-#line 359 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 381 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	schema_name = _tmp2_;
-#line 4326 "GSettingsEngine.c"
+#line 4689 "GSettingsEngine.c"
 	{
 		const gchar* _tmp3_ = NULL;
 		gchar* _tmp4_ = NULL;
 		gchar* _tmp5_ = NULL;
 		gboolean _tmp6_ = FALSE;
-#line 362 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 384 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp3_ = key;
-#line 362 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 384 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp4_ = gsettings_configuration_engine_make_gsettings_key (_tmp3_);
-#line 362 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 384 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp5_ = _tmp4_;
-#line 362 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 384 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp6_ = val;
-#line 362 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 384 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		gsettings_configuration_engine_set_gs_bool (self, schema_name, _tmp5_, _tmp6_, &_inner_error_);
-#line 362 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 384 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_g_free0 (_tmp5_);
-#line 362 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 384 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 362 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 384 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 4348 "GSettingsEngine.c"
-				goto __catch191_configuration_error;
+#line 4711 "GSettingsEngine.c"
+				goto __catch204_configuration_error;
 			}
-#line 362 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 384 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			_g_free0 (schema_name);
-#line 362 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 384 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			g_critical ("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 362 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 384 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			g_clear_error (&_inner_error_);
-#line 362 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 384 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			return;
-#line 4359 "GSettingsEngine.c"
+#line 4722 "GSettingsEngine.c"
 		}
 	}
-	goto __finally191;
-	__catch191_configuration_error:
+	goto __finally204;
+	__catch204_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp7_ = NULL;
 		const gchar* _tmp8_ = NULL;
-#line 361 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 383 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		err = _inner_error_;
-#line 361 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 383 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_inner_error_ = NULL;
-#line 364 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 386 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp7_ = err;
-#line 364 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 386 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp8_ = _tmp7_->message;
-#line 364 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-		g_critical ("GSettingsEngine.vala:364: GSettingsConfigurationEngine: error: %s", _tmp8_);
-#line 361 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 386 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+		g_critical ("GSettingsEngine.vala:386: GSettingsConfigurationEngine: error: %s", _tmp8_);
+#line 383 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_g_error_free0 (err);
-#line 4380 "GSettingsEngine.c"
+#line 4743 "GSettingsEngine.c"
 	}
-	__finally191:
-#line 361 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+	__finally204:
+#line 383 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 361 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 383 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_g_free0 (schema_name);
-#line 361 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 383 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 361 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 383 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		g_clear_error (&_inner_error_);
-#line 361 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 383 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		return;
-#line 4393 "GSettingsEngine.c"
+#line 4756 "GSettingsEngine.c"
 	}
-#line 358 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 380 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_g_free0 (schema_name);
-#line 4397 "GSettingsEngine.c"
+#line 4760 "GSettingsEngine.c"
 }
 
 
@@ -4405,23 +4768,23 @@ static gdouble gsettings_configuration_engine_real_get_plugin_double (Configurat
 	const gchar* _tmp1_ = NULL;
 	gchar* _tmp2_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 368 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 390 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_GSETTINGS_CONFIGURATION_ENGINE, GSettingsConfigurationEngine);
-#line 368 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 390 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	g_return_val_if_fail (domain != NULL, 0.0);
-#line 368 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 390 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	g_return_val_if_fail (id != NULL, 0.0);
-#line 368 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 390 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	g_return_val_if_fail (key != NULL, 0.0);
-#line 369 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 391 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp0_ = domain;
-#line 369 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 391 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp1_ = id;
-#line 369 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 391 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp2_ = gsettings_configuration_engine_make_plugin_schema_name (_tmp0_, _tmp1_);
-#line 369 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 391 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	schema_name = _tmp2_;
-#line 4425 "GSettingsEngine.c"
+#line 4788 "GSettingsEngine.c"
 	{
 		gdouble _tmp3_ = 0.0;
 		const gchar* _tmp4_ = NULL;
@@ -4429,84 +4792,84 @@ static gdouble gsettings_configuration_engine_real_get_plugin_double (Configurat
 		gchar* _tmp6_ = NULL;
 		gdouble _tmp7_ = 0.0;
 		gdouble _tmp8_ = 0.0;
-#line 372 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 394 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp4_ = key;
-#line 372 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 394 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp5_ = gsettings_configuration_engine_make_gsettings_key (_tmp4_);
-#line 372 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 394 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp6_ = _tmp5_;
-#line 372 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 394 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp7_ = gsettings_configuration_engine_get_gs_double (self, schema_name, _tmp6_, &_inner_error_);
-#line 372 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 394 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp8_ = _tmp7_;
-#line 372 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 394 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_g_free0 (_tmp6_);
-#line 372 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 394 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp3_ = _tmp8_;
-#line 372 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 394 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 372 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 394 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 4451 "GSettingsEngine.c"
-				goto __catch192_configuration_error;
+#line 4814 "GSettingsEngine.c"
+				goto __catch205_configuration_error;
 			}
-#line 372 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 394 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			_g_free0 (schema_name);
-#line 372 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 394 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			g_critical ("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 372 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 394 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			g_clear_error (&_inner_error_);
-#line 372 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 394 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			return 0.0;
-#line 4462 "GSettingsEngine.c"
+#line 4825 "GSettingsEngine.c"
 		}
-#line 372 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 394 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		result = _tmp3_;
-#line 372 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 394 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_g_free0 (schema_name);
-#line 372 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 394 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		return result;
-#line 4470 "GSettingsEngine.c"
+#line 4833 "GSettingsEngine.c"
 	}
-	goto __finally192;
-	__catch192_configuration_error:
+	goto __finally205;
+	__catch205_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp9_ = NULL;
 		const gchar* _tmp10_ = NULL;
 		gdouble _tmp11_ = 0.0;
-#line 371 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 393 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		err = _inner_error_;
-#line 371 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 393 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_inner_error_ = NULL;
-#line 374 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 396 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp9_ = err;
-#line 374 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 396 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp10_ = _tmp9_->message;
-#line 374 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-		g_critical ("GSettingsEngine.vala:374: GSettingsConfigurationEngine: error: %s", _tmp10_);
-#line 375 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 396 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+		g_critical ("GSettingsEngine.vala:396: GSettingsConfigurationEngine: error: %s", _tmp10_);
+#line 397 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp11_ = def;
-#line 375 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 397 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		result = _tmp11_;
-#line 375 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 397 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_g_error_free0 (err);
-#line 375 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 397 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_g_free0 (schema_name);
-#line 375 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 397 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		return result;
-#line 4499 "GSettingsEngine.c"
+#line 4862 "GSettingsEngine.c"
 	}
-	__finally192:
-#line 371 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+	__finally205:
+#line 393 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_g_free0 (schema_name);
-#line 371 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 393 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 371 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 393 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	g_clear_error (&_inner_error_);
-#line 371 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 393 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	return 0.0;
-#line 4510 "GSettingsEngine.c"
+#line 4873 "GSettingsEngine.c"
 }
 
 
@@ -4517,94 +4880,94 @@ static void gsettings_configuration_engine_real_set_plugin_double (Configuration
 	const gchar* _tmp1_ = NULL;
 	gchar* _tmp2_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 379 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 401 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_GSETTINGS_CONFIGURATION_ENGINE, GSettingsConfigurationEngine);
-#line 379 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 401 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	g_return_if_fail (domain != NULL);
-#line 379 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 401 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	g_return_if_fail (id != NULL);
-#line 379 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 401 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	g_return_if_fail (key != NULL);
-#line 380 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 402 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp0_ = domain;
-#line 380 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 402 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp1_ = id;
-#line 380 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 402 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp2_ = gsettings_configuration_engine_make_plugin_schema_name (_tmp0_, _tmp1_);
-#line 380 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 402 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	schema_name = _tmp2_;
-#line 4537 "GSettingsEngine.c"
+#line 4900 "GSettingsEngine.c"
 	{
 		const gchar* _tmp3_ = NULL;
 		gchar* _tmp4_ = NULL;
 		gchar* _tmp5_ = NULL;
 		gdouble _tmp6_ = 0.0;
-#line 383 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 405 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp3_ = key;
-#line 383 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 405 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp4_ = gsettings_configuration_engine_make_gsettings_key (_tmp3_);
-#line 383 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 405 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp5_ = _tmp4_;
-#line 383 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 405 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp6_ = val;
-#line 383 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 405 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		gsettings_configuration_engine_set_gs_double (self, schema_name, _tmp5_, _tmp6_, &_inner_error_);
-#line 383 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 405 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_g_free0 (_tmp5_);
-#line 383 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 405 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 383 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 405 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 4559 "GSettingsEngine.c"
-				goto __catch193_configuration_error;
+#line 4922 "GSettingsEngine.c"
+				goto __catch206_configuration_error;
 			}
-#line 383 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 405 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			_g_free0 (schema_name);
-#line 383 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 405 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			g_critical ("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 383 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 405 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			g_clear_error (&_inner_error_);
-#line 383 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 405 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			return;
-#line 4570 "GSettingsEngine.c"
+#line 4933 "GSettingsEngine.c"
 		}
 	}
-	goto __finally193;
-	__catch193_configuration_error:
+	goto __finally206;
+	__catch206_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp7_ = NULL;
 		const gchar* _tmp8_ = NULL;
-#line 382 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 404 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		err = _inner_error_;
-#line 382 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 404 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_inner_error_ = NULL;
-#line 385 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 407 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp7_ = err;
-#line 385 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 407 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp8_ = _tmp7_->message;
-#line 385 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-		g_critical ("GSettingsEngine.vala:385: GSettingsConfigurationEngine: error: %s", _tmp8_);
-#line 382 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 407 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+		g_critical ("GSettingsEngine.vala:407: GSettingsConfigurationEngine: error: %s", _tmp8_);
+#line 404 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_g_error_free0 (err);
-#line 4591 "GSettingsEngine.c"
+#line 4954 "GSettingsEngine.c"
 	}
-	__finally193:
-#line 382 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+	__finally206:
+#line 404 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 382 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 404 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_g_free0 (schema_name);
-#line 382 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 404 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 382 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 404 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		g_clear_error (&_inner_error_);
-#line 382 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 404 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		return;
-#line 4604 "GSettingsEngine.c"
+#line 4967 "GSettingsEngine.c"
 	}
-#line 379 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 401 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_g_free0 (schema_name);
-#line 4608 "GSettingsEngine.c"
+#line 4971 "GSettingsEngine.c"
 }
 
 
@@ -4616,23 +4979,23 @@ static gint gsettings_configuration_engine_real_get_plugin_int (ConfigurationEng
 	const gchar* _tmp1_ = NULL;
 	gchar* _tmp2_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 389 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 411 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_GSETTINGS_CONFIGURATION_ENGINE, GSettingsConfigurationEngine);
-#line 389 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 411 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	g_return_val_if_fail (domain != NULL, 0);
-#line 389 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 411 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	g_return_val_if_fail (id != NULL, 0);
-#line 389 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 411 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	g_return_val_if_fail (key != NULL, 0);
-#line 390 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 412 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp0_ = domain;
-#line 390 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 412 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp1_ = id;
-#line 390 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 412 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp2_ = gsettings_configuration_engine_make_plugin_schema_name (_tmp0_, _tmp1_);
-#line 390 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 412 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	schema_name = _tmp2_;
-#line 4636 "GSettingsEngine.c"
+#line 4999 "GSettingsEngine.c"
 	{
 		gint _tmp3_ = 0;
 		const gchar* _tmp4_ = NULL;
@@ -4640,84 +5003,84 @@ static gint gsettings_configuration_engine_real_get_plugin_int (ConfigurationEng
 		gchar* _tmp6_ = NULL;
 		gint _tmp7_ = 0;
 		gint _tmp8_ = 0;
-#line 393 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 415 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp4_ = key;
-#line 393 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 415 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp5_ = gsettings_configuration_engine_make_gsettings_key (_tmp4_);
-#line 393 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 415 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp6_ = _tmp5_;
-#line 393 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 415 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp7_ = gsettings_configuration_engine_get_gs_int (self, schema_name, _tmp6_, &_inner_error_);
-#line 393 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 415 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp8_ = _tmp7_;
-#line 393 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 415 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_g_free0 (_tmp6_);
-#line 393 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 415 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp3_ = _tmp8_;
-#line 393 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 415 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 393 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 415 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 4662 "GSettingsEngine.c"
-				goto __catch194_configuration_error;
+#line 5025 "GSettingsEngine.c"
+				goto __catch207_configuration_error;
 			}
-#line 393 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 415 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			_g_free0 (schema_name);
-#line 393 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 415 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			g_critical ("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 393 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 415 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			g_clear_error (&_inner_error_);
-#line 393 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 415 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			return 0;
-#line 4673 "GSettingsEngine.c"
+#line 5036 "GSettingsEngine.c"
 		}
-#line 393 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 415 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		result = _tmp3_;
-#line 393 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 415 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_g_free0 (schema_name);
-#line 393 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 415 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		return result;
-#line 4681 "GSettingsEngine.c"
+#line 5044 "GSettingsEngine.c"
 	}
-	goto __finally194;
-	__catch194_configuration_error:
+	goto __finally207;
+	__catch207_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp9_ = NULL;
 		const gchar* _tmp10_ = NULL;
 		gint _tmp11_ = 0;
-#line 392 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 414 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		err = _inner_error_;
-#line 392 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 414 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_inner_error_ = NULL;
-#line 395 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 417 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp9_ = err;
-#line 395 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 417 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp10_ = _tmp9_->message;
-#line 395 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-		g_critical ("GSettingsEngine.vala:395: GSettingsConfigurationEngine: error: %s", _tmp10_);
-#line 396 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 417 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+		g_critical ("GSettingsEngine.vala:417: GSettingsConfigurationEngine: error: %s", _tmp10_);
+#line 418 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp11_ = def;
-#line 396 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 418 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		result = _tmp11_;
-#line 396 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 418 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_g_error_free0 (err);
-#line 396 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 418 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_g_free0 (schema_name);
-#line 396 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 418 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		return result;
-#line 4710 "GSettingsEngine.c"
+#line 5073 "GSettingsEngine.c"
 	}
-	__finally194:
-#line 392 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+	__finally207:
+#line 414 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_g_free0 (schema_name);
-#line 392 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 414 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 392 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 414 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	g_clear_error (&_inner_error_);
-#line 392 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 414 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	return 0;
-#line 4721 "GSettingsEngine.c"
+#line 5084 "GSettingsEngine.c"
 }
 
 
@@ -4728,94 +5091,94 @@ static void gsettings_configuration_engine_real_set_plugin_int (ConfigurationEng
 	const gchar* _tmp1_ = NULL;
 	gchar* _tmp2_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 400 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 422 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_GSETTINGS_CONFIGURATION_ENGINE, GSettingsConfigurationEngine);
-#line 400 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 422 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	g_return_if_fail (domain != NULL);
-#line 400 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 422 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	g_return_if_fail (id != NULL);
-#line 400 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 422 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	g_return_if_fail (key != NULL);
-#line 401 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 423 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp0_ = domain;
-#line 401 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 423 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp1_ = id;
-#line 401 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 423 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp2_ = gsettings_configuration_engine_make_plugin_schema_name (_tmp0_, _tmp1_);
-#line 401 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 423 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	schema_name = _tmp2_;
-#line 4748 "GSettingsEngine.c"
+#line 5111 "GSettingsEngine.c"
 	{
 		const gchar* _tmp3_ = NULL;
 		gchar* _tmp4_ = NULL;
 		gchar* _tmp5_ = NULL;
 		gint _tmp6_ = 0;
-#line 404 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 426 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp3_ = key;
-#line 404 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 426 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp4_ = gsettings_configuration_engine_make_gsettings_key (_tmp3_);
-#line 404 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 426 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp5_ = _tmp4_;
-#line 404 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 426 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp6_ = val;
-#line 404 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 426 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		gsettings_configuration_engine_set_gs_int (self, schema_name, _tmp5_, _tmp6_, &_inner_error_);
-#line 404 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 426 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_g_free0 (_tmp5_);
-#line 404 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 426 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 404 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 426 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 4770 "GSettingsEngine.c"
-				goto __catch195_configuration_error;
+#line 5133 "GSettingsEngine.c"
+				goto __catch208_configuration_error;
 			}
-#line 404 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 426 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			_g_free0 (schema_name);
-#line 404 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 426 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			g_critical ("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 404 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 426 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			g_clear_error (&_inner_error_);
-#line 404 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 426 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			return;
-#line 4781 "GSettingsEngine.c"
+#line 5144 "GSettingsEngine.c"
 		}
 	}
-	goto __finally195;
-	__catch195_configuration_error:
+	goto __finally208;
+	__catch208_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp7_ = NULL;
 		const gchar* _tmp8_ = NULL;
-#line 403 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 425 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		err = _inner_error_;
-#line 403 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 425 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_inner_error_ = NULL;
-#line 406 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 428 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp7_ = err;
-#line 406 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 428 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp8_ = _tmp7_->message;
-#line 406 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-		g_critical ("GSettingsEngine.vala:406: GSettingsConfigurationEngine: error: %s", _tmp8_);
-#line 403 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 428 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+		g_critical ("GSettingsEngine.vala:428: GSettingsConfigurationEngine: error: %s", _tmp8_);
+#line 425 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_g_error_free0 (err);
-#line 4802 "GSettingsEngine.c"
+#line 5165 "GSettingsEngine.c"
 	}
-	__finally195:
-#line 403 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+	__finally208:
+#line 425 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 403 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 425 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_g_free0 (schema_name);
-#line 403 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 425 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 403 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 425 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		g_clear_error (&_inner_error_);
-#line 403 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 425 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		return;
-#line 4815 "GSettingsEngine.c"
+#line 5178 "GSettingsEngine.c"
 	}
-#line 400 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 422 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_g_free0 (schema_name);
-#line 4819 "GSettingsEngine.c"
+#line 5182 "GSettingsEngine.c"
 }
 
 
@@ -4827,23 +5190,23 @@ static gchar* gsettings_configuration_engine_real_get_plugin_string (Configurati
 	const gchar* _tmp1_ = NULL;
 	gchar* _tmp2_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 410 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 432 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_GSETTINGS_CONFIGURATION_ENGINE, GSettingsConfigurationEngine);
-#line 410 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 432 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	g_return_val_if_fail (domain != NULL, NULL);
-#line 410 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 432 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	g_return_val_if_fail (id != NULL, NULL);
-#line 410 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 432 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	g_return_val_if_fail (key != NULL, NULL);
-#line 411 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 433 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp0_ = domain;
-#line 411 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 433 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp1_ = id;
-#line 411 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 433 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp2_ = gsettings_configuration_engine_make_plugin_schema_name (_tmp0_, _tmp1_);
-#line 411 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 433 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	schema_name = _tmp2_;
-#line 4847 "GSettingsEngine.c"
+#line 5210 "GSettingsEngine.c"
 	{
 		gchar* _tmp3_ = NULL;
 		const gchar* _tmp4_ = NULL;
@@ -4852,93 +5215,93 @@ static gchar* gsettings_configuration_engine_real_get_plugin_string (Configurati
 		gchar* _tmp7_ = NULL;
 		gchar* _tmp8_ = NULL;
 		gchar* _tmp9_ = NULL;
-#line 414 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 436 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp4_ = key;
-#line 414 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 436 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp5_ = gsettings_configuration_engine_make_gsettings_key (_tmp4_);
-#line 414 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 436 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp6_ = _tmp5_;
-#line 414 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 436 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp7_ = gsettings_configuration_engine_get_gs_string (self, schema_name, _tmp6_, &_inner_error_);
-#line 414 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 436 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp8_ = _tmp7_;
-#line 414 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 436 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_g_free0 (_tmp6_);
-#line 414 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 436 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp3_ = _tmp8_;
-#line 414 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 436 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 414 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 436 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 4874 "GSettingsEngine.c"
-				goto __catch196_configuration_error;
+#line 5237 "GSettingsEngine.c"
+				goto __catch209_configuration_error;
 			}
-#line 414 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 436 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			_g_free0 (schema_name);
-#line 414 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 436 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			g_critical ("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 414 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 436 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			g_clear_error (&_inner_error_);
-#line 414 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 436 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			return NULL;
-#line 4885 "GSettingsEngine.c"
+#line 5248 "GSettingsEngine.c"
 		}
-#line 414 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 436 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp9_ = _tmp3_;
-#line 414 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 436 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp3_ = NULL;
-#line 414 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 436 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		result = _tmp9_;
-#line 414 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 436 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_g_free0 (_tmp3_);
-#line 414 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 436 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_g_free0 (schema_name);
-#line 414 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 436 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		return result;
-#line 4899 "GSettingsEngine.c"
+#line 5262 "GSettingsEngine.c"
 	}
-	goto __finally196;
-	__catch196_configuration_error:
+	goto __finally209;
+	__catch209_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp10_ = NULL;
 		const gchar* _tmp11_ = NULL;
 		const gchar* _tmp12_ = NULL;
 		gchar* _tmp13_ = NULL;
-#line 413 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 435 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		err = _inner_error_;
-#line 413 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 435 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_inner_error_ = NULL;
-#line 416 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 438 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp10_ = err;
-#line 416 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 438 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp11_ = _tmp10_->message;
-#line 416 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-		g_critical ("GSettingsEngine.vala:416: GSettingsConfigurationEngine: error: %s", _tmp11_);
-#line 417 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 438 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+		g_critical ("GSettingsEngine.vala:438: GSettingsConfigurationEngine: error: %s", _tmp11_);
+#line 439 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp12_ = def;
-#line 417 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 439 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp13_ = g_strdup (_tmp12_);
-#line 417 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 439 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		result = _tmp13_;
-#line 417 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 439 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_g_error_free0 (err);
-#line 417 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 439 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_g_free0 (schema_name);
-#line 417 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 439 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		return result;
-#line 4931 "GSettingsEngine.c"
+#line 5294 "GSettingsEngine.c"
 	}
-	__finally196:
-#line 413 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+	__finally209:
+#line 435 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_g_free0 (schema_name);
-#line 413 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 435 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 413 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 435 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	g_clear_error (&_inner_error_);
-#line 413 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 435 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	return NULL;
-#line 4942 "GSettingsEngine.c"
+#line 5305 "GSettingsEngine.c"
 }
 
 
@@ -4949,94 +5312,94 @@ static void gsettings_configuration_engine_real_set_plugin_string (Configuration
 	const gchar* _tmp1_ = NULL;
 	gchar* _tmp2_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 421 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 443 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_GSETTINGS_CONFIGURATION_ENGINE, GSettingsConfigurationEngine);
-#line 421 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 443 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	g_return_if_fail (domain != NULL);
-#line 421 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 443 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	g_return_if_fail (id != NULL);
-#line 421 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 443 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	g_return_if_fail (key != NULL);
-#line 422 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 444 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp0_ = domain;
-#line 422 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 444 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp1_ = id;
-#line 422 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 444 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp2_ = gsettings_configuration_engine_make_plugin_schema_name (_tmp0_, _tmp1_);
-#line 422 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 444 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	schema_name = _tmp2_;
-#line 4969 "GSettingsEngine.c"
+#line 5332 "GSettingsEngine.c"
 	{
 		const gchar* _tmp3_ = NULL;
 		gchar* _tmp4_ = NULL;
 		gchar* _tmp5_ = NULL;
 		const gchar* _tmp6_ = NULL;
-#line 425 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 447 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp3_ = key;
-#line 425 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 447 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp4_ = gsettings_configuration_engine_make_gsettings_key (_tmp3_);
-#line 425 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 447 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp5_ = _tmp4_;
-#line 425 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 447 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp6_ = val;
-#line 425 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 447 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		gsettings_configuration_engine_set_gs_string (self, schema_name, _tmp5_, _tmp6_, &_inner_error_);
-#line 425 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 447 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_g_free0 (_tmp5_);
-#line 425 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 447 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 425 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 447 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 4991 "GSettingsEngine.c"
-				goto __catch197_configuration_error;
+#line 5354 "GSettingsEngine.c"
+				goto __catch210_configuration_error;
 			}
-#line 425 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 447 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			_g_free0 (schema_name);
-#line 425 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 447 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			g_critical ("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 425 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 447 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			g_clear_error (&_inner_error_);
-#line 425 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 447 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			return;
-#line 5002 "GSettingsEngine.c"
+#line 5365 "GSettingsEngine.c"
 		}
 	}
-	goto __finally197;
-	__catch197_configuration_error:
+	goto __finally210;
+	__catch210_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp7_ = NULL;
 		const gchar* _tmp8_ = NULL;
-#line 424 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 446 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		err = _inner_error_;
-#line 424 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 446 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_inner_error_ = NULL;
-#line 427 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 449 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp7_ = err;
-#line 427 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 449 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp8_ = _tmp7_->message;
-#line 427 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-		g_critical ("GSettingsEngine.vala:427: GSettingsConfigurationEngine: error: %s", _tmp8_);
-#line 424 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 449 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+		g_critical ("GSettingsEngine.vala:449: GSettingsConfigurationEngine: error: %s", _tmp8_);
+#line 446 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_g_error_free0 (err);
-#line 5023 "GSettingsEngine.c"
+#line 5386 "GSettingsEngine.c"
 	}
-	__finally197:
-#line 424 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+	__finally210:
+#line 446 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 424 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 446 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_g_free0 (schema_name);
-#line 424 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 446 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 424 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 446 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		g_clear_error (&_inner_error_);
-#line 424 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 446 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		return;
-#line 5036 "GSettingsEngine.c"
+#line 5399 "GSettingsEngine.c"
 	}
-#line 421 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 443 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_g_free0 (schema_name);
-#line 5040 "GSettingsEngine.c"
+#line 5403 "GSettingsEngine.c"
 }
 
 
@@ -5047,91 +5410,91 @@ static void gsettings_configuration_engine_real_unset_plugin_key (ConfigurationE
 	const gchar* _tmp1_ = NULL;
 	gchar* _tmp2_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 431 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 453 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_GSETTINGS_CONFIGURATION_ENGINE, GSettingsConfigurationEngine);
-#line 431 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 453 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	g_return_if_fail (domain != NULL);
-#line 431 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 453 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	g_return_if_fail (id != NULL);
-#line 431 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 453 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	g_return_if_fail (key != NULL);
-#line 432 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 454 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp0_ = domain;
-#line 432 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 454 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp1_ = id;
-#line 432 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 454 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp2_ = gsettings_configuration_engine_make_plugin_schema_name (_tmp0_, _tmp1_);
-#line 432 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 454 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	schema_name = _tmp2_;
-#line 5067 "GSettingsEngine.c"
+#line 5430 "GSettingsEngine.c"
 	{
 		const gchar* _tmp3_ = NULL;
 		gchar* _tmp4_ = NULL;
 		gchar* _tmp5_ = NULL;
-#line 435 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 457 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp3_ = key;
-#line 435 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 457 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp4_ = gsettings_configuration_engine_make_gsettings_key (_tmp3_);
-#line 435 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 457 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp5_ = _tmp4_;
-#line 435 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 457 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		gsettings_configuration_engine_reset_gs_to_default (self, schema_name, _tmp5_, &_inner_error_);
-#line 435 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 457 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_g_free0 (_tmp5_);
-#line 435 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 457 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 435 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 457 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 5086 "GSettingsEngine.c"
-				goto __catch198_configuration_error;
+#line 5449 "GSettingsEngine.c"
+				goto __catch211_configuration_error;
 			}
-#line 435 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 457 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			_g_free0 (schema_name);
-#line 435 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 457 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			g_critical ("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 435 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 457 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			g_clear_error (&_inner_error_);
-#line 435 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 457 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			return;
-#line 5097 "GSettingsEngine.c"
+#line 5460 "GSettingsEngine.c"
 		}
 	}
-	goto __finally198;
-	__catch198_configuration_error:
+	goto __finally211;
+	__catch211_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp6_ = NULL;
 		const gchar* _tmp7_ = NULL;
-#line 434 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 456 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		err = _inner_error_;
-#line 434 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 456 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_inner_error_ = NULL;
-#line 437 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 459 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp6_ = err;
-#line 437 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 459 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp7_ = _tmp6_->message;
-#line 437 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-		g_critical ("GSettingsEngine.vala:437: GSettingsConfigurationEngine: error: %s", _tmp7_);
-#line 434 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 459 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+		g_critical ("GSettingsEngine.vala:459: GSettingsConfigurationEngine: error: %s", _tmp7_);
+#line 456 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_g_error_free0 (err);
-#line 5118 "GSettingsEngine.c"
+#line 5481 "GSettingsEngine.c"
 	}
-	__finally198:
-#line 434 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+	__finally211:
+#line 456 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 434 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 456 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_g_free0 (schema_name);
-#line 434 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 456 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 434 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 456 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		g_clear_error (&_inner_error_);
-#line 434 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 456 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		return;
-#line 5131 "GSettingsEngine.c"
+#line 5494 "GSettingsEngine.c"
 	}
-#line 431 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 453 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_g_free0 (schema_name);
-#line 5135 "GSettingsEngine.c"
+#line 5498 "GSettingsEngine.c"
 }
 
 
@@ -5142,96 +5505,96 @@ static FuzzyPropertyState gsettings_configuration_engine_real_is_plugin_enabled
 	const gchar* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 441 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 463 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_GSETTINGS_CONFIGURATION_ENGINE, GSettingsConfigurationEngine);
-#line 441 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 463 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	g_return_val_if_fail (id != NULL, 0);
-#line 442 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 464 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp0_ = id;
-#line 442 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 464 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp1_ = gsettings_configuration_engine_get_plugin_enable_disable_name (_tmp0_);
-#line 442 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 464 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	enable_disable_name = _tmp1_;
-#line 5156 "GSettingsEngine.c"
+#line 5519 "GSettingsEngine.c"
 	{
 		FuzzyPropertyState _tmp2_ = 0;
 		gboolean _tmp3_ = FALSE;
 		gboolean _tmp4_ = FALSE;
-#line 445 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 467 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp4_ = gsettings_configuration_engine_get_gs_bool (self, GSETTINGS_CONFIGURATION_ENGINE_PLUGINS_ENABLE_DISABLE_SCHEMA_NAME, enable_disable_name, &_inner_error_);
-#line 445 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 467 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp3_ = _tmp4_;
-#line 445 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 467 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 445 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 467 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 5169 "GSettingsEngine.c"
-				goto __catch199_configuration_error;
+#line 5532 "GSettingsEngine.c"
+				goto __catch212_configuration_error;
 			}
-#line 445 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 467 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			_g_free0 (enable_disable_name);
-#line 445 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 467 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			g_critical ("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 445 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 467 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			g_clear_error (&_inner_error_);
-#line 445 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 467 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			return 0;
-#line 5180 "GSettingsEngine.c"
+#line 5543 "GSettingsEngine.c"
 		}
-#line 445 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 467 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		if (_tmp3_) {
-#line 446 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 468 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			_tmp2_ = FUZZY_PROPERTY_STATE_ENABLED;
-#line 5186 "GSettingsEngine.c"
+#line 5549 "GSettingsEngine.c"
 		} else {
-#line 446 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 468 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			_tmp2_ = FUZZY_PROPERTY_STATE_DISABLED;
-#line 5190 "GSettingsEngine.c"
+#line 5553 "GSettingsEngine.c"
 		}
-#line 445 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 467 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		result = _tmp2_;
-#line 445 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 467 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_g_free0 (enable_disable_name);
-#line 445 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 467 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		return result;
-#line 5198 "GSettingsEngine.c"
+#line 5561 "GSettingsEngine.c"
 	}
-	goto __finally199;
-	__catch199_configuration_error:
+	goto __finally212;
+	__catch212_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp5_ = NULL;
 		const gchar* _tmp6_ = NULL;
-#line 444 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 466 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		err = _inner_error_;
-#line 444 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 466 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_inner_error_ = NULL;
-#line 448 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 470 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp5_ = err;
-#line 448 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 470 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp6_ = _tmp5_->message;
-#line 448 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-		g_critical ("GSettingsEngine.vala:448: GSettingsConfigurationEngine: error: %s", _tmp6_);
-#line 449 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 470 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+		g_critical ("GSettingsEngine.vala:470: GSettingsConfigurationEngine: error: %s", _tmp6_);
+#line 471 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		result = FUZZY_PROPERTY_STATE_UNKNOWN;
-#line 449 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 471 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_g_error_free0 (err);
-#line 449 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 471 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_g_free0 (enable_disable_name);
-#line 449 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 471 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		return result;
-#line 5224 "GSettingsEngine.c"
+#line 5587 "GSettingsEngine.c"
 	}
-	__finally199:
-#line 444 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+	__finally212:
+#line 466 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_g_free0 (enable_disable_name);
-#line 444 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 466 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 444 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 466 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	g_clear_error (&_inner_error_);
-#line 444 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 466 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	return 0;
-#line 5235 "GSettingsEngine.c"
+#line 5598 "GSettingsEngine.c"
 }
 
 
@@ -5241,77 +5604,77 @@ static void gsettings_configuration_engine_real_set_plugin_enabled (Configuratio
 	const gchar* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 453 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 475 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_GSETTINGS_CONFIGURATION_ENGINE, GSettingsConfigurationEngine);
-#line 453 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 475 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	g_return_if_fail (id != NULL);
-#line 454 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 476 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp0_ = id;
-#line 454 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 476 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp1_ = gsettings_configuration_engine_get_plugin_enable_disable_name (_tmp0_);
-#line 454 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 476 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	enable_disable_name = _tmp1_;
-#line 5255 "GSettingsEngine.c"
+#line 5618 "GSettingsEngine.c"
 	{
 		gboolean _tmp2_ = FALSE;
-#line 457 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 479 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp2_ = enabled;
-#line 457 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 479 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		gsettings_configuration_engine_set_gs_bool (self, GSETTINGS_CONFIGURATION_ENGINE_PLUGINS_ENABLE_DISABLE_SCHEMA_NAME, enable_disable_name, _tmp2_, &_inner_error_);
-#line 457 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 479 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 457 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 479 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 5266 "GSettingsEngine.c"
-				goto __catch200_configuration_error;
+#line 5629 "GSettingsEngine.c"
+				goto __catch213_configuration_error;
 			}
-#line 457 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 479 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			_g_free0 (enable_disable_name);
-#line 457 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 479 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			g_critical ("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 457 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 479 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			g_clear_error (&_inner_error_);
-#line 457 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 479 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			return;
-#line 5277 "GSettingsEngine.c"
+#line 5640 "GSettingsEngine.c"
 		}
 	}
-	goto __finally200;
-	__catch200_configuration_error:
+	goto __finally213;
+	__catch213_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
 		const gchar* _tmp4_ = NULL;
-#line 456 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 478 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		err = _inner_error_;
-#line 456 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 478 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_inner_error_ = NULL;
-#line 459 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 481 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp3_ = err;
-#line 459 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 481 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp4_ = _tmp3_->message;
-#line 459 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-		g_critical ("GSettingsEngine.vala:459: GSettingsConfigurationEngine: error: %s", _tmp4_);
-#line 456 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 481 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+		g_critical ("GSettingsEngine.vala:481: GSettingsConfigurationEngine: error: %s", _tmp4_);
+#line 478 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_g_error_free0 (err);
-#line 5298 "GSettingsEngine.c"
+#line 5661 "GSettingsEngine.c"
 	}
-	__finally200:
-#line 456 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+	__finally213:
+#line 478 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 456 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 478 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_g_free0 (enable_disable_name);
-#line 456 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 478 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 456 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 478 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		g_clear_error (&_inner_error_);
-#line 456 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 478 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		return;
-#line 5311 "GSettingsEngine.c"
+#line 5674 "GSettingsEngine.c"
 	}
-#line 453 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 475 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_g_free0 (enable_disable_name);
-#line 5315 "GSettingsEngine.c"
+#line 5678 "GSettingsEngine.c"
 }
 
 
@@ -5324,70 +5687,70 @@ void gsettings_configuration_engine_run_gsettings_migrator (void) {
 	gchar* _tmp4_ = NULL;
 	gchar* _tmp5_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 468 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 490 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp0_ = app_dirs_get_settings_migrator_bin ();
-#line 468 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 490 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp1_ = _tmp0_;
-#line 468 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 490 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp2_ = g_file_get_path (_tmp1_);
-#line 468 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 490 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp3_ = _tmp2_;
-#line 468 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 490 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp4_ = g_strconcat ("sh ", _tmp3_, NULL);
-#line 468 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 490 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_tmp5_ = _tmp4_;
-#line 468 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 490 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_g_free0 (_tmp3_);
-#line 468 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 490 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_g_object_unref0 (_tmp1_);
-#line 468 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 490 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	cmd_line = _tmp5_;
-#line 5346 "GSettingsEngine.c"
+#line 5709 "GSettingsEngine.c"
 	{
-#line 471 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 493 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		g_spawn_command_line_sync (cmd_line, NULL, NULL, NULL, &_inner_error_);
-#line 471 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 493 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 5352 "GSettingsEngine.c"
-			goto __catch201_g_error;
+#line 5715 "GSettingsEngine.c"
+			goto __catch214_g_error;
 		}
 	}
-	goto __finally201;
-	__catch201_g_error:
+	goto __finally214;
+	__catch214_g_error:
 	{
 		GError* err = NULL;
 		GError* _tmp6_ = NULL;
 		const gchar* _tmp7_ = NULL;
-#line 470 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 492 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		err = _inner_error_;
-#line 470 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 492 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_inner_error_ = NULL;
-#line 473 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 495 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp6_ = err;
-#line 473 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 495 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_tmp7_ = _tmp6_->message;
-#line 473 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-		g_message ("GSettingsEngine.vala:473: Error running shotwell-settings-migrator: %s", _tmp7_);
-#line 470 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 495 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+		g_message ("GSettingsEngine.vala:495: Error running shotwell-settings-migrator: %s", _tmp7_);
+#line 492 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_g_error_free0 (err);
-#line 5374 "GSettingsEngine.c"
+#line 5737 "GSettingsEngine.c"
 	}
-	__finally201:
-#line 470 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+	__finally214:
+#line 492 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 470 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 492 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		_g_free0 (cmd_line);
-#line 470 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 492 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 470 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 492 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		g_clear_error (&_inner_error_);
-#line 470 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 492 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		return;
-#line 5387 "GSettingsEngine.c"
+#line 5750 "GSettingsEngine.c"
 	}
-#line 467 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+#line 489 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_g_free0 (cmd_line);
-#line 5391 "GSettingsEngine.c"
+#line 5754 "GSettingsEngine.c"
 }
 
 
@@ -5398,7 +5761,7 @@ static void gsettings_configuration_engine_class_init (GSettingsConfigurationEng
 	g_type_class_add_private (klass, sizeof (GSettingsConfigurationEnginePrivate));
 #line 7 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	G_OBJECT_CLASS (klass)->finalize = gsettings_configuration_engine_finalize;
-#line 5402 "GSettingsEngine.c"
+#line 5765 "GSettingsEngine.c"
 }
 
 
@@ -5408,6 +5771,10 @@ static void gsettings_configuration_engine_configuration_engine_interface_init (
 #line 7 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	iface->get_name = (gchar* (*)(ConfigurationEngine*)) gsettings_configuration_engine_real_get_name;
 #line 7 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+	iface->get_enum_property = (gint (*)(ConfigurationEngine*, ConfigurableProperty, GError**)) gsettings_configuration_engine_real_get_enum_property;
+#line 7 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
+	iface->set_enum_property = (void (*)(ConfigurationEngine*, ConfigurableProperty, gint, GError**)) gsettings_configuration_engine_real_set_enum_property;
+#line 7 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	iface->get_int_property = (gint (*)(ConfigurationEngine*, ConfigurableProperty, GError**)) gsettings_configuration_engine_real_get_int_property;
 #line 7 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	iface->set_int_property = (void (*)(ConfigurationEngine*, ConfigurableProperty, gint, GError**)) gsettings_configuration_engine_real_set_int_property;
@@ -5445,14 +5812,14 @@ static void gsettings_configuration_engine_configuration_engine_interface_init (
 	iface->is_plugin_enabled = (FuzzyPropertyState (*)(ConfigurationEngine*, const gchar*)) gsettings_configuration_engine_real_is_plugin_enabled;
 #line 7 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	iface->set_plugin_enabled = (void (*)(ConfigurationEngine*, const gchar*, gboolean)) gsettings_configuration_engine_real_set_plugin_enabled;
-#line 5449 "GSettingsEngine.c"
+#line 5816 "GSettingsEngine.c"
 }
 
 
 static void gsettings_configuration_engine_instance_init (GSettingsConfigurationEngine * self) {
 #line 7 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	self->priv = GSETTINGS_CONFIGURATION_ENGINE_GET_PRIVATE (self);
-#line 5456 "GSettingsEngine.c"
+#line 5823 "GSettingsEngine.c"
 }
 
 
@@ -5460,15 +5827,13 @@ static void gsettings_configuration_engine_finalize (GObject* obj) {
 	GSettingsConfigurationEngine * self;
 #line 7 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_GSETTINGS_CONFIGURATION_ENGINE, GSettingsConfigurationEngine);
-#line 25 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
-	_g_object_unref0 (self->priv->known_schemas);
 #line 26 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	self->priv->schema_names = (_vala_array_free (self->priv->schema_names, self->priv->schema_names_length1, (GDestroyNotify) g_free), NULL);
 #line 27 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	self->priv->key_names = (_vala_array_free (self->priv->key_names, self->priv->key_names_length1, (GDestroyNotify) g_free), NULL);
 #line 7 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	G_OBJECT_CLASS (gsettings_configuration_engine_parent_class)->finalize (obj);
-#line 5472 "GSettingsEngine.c"
+#line 5837 "GSettingsEngine.c"
 }
 
 
@@ -5504,16 +5869,4 @@ 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/config/GSettingsEngine.vala b/src/config/GSettingsEngine.vala
index 6329b78..b4f32e2 100644
--- a/src/config/GSettingsEngine.vala
+++ b/src/config/GSettingsEngine.vala
@@ -12,6 +12,7 @@ public class GSettingsConfigurationEngine : ConfigurationEngine, GLib.Object {
     private const string WINDOW_PREFS_SCHEMA_NAME =  PREFS_SCHEMA_NAME + ".window";
     private const string FILES_PREFS_SCHEMA_NAME = PREFS_SCHEMA_NAME + ".files";
     private const string EDITING_PREFS_SCHEMA_NAME = PREFS_SCHEMA_NAME + ".editing";
+    private const string EXPORT_PREFS_SCHEMA_NAME = PREFS_SCHEMA_NAME + ".export";
     private const string VIDEO_SCHEMA_NAME = ROOT_SCHEMA_NAME + ".video";
     private const string PRINTING_SCHEMA_NAME = ROOT_SCHEMA_NAME + ".printing";
     private const string SHARING_SCHEMA_NAME = ROOT_SCHEMA_NAME + ".sharing";
@@ -22,16 +23,10 @@ public class GSettingsConfigurationEngine : ConfigurationEngine, GLib.Object {
     private const string PLUGINS_ENABLE_DISABLE_SCHEMA_NAME = ROOT_SCHEMA_NAME +
         ".plugins.enable-state";
 
-    private Gee.Set<string> known_schemas;
     private string[] schema_names;
     private string[] key_names;
     
     public GSettingsConfigurationEngine() {
-        known_schemas = new Gee.HashSet<string>();
-        
-        foreach (string current_schema in Settings.list_schemas())
-            known_schemas.add(current_schema);
-        
         schema_names = new string[ConfigurableProperty.NUM_PROPERTIES];
 
         schema_names[ConfigurableProperty.AUTO_IMPORT_FROM_LIBRARY] = FILES_PREFS_SCHEMA_NAME;
@@ -59,6 +54,12 @@ public class GSettingsConfigurationEngine : ConfigurationEngine, GLib.Object {
         schema_names[ConfigurableProperty.EVENT_PHOTOS_SORT_ASCENDING] = UI_PREFS_SCHEMA_NAME;
         schema_names[ConfigurableProperty.EVENT_PHOTOS_SORT_BY] = UI_PREFS_SCHEMA_NAME;
         schema_names[ConfigurableProperty.EVENTS_SORT_ASCENDING] = UI_PREFS_SCHEMA_NAME;
+        schema_names[ConfigurableProperty.EXPORT_CONSTRAINT] = EXPORT_PREFS_SCHEMA_NAME;
+        schema_names[ConfigurableProperty.EXPORT_EXPORT_FORMAT_MODE] =  EXPORT_PREFS_SCHEMA_NAME;
+        schema_names[ConfigurableProperty.EXPORT_EXPORT_METADATA] =  EXPORT_PREFS_SCHEMA_NAME;
+        schema_names[ConfigurableProperty.EXPORT_PHOTO_FILE_FORMAT] =  EXPORT_PREFS_SCHEMA_NAME;
+        schema_names[ConfigurableProperty.EXPORT_QUALITY] =  EXPORT_PREFS_SCHEMA_NAME;
+        schema_names[ConfigurableProperty.EXPORT_SCALE] =  EXPORT_PREFS_SCHEMA_NAME;
         schema_names[ConfigurableProperty.EXTERNAL_PHOTO_APP] = EDITING_PREFS_SCHEMA_NAME;
         schema_names[ConfigurableProperty.EXTERNAL_RAW_APP] = EDITING_PREFS_SCHEMA_NAME;
         schema_names[ConfigurableProperty.HIDE_PHOTOS_ALREADY_IMPORTED] = UI_PREFS_SCHEMA_NAME;
@@ -125,6 +126,12 @@ public class GSettingsConfigurationEngine : ConfigurationEngine, GLib.Object {
         key_names[ConfigurableProperty.EVENT_PHOTOS_SORT_ASCENDING] = "event-photos-sort-ascending";
         key_names[ConfigurableProperty.EVENT_PHOTOS_SORT_BY] = "event-photos-sort-by";
         key_names[ConfigurableProperty.EVENTS_SORT_ASCENDING] = "events-sort-ascending";
+        key_names[ConfigurableProperty.EXPORT_CONSTRAINT] = "constraint";
+        key_names[ConfigurableProperty.EXPORT_EXPORT_FORMAT_MODE] =  "export-format-mode";
+        key_names[ConfigurableProperty.EXPORT_EXPORT_METADATA] =  "export-metadata";
+        key_names[ConfigurableProperty.EXPORT_PHOTO_FILE_FORMAT] =  "photo-file-format";
+        key_names[ConfigurableProperty.EXPORT_QUALITY] =  "quality";
+        key_names[ConfigurableProperty.EXPORT_SCALE] =  "scale";
         key_names[ConfigurableProperty.EXTERNAL_PHOTO_APP] = "external-photo-editor";
         key_names[ConfigurableProperty.EXTERNAL_RAW_APP] = "external-raw-editor";
         key_names[ConfigurableProperty.HIDE_PHOTOS_ALREADY_IMPORTED] = "hide-photos-already-imported";
@@ -164,23 +171,15 @@ public class GSettingsConfigurationEngine : ConfigurationEngine, GLib.Object {
         key_names[ConfigurableProperty.USE_LOWERCASE_FILENAMES] = "use-lowercase-filenames";
         key_names[ConfigurableProperty.VIDEO_INTERPRETER_STATE_COOKIE] = "interpreter-state-cookie";
     }
-    
-    private bool schema_has_key(Settings schema_object, string key) {
-        foreach (string current_key in schema_object.list_keys()) {
-            if (current_key == key)
-                return true;
-        }
-        
-        return false;
-    }
-    
+
     private void check_key_valid(string schema, string key) throws ConfigurationError {
-        if (!known_schemas.contains(schema))
+        var schema_source = SettingsSchemaSource.get_default ();
+        var settings_scheme = schema_source.lookup (schema, true);
+        if (settings_scheme == null) {
             throw new ConfigurationError.ENGINE_ERROR("schema '%s' is not installed".printf(schema));
+        }
 
-        Settings schema_object = new Settings(schema);
-        
-        if (!schema_has_key(schema_object, key))
+        if (!settings_scheme.has_key (key))
             throw new ConfigurationError.ENGINE_ERROR("schema '%s' does not define key '%s'".printf(
                 schema, key));
     }
@@ -201,6 +200,20 @@ public class GSettingsConfigurationEngine : ConfigurationEngine, GLib.Object {
         schema_object.set_boolean(key, value);
     }
 
+    private void set_gs_enum (string schema, string key, int value) throws ConfigurationError {
+        check_key_valid (schema, key);
+
+        var schema_object = new Settings (schema);
+        schema_object.set_enum (key, value);
+    }
+
+    private int get_gs_enum (string schema, string key) throws ConfigurationError {
+        check_key_valid (schema, key);
+
+        var schema_object = new Settings (schema);
+        return schema_object.get_enum (key);
+    }
+
     private int get_gs_int(string schema, string key) throws ConfigurationError {
         check_key_valid(schema, key);
 
@@ -292,6 +305,15 @@ public class GSettingsConfigurationEngine : ConfigurationEngine, GLib.Object {
         return "GSettings";
     }
 
+    public int get_enum_property (ConfigurableProperty p) throws ConfigurationError{
+        return get_gs_enum (schema_names[p], key_names[p]);
+    }
+
+    public void set_enum_property (ConfigurableProperty p, int val) throws ConfigurationError {
+        set_gs_enum (schema_names[p], key_names[p], val);
+        property_changed (p);
+    }
+
     public int get_int_property(ConfigurableProperty p) throws ConfigurationError {
         return get_gs_int(schema_names[p], key_names[p]);
     }
diff --git a/src/core/DataSource.c b/src/core/DataSource.c
index fca0c0a..a1d692d 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 __catch47_g_error;
+				goto __catch48_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 __finally47;
-		__catch47_g_error:
+		goto __finally48;
+		__catch48_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"
 		}
-		__finally47:
+		__finally48:
 #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 fc92bbd..9d54b3c 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 __catch46_g_error;
+			goto __catch47_g_error;
 		}
 #line 115 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 		success = _tmp0_;
 #line 765 "SourceCollection.c"
 	}
-	goto __finally46;
-	__catch46_g_error:
+	goto __finally47;
+	__catch47_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"
 	}
-	__finally46:
+	__finally47:
 #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 b85a8d2..e5e0321 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 __catch202_g_error;
+				goto __catch215_g_error;
 			}
 		}
-		goto __finally202;
-		__catch202_g_error:
+		goto __finally215;
+		__catch215_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"
 		}
-		__finally202:
+		__finally215:
 #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 __catch203_g_error;
+					goto __catch216_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 __finally203;
-			__catch203_g_error:
+			goto __finally216;
+			__catch216_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"
 			}
-			__finally203:
+			__finally216:
 #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 __catch204_g_error;
+				goto __catch217_g_error;
 			}
 #line 75 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 			self->priv->file_size = _tmp64_;
 #line 678 "DataImportSource.c"
 		}
-		goto __finally204;
-		__catch204_g_error:
+		goto __finally217;
+		__catch217_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"
 		}
-		__finally204:
+		__finally217:
 #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 __catch205_g_error;
+				goto __catch218_g_error;
 			}
 #line 80 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 			self->priv->modification_time = _tmp71_;
 #line 750 "DataImportSource.c"
 		}
-		goto __finally205;
-		__catch205_g_error:
+		goto __finally218;
+		__catch218_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"
 		}
-		__finally205:
+		__finally218:
 #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/data_imports/DataImportsPluginHost.c b/src/data_imports/DataImportsPluginHost.c
index be5e38c..4bd94a6 100644
--- a/src/data_imports/DataImportsPluginHost.c
+++ b/src/data_imports/DataImportsPluginHost.c
@@ -1638,7 +1638,7 @@ static void spit_data_imports_concrete_data_imports_host_real_post_error_message
 #line 147 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	g_return_if_fail (message != NULL);
 #line 148 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_tmp0_ = _ ("Importing from %s can't continue because an error occurred:");
+	_tmp0_ = _ ("Importing from %s can’t continue because an error occurred:");
 #line 148 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	_tmp1_ = self->priv->active_importer;
 #line 148 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
@@ -2306,7 +2306,7 @@ static void spit_data_imports_welcome_data_imports_host_real_post_error_message
 #line 293 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	g_return_if_fail (message != NULL);
 #line 294 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
-	_tmp0_ = _ ("Importing from %s can't continue because an error occurred:");
+	_tmp0_ = _ ("Importing from %s can’t continue because an error occurred:");
 #line 294 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
 	_tmp1_ = self->priv->active_importer;
 #line 294 "/home/jens/Source/shotwell/src/data_imports/DataImportsPluginHost.vala"
diff --git a/src/data_imports/DataImportsPluginHost.vala b/src/data_imports/DataImportsPluginHost.vala
index 6939ea5..158b8f4 100644
--- a/src/data_imports/DataImportsPluginHost.vala
+++ b/src/data_imports/DataImportsPluginHost.vala
@@ -145,7 +145,7 @@ public class ConcreteDataImportsHost : Plugins.StandardHostInterface,
     }
     
     public void post_error_message(string message) {
-        string msg = _("Importing from %s can't continue because an error occurred:").printf(
+        string msg = _("Importing from %s can’t continue because an error occurred:").printf(
             active_importer.get_service().get_pluggable_name());
         msg += GLib.Markup.printf_escaped("\n\n<i>%s</i>\n\n", message);
         msg += _("To try importing from another service, select one from the above menu.");
@@ -291,7 +291,7 @@ public class WelcomeDataImportsHost : Plugins.StandardHostInterface,
     }
     
     public void post_error_message(string message) {
-        string msg = _("Importing from %s can't continue because an error occurred:").printf(
+        string msg = _("Importing from %s can’t continue because an error occurred:").printf(
             active_importer.get_service().get_pluggable_name());
         
         debug(msg);
diff --git a/src/db/DatabaseTable.c b/src/db/DatabaseTable.c
index 7b533de..03b34e9 100644
--- a/src/db/DatabaseTable.c
+++ b/src/db/DatabaseTable.c
@@ -136,7 +136,8 @@ static void database_table_prepare_db (const gchar* filename) {
 	const gchar* _tmp9_ = NULL;
 	const gchar* sql_debug = NULL;
 	const gchar* _tmp26_ = NULL;
-	const gchar* _tmp27_ = NULL;
+	gboolean _tmp27_ = FALSE;
+	const gchar* _tmp28_ = NULL;
 	GError * _inner_error_ = NULL;
 #line 32 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	g_return_if_fail (filename != NULL);
@@ -154,7 +155,7 @@ static void database_table_prepare_db (const gchar* filename) {
 	_tmp3_ = res;
 #line 36 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	if (_tmp3_ != SQLITE_OK) {
-#line 158 "DatabaseTable.c"
+#line 159 "DatabaseTable.c"
 		const gchar* _tmp4_ = NULL;
 		const gchar* _tmp5_ = NULL;
 		gint _tmp6_ = 0;
@@ -174,13 +175,13 @@ static void database_table_prepare_db (const gchar* filename) {
 		app_window_panic (_tmp8_);
 #line 37 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		_g_free0 (_tmp8_);
-#line 178 "DatabaseTable.c"
+#line 179 "DatabaseTable.c"
 	}
 #line 41 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_tmp9_ = filename;
 #line 41 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	if (g_strcmp0 (_tmp9_, DB_IN_MEMORY_NAME) != 0) {
-#line 184 "DatabaseTable.c"
+#line 185 "DatabaseTable.c"
 		{
 			GFile* file_db = NULL;
 			const gchar* _tmp10_ = NULL;
@@ -206,7 +207,7 @@ static void database_table_prepare_db (const gchar* filename) {
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 44 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 				_g_object_unref0 (file_db);
-#line 210 "DatabaseTable.c"
+#line 211 "DatabaseTable.c"
 				goto __catch13_g_error;
 			}
 #line 45 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
@@ -215,7 +216,7 @@ static void database_table_prepare_db (const gchar* filename) {
 			_tmp15_ = g_file_info_get_attribute_boolean (_tmp14_, G_FILE_ATTRIBUTE_ACCESS_CAN_WRITE);
 #line 45 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 			if (!_tmp15_) {
-#line 219 "DatabaseTable.c"
+#line 220 "DatabaseTable.c"
 				const gchar* _tmp16_ = NULL;
 				const gchar* _tmp17_ = NULL;
 				gchar* _tmp18_ = NULL;
@@ -232,13 +233,13 @@ static void database_table_prepare_db (const gchar* filename) {
 				app_window_panic (_tmp19_);
 #line 46 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 				_g_free0 (_tmp19_);
-#line 236 "DatabaseTable.c"
+#line 237 "DatabaseTable.c"
 			}
 #line 42 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 			_g_object_unref0 (info);
 #line 42 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 			_g_object_unref0 (file_db);
-#line 242 "DatabaseTable.c"
+#line 243 "DatabaseTable.c"
 		}
 		goto __finally13;
 		__catch13_g_error:
@@ -272,7 +273,7 @@ static void database_table_prepare_db (const gchar* filename) {
 			_g_free0 (_tmp25_);
 #line 42 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 			_g_error_free0 (e);
-#line 276 "DatabaseTable.c"
+#line 277 "DatabaseTable.c"
 		}
 		__finally13:
 #line 42 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
@@ -283,7 +284,7 @@ static void database_table_prepare_db (const gchar* filename) {
 			g_clear_error (&_inner_error_);
 #line 42 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 			return;
-#line 287 "DatabaseTable.c"
+#line 288 "DatabaseTable.c"
 		}
 	}
 #line 53 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
@@ -291,16 +292,30 @@ static void database_table_prepare_db (const gchar* filename) {
 #line 53 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	sql_debug = _tmp26_;
 #line 56 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	_tmp27_ = sql_debug;
+	_tmp28_ = sql_debug;
 #line 56 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-	if (g_strcmp0 (_tmp27_, "") != 0) {
-#line 298 "DatabaseTable.c"
-		sqlite3* _tmp28_ = NULL;
+	if (_tmp28_ != NULL) {
+#line 299 "DatabaseTable.c"
+		const gchar* _tmp29_ = NULL;
+#line 56 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+		_tmp29_ = sql_debug;
+#line 56 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+		_tmp27_ = g_strcmp0 (_tmp29_, "") != 0;
+#line 305 "DatabaseTable.c"
+	} else {
+#line 56 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+		_tmp27_ = FALSE;
+#line 309 "DatabaseTable.c"
+	}
+#line 56 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
+	if (_tmp27_) {
+#line 313 "DatabaseTable.c"
+		sqlite3* _tmp30_ = NULL;
 #line 57 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-		_tmp28_ = database_table_db;
+		_tmp30_ = database_table_db;
 #line 57 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
-		sqlite3_trace (_tmp28_, _database_table_on_trace_sqlite_trace_callback, NULL);
-#line 304 "DatabaseTable.c"
+		sqlite3_trace (_tmp30_, _database_table_on_trace_sqlite_trace_callback, NULL);
+#line 319 "DatabaseTable.c"
 	}
 }
 
@@ -313,7 +328,7 @@ void database_table_on_trace (const gchar* message) {
 	_tmp0_ = message;
 #line 62 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	g_debug ("DatabaseTable.vala:62: SQLITE: %s", _tmp0_);
-#line 317 "DatabaseTable.c"
+#line 332 "DatabaseTable.c"
 }
 
 
@@ -346,7 +361,7 @@ static gint _sqlite3_exec (sqlite3* self, const gchar* sql, sqlite3_callback cal
 	ec = _tmp3_;
 #line 37 "/usr/share/vala-0.34/vapi/sqlite3.vapi"
 	if ((&_vala_errmsg) != NULL) {
-#line 350 "DatabaseTable.c"
+#line 365 "DatabaseTable.c"
 		const gchar* _tmp4_ = NULL;
 		gchar* _tmp5_ = NULL;
 #line 38 "/usr/share/vala-0.34/vapi/sqlite3.vapi"
@@ -357,7 +372,7 @@ static gint _sqlite3_exec (sqlite3* self, const gchar* sql, sqlite3_callback cal
 		_g_free0 (_vala_errmsg);
 #line 38 "/usr/share/vala-0.34/vapi/sqlite3.vapi"
 		_vala_errmsg = _tmp5_;
-#line 361 "DatabaseTable.c"
+#line 376 "DatabaseTable.c"
 	}
 #line 40 "/usr/share/vala-0.34/vapi/sqlite3.vapi"
 	_tmp6_ = sqlite_errmsg;
@@ -369,15 +384,15 @@ static gint _sqlite3_exec (sqlite3* self, const gchar* sql, sqlite3_callback cal
 	if (errmsg) {
 #line 41 "/usr/share/vala-0.34/vapi/sqlite3.vapi"
 		*errmsg = _vala_errmsg;
-#line 373 "DatabaseTable.c"
+#line 388 "DatabaseTable.c"
 	} else {
 #line 41 "/usr/share/vala-0.34/vapi/sqlite3.vapi"
 		_g_free0 (_vala_errmsg);
-#line 377 "DatabaseTable.c"
+#line 392 "DatabaseTable.c"
 	}
 #line 41 "/usr/share/vala-0.34/vapi/sqlite3.vapi"
 	return result;
-#line 381 "DatabaseTable.c"
+#line 396 "DatabaseTable.c"
 }
 
 
@@ -413,7 +428,7 @@ void database_table_init (const gchar* filename) {
 	_tmp4_ = res;
 #line 79 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	if (_tmp4_ != SQLITE_OK) {
-#line 417 "DatabaseTable.c"
+#line 432 "DatabaseTable.c"
 		gchar* backup_path = NULL;
 		const gchar* _tmp5_ = NULL;
 		gchar* _tmp6_ = NULL;
@@ -427,7 +442,7 @@ void database_table_init (const gchar* filename) {
 		_tmp6_ = g_strconcat (_tmp5_, ".bak", NULL);
 #line 82 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		backup_path = _tmp6_;
-#line 431 "DatabaseTable.c"
+#line 446 "DatabaseTable.c"
 		{
 			GFile* src = NULL;
 			const gchar* _tmp7_ = NULL;
@@ -462,7 +477,7 @@ void database_table_init (const gchar* filename) {
 				_g_object_unref0 (dest);
 #line 87 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 				_g_object_unref0 (src);
-#line 466 "DatabaseTable.c"
+#line 481 "DatabaseTable.c"
 				goto __catch14_g_error;
 			}
 #line 90 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
@@ -473,7 +488,7 @@ void database_table_init (const gchar* filename) {
 			_g_object_unref0 (dest);
 #line 84 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 			_g_object_unref0 (src);
-#line 477 "DatabaseTable.c"
+#line 492 "DatabaseTable.c"
 		}
 		goto __finally14;
 		__catch14_g_error:
@@ -504,7 +519,7 @@ void database_table_init (const gchar* filename) {
 			_g_free0 (_tmp18_);
 #line 84 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 			_g_error_free0 (_error_);
-#line 508 "DatabaseTable.c"
+#line 523 "DatabaseTable.c"
 		}
 		__finally14:
 #line 84 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
@@ -519,11 +534,11 @@ void database_table_init (const gchar* filename) {
 			g_clear_error (&_inner_error_);
 #line 84 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 			return;
-#line 523 "DatabaseTable.c"
+#line 538 "DatabaseTable.c"
 		}
 #line 79 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		_g_free0 (backup_path);
-#line 527 "DatabaseTable.c"
+#line 542 "DatabaseTable.c"
 	}
 #line 98 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_tmp19_ = database_table_db;
@@ -535,17 +550,17 @@ void database_table_init (const gchar* filename) {
 	_tmp21_ = res;
 #line 99 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	if (_tmp21_ != SQLITE_OK) {
-#line 539 "DatabaseTable.c"
+#line 554 "DatabaseTable.c"
 		gint _tmp22_ = 0;
 #line 100 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		_tmp22_ = res;
 #line 100 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		database_table_warning ("Unable to disable synchronous mode", _tmp22_);
-#line 545 "DatabaseTable.c"
+#line 560 "DatabaseTable.c"
 	}
 #line 65 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_sqlite3_finalize0 (stmt);
-#line 549 "DatabaseTable.c"
+#line 564 "DatabaseTable.c"
 }
 
 
@@ -554,7 +569,7 @@ void database_table_terminate (void) {
 	_sqlite3_close0 (database_table_db);
 #line 105 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	database_table_db = NULL;
-#line 558 "DatabaseTable.c"
+#line 573 "DatabaseTable.c"
 }
 
 
@@ -575,7 +590,7 @@ void database_table_fatal (const gchar* op, gint res) {
 	_tmp3_ = sqlite3_errmsg (_tmp2_);
 #line 110 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	g_error ("DatabaseTable.vala:110: %s: [%d] %s", _tmp0_, _tmp1_, _tmp3_);
-#line 579 "DatabaseTable.c"
+#line 594 "DatabaseTable.c"
 }
 
 
@@ -596,7 +611,7 @@ void database_table_warning (const gchar* op, gint res) {
 	_tmp3_ = sqlite3_errmsg (_tmp2_);
 #line 115 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	g_warning ("DatabaseTable.vala:115: %s: [%d] %s", _tmp0_, _tmp1_, _tmp3_);
-#line 600 "DatabaseTable.c"
+#line 615 "DatabaseTable.c"
 }
 
 
@@ -615,7 +630,7 @@ void database_table_set_table_name (DatabaseTable* self, const gchar* table_name
 	_g_free0 (self->table_name);
 #line 119 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	self->table_name = _tmp1_;
-#line 619 "DatabaseTable.c"
+#line 634 "DatabaseTable.c"
 }
 
 
@@ -652,13 +667,13 @@ void database_table_throw_error (const gchar* method, gint res, GError** error)
 		case SQLITE_DONE:
 #line 127 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		case SQLITE_ROW:
-#line 656 "DatabaseTable.c"
+#line 671 "DatabaseTable.c"
 		{
 #line 131 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 			_g_free0 (msg);
 #line 131 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 			return;
-#line 662 "DatabaseTable.c"
+#line 677 "DatabaseTable.c"
 		}
 #line 127 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		case SQLITE_PERM:
@@ -680,7 +695,7 @@ void database_table_throw_error (const gchar* method, gint res, GError** error)
 		case SQLITE_FORMAT:
 #line 127 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		case SQLITE_NOTADB:
-#line 684 "DatabaseTable.c"
+#line 699 "DatabaseTable.c"
 		{
 			const gchar* _tmp6_ = NULL;
 			GError* _tmp7_ = NULL;
@@ -698,7 +713,7 @@ void database_table_throw_error (const gchar* method, gint res, GError** error)
 				_g_free0 (msg);
 #line 143 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 				return;
-#line 702 "DatabaseTable.c"
+#line 717 "DatabaseTable.c"
 			} else {
 #line 143 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 				_g_free0 (msg);
@@ -708,12 +723,12 @@ void database_table_throw_error (const gchar* method, gint res, GError** error)
 				g_clear_error (&_inner_error_);
 #line 143 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 				return;
-#line 712 "DatabaseTable.c"
+#line 727 "DatabaseTable.c"
 			}
 		}
 #line 127 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		case SQLITE_NOMEM:
-#line 717 "DatabaseTable.c"
+#line 732 "DatabaseTable.c"
 		{
 			const gchar* _tmp8_ = NULL;
 			GError* _tmp9_ = NULL;
@@ -731,7 +746,7 @@ void database_table_throw_error (const gchar* method, gint res, GError** error)
 				_g_free0 (msg);
 #line 146 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 				return;
-#line 735 "DatabaseTable.c"
+#line 750 "DatabaseTable.c"
 			} else {
 #line 146 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 				_g_free0 (msg);
@@ -741,7 +756,7 @@ void database_table_throw_error (const gchar* method, gint res, GError** error)
 				g_clear_error (&_inner_error_);
 #line 146 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 				return;
-#line 745 "DatabaseTable.c"
+#line 760 "DatabaseTable.c"
 			}
 		}
 #line 127 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
@@ -750,7 +765,7 @@ void database_table_throw_error (const gchar* method, gint res, GError** error)
 		case SQLITE_LOCKED:
 #line 127 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		case SQLITE_INTERRUPT:
-#line 754 "DatabaseTable.c"
+#line 769 "DatabaseTable.c"
 		{
 			const gchar* _tmp10_ = NULL;
 			GError* _tmp11_ = NULL;
@@ -768,7 +783,7 @@ void database_table_throw_error (const gchar* method, gint res, GError** error)
 				_g_free0 (msg);
 #line 151 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 				return;
-#line 772 "DatabaseTable.c"
+#line 787 "DatabaseTable.c"
 			} else {
 #line 151 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 				_g_free0 (msg);
@@ -778,7 +793,7 @@ void database_table_throw_error (const gchar* method, gint res, GError** error)
 				g_clear_error (&_inner_error_);
 #line 151 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 				return;
-#line 782 "DatabaseTable.c"
+#line 797 "DatabaseTable.c"
 			}
 		}
 #line 127 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
@@ -791,7 +806,7 @@ void database_table_throw_error (const gchar* method, gint res, GError** error)
 		case SQLITE_CONSTRAINT:
 #line 127 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		case SQLITE_RANGE:
-#line 795 "DatabaseTable.c"
+#line 810 "DatabaseTable.c"
 		{
 			const gchar* _tmp12_ = NULL;
 			GError* _tmp13_ = NULL;
@@ -809,7 +824,7 @@ void database_table_throw_error (const gchar* method, gint res, GError** error)
 				_g_free0 (msg);
 #line 158 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 				return;
-#line 813 "DatabaseTable.c"
+#line 828 "DatabaseTable.c"
 			} else {
 #line 158 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 				_g_free0 (msg);
@@ -819,14 +834,14 @@ void database_table_throw_error (const gchar* method, gint res, GError** error)
 				g_clear_error (&_inner_error_);
 #line 158 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 				return;
-#line 823 "DatabaseTable.c"
+#line 838 "DatabaseTable.c"
 			}
 		}
 #line 127 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		case SQLITE_SCHEMA:
 #line 127 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		case SQLITE_MISMATCH:
-#line 830 "DatabaseTable.c"
+#line 845 "DatabaseTable.c"
 		{
 			const gchar* _tmp14_ = NULL;
 			GError* _tmp15_ = NULL;
@@ -844,7 +859,7 @@ void database_table_throw_error (const gchar* method, gint res, GError** error)
 				_g_free0 (msg);
 #line 162 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 				return;
-#line 848 "DatabaseTable.c"
+#line 863 "DatabaseTable.c"
 			} else {
 #line 162 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 				_g_free0 (msg);
@@ -854,7 +869,7 @@ void database_table_throw_error (const gchar* method, gint res, GError** error)
 				g_clear_error (&_inner_error_);
 #line 162 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 				return;
-#line 858 "DatabaseTable.c"
+#line 873 "DatabaseTable.c"
 			}
 		}
 		default:
@@ -864,7 +879,7 @@ void database_table_throw_error (const gchar* method, gint res, GError** error)
 		case SQLITE_INTERNAL:
 #line 127 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		case SQLITE_MISUSE:
-#line 868 "DatabaseTable.c"
+#line 883 "DatabaseTable.c"
 		{
 			const gchar* _tmp16_ = NULL;
 			GError* _tmp17_ = NULL;
@@ -882,7 +897,7 @@ void database_table_throw_error (const gchar* method, gint res, GError** error)
 				_g_free0 (msg);
 #line 168 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 				return;
-#line 886 "DatabaseTable.c"
+#line 901 "DatabaseTable.c"
 			} else {
 #line 168 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 				_g_free0 (msg);
@@ -892,13 +907,13 @@ void database_table_throw_error (const gchar* method, gint res, GError** error)
 				g_clear_error (&_inner_error_);
 #line 168 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 				return;
-#line 896 "DatabaseTable.c"
+#line 911 "DatabaseTable.c"
 			}
 		}
 	}
 #line 124 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_g_free0 (msg);
-#line 902 "DatabaseTable.c"
+#line 917 "DatabaseTable.c"
 }
 
 
@@ -971,21 +986,21 @@ gboolean database_table_exists_by_id (DatabaseTable* self, gint64 id) {
 	_tmp15_ = res;
 #line 181 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	if (_tmp15_ != SQLITE_ROW) {
-#line 975 "DatabaseTable.c"
+#line 990 "DatabaseTable.c"
 		gint _tmp16_ = 0;
 #line 181 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		_tmp16_ = res;
 #line 181 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		_tmp14_ = _tmp16_ != SQLITE_DONE;
-#line 981 "DatabaseTable.c"
+#line 996 "DatabaseTable.c"
 	} else {
 #line 181 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		_tmp14_ = FALSE;
-#line 985 "DatabaseTable.c"
+#line 1000 "DatabaseTable.c"
 	}
 #line 181 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	if (_tmp14_) {
-#line 989 "DatabaseTable.c"
+#line 1004 "DatabaseTable.c"
 		gint64 _tmp17_ = 0LL;
 		gchar* _tmp18_ = NULL;
 		gchar* _tmp19_ = NULL;
@@ -1013,7 +1028,7 @@ gboolean database_table_exists_by_id (DatabaseTable* self, gint64 id) {
 		_g_free0 (_tmp22_);
 #line 182 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		_g_free0 (_tmp19_);
-#line 1017 "DatabaseTable.c"
+#line 1032 "DatabaseTable.c"
 	}
 #line 184 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_tmp24_ = res;
@@ -1023,7 +1038,7 @@ gboolean database_table_exists_by_id (DatabaseTable* self, gint64 id) {
 	_sqlite3_finalize0 (stmt);
 #line 184 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	return result;
-#line 1027 "DatabaseTable.c"
+#line 1042 "DatabaseTable.c"
 }
 
 
@@ -1099,21 +1114,21 @@ gboolean database_table_select_by_id (DatabaseTable* self, gint64 id, const gcha
 	_tmp15_ = res;
 #line 197 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	if (_tmp15_ != SQLITE_ROW) {
-#line 1103 "DatabaseTable.c"
+#line 1118 "DatabaseTable.c"
 		gint _tmp16_ = 0;
 #line 197 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		_tmp16_ = res;
 #line 197 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		_tmp14_ = _tmp16_ != SQLITE_DONE;
-#line 1109 "DatabaseTable.c"
+#line 1124 "DatabaseTable.c"
 	} else {
 #line 197 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		_tmp14_ = FALSE;
-#line 1113 "DatabaseTable.c"
+#line 1128 "DatabaseTable.c"
 	}
 #line 197 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	if (_tmp14_) {
-#line 1117 "DatabaseTable.c"
+#line 1132 "DatabaseTable.c"
 		gint64 _tmp17_ = 0LL;
 		gchar* _tmp18_ = NULL;
 		gchar* _tmp19_ = NULL;
@@ -1144,7 +1159,7 @@ gboolean database_table_select_by_id (DatabaseTable* self, gint64 id, const gcha
 		_g_free0 (_tmp23_);
 #line 198 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		_g_free0 (_tmp19_);
-#line 1148 "DatabaseTable.c"
+#line 1163 "DatabaseTable.c"
 	}
 #line 200 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_tmp25_ = res;
@@ -1156,15 +1171,15 @@ gboolean database_table_select_by_id (DatabaseTable* self, gint64 id, const gcha
 	if (stmt) {
 #line 200 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		*stmt = _vala_stmt;
-#line 1160 "DatabaseTable.c"
+#line 1175 "DatabaseTable.c"
 	} else {
 #line 200 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		_sqlite3_finalize0 (_vala_stmt);
-#line 1164 "DatabaseTable.c"
+#line 1179 "DatabaseTable.c"
 	}
 #line 200 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	return result;
-#line 1168 "DatabaseTable.c"
+#line 1183 "DatabaseTable.c"
 }
 
 
@@ -1224,11 +1239,11 @@ static void database_table_prepare_update_by_id (DatabaseTable* self, gint64 id,
 	if (stmt) {
 #line 204 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		*stmt = _vala_stmt;
-#line 1228 "DatabaseTable.c"
+#line 1243 "DatabaseTable.c"
 	} else {
 #line 204 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		_sqlite3_finalize0 (_vala_stmt);
-#line 1232 "DatabaseTable.c"
+#line 1247 "DatabaseTable.c"
 	}
 }
 
@@ -1253,7 +1268,7 @@ static gboolean database_table_execute_update_by_id (DatabaseTable* self, sqlite
 	_tmp2_ = res;
 #line 216 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	if (_tmp2_ != SQLITE_DONE) {
-#line 1257 "DatabaseTable.c"
+#line 1272 "DatabaseTable.c"
 		gint _tmp3_ = 0;
 #line 217 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		_tmp3_ = res;
@@ -1263,13 +1278,13 @@ static gboolean database_table_execute_update_by_id (DatabaseTable* self, sqlite
 		result = FALSE;
 #line 219 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		return result;
-#line 1267 "DatabaseTable.c"
+#line 1282 "DatabaseTable.c"
 	}
 #line 222 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	result = TRUE;
 #line 222 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	return result;
-#line 1273 "DatabaseTable.c"
+#line 1288 "DatabaseTable.c"
 }
 
 
@@ -1321,7 +1336,7 @@ gboolean database_table_update_text_by_id (DatabaseTable* self, gint64 id, const
 	_sqlite3_finalize0 (stmt);
 #line 232 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	return result;
-#line 1325 "DatabaseTable.c"
+#line 1340 "DatabaseTable.c"
 }
 
 
@@ -1383,7 +1398,7 @@ void database_table_update_text_by_id_2 (DatabaseTable* self, gint64 id, const g
 	_tmp11_ = res;
 #line 243 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	if (_tmp11_ != SQLITE_DONE) {
-#line 1387 "DatabaseTable.c"
+#line 1402 "DatabaseTable.c"
 		const gchar* _tmp12_ = NULL;
 		const gchar* _tmp13_ = NULL;
 		gchar* _tmp14_ = NULL;
@@ -1413,7 +1428,7 @@ void database_table_update_text_by_id_2 (DatabaseTable* self, gint64 id, const g
 				_sqlite3_finalize0 (stmt);
 #line 244 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 				return;
-#line 1417 "DatabaseTable.c"
+#line 1432 "DatabaseTable.c"
 			} else {
 #line 244 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 				_sqlite3_finalize0 (stmt);
@@ -1423,13 +1438,13 @@ void database_table_update_text_by_id_2 (DatabaseTable* self, gint64 id, const g
 				g_clear_error (&_inner_error_);
 #line 244 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 				return;
-#line 1427 "DatabaseTable.c"
+#line 1442 "DatabaseTable.c"
 			}
 		}
 	}
 #line 235 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_sqlite3_finalize0 (stmt);
-#line 1433 "DatabaseTable.c"
+#line 1448 "DatabaseTable.c"
 }
 
 
@@ -1473,7 +1488,7 @@ gboolean database_table_update_int_by_id (DatabaseTable* self, gint64 id, const
 	_sqlite3_finalize0 (stmt);
 #line 254 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	return result;
-#line 1477 "DatabaseTable.c"
+#line 1492 "DatabaseTable.c"
 }
 
 
@@ -1527,7 +1542,7 @@ void database_table_update_int_by_id_2 (DatabaseTable* self, gint64 id, const gc
 	_tmp9_ = res;
 #line 265 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	if (_tmp9_ != SQLITE_DONE) {
-#line 1531 "DatabaseTable.c"
+#line 1546 "DatabaseTable.c"
 		const gchar* _tmp10_ = NULL;
 		const gchar* _tmp11_ = NULL;
 		gchar* _tmp12_ = NULL;
@@ -1557,7 +1572,7 @@ void database_table_update_int_by_id_2 (DatabaseTable* self, gint64 id, const gc
 				_sqlite3_finalize0 (stmt);
 #line 266 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 				return;
-#line 1561 "DatabaseTable.c"
+#line 1576 "DatabaseTable.c"
 			} else {
 #line 266 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 				_sqlite3_finalize0 (stmt);
@@ -1567,13 +1582,13 @@ void database_table_update_int_by_id_2 (DatabaseTable* self, gint64 id, const gc
 				g_clear_error (&_inner_error_);
 #line 266 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 				return;
-#line 1571 "DatabaseTable.c"
+#line 1586 "DatabaseTable.c"
 			}
 		}
 	}
 #line 257 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_sqlite3_finalize0 (stmt);
-#line 1577 "DatabaseTable.c"
+#line 1592 "DatabaseTable.c"
 }
 
 
@@ -1617,7 +1632,7 @@ gboolean database_table_update_int64_by_id (DatabaseTable* self, gint64 id, cons
 	_sqlite3_finalize0 (stmt);
 #line 276 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	return result;
-#line 1621 "DatabaseTable.c"
+#line 1636 "DatabaseTable.c"
 }
 
 
@@ -1671,7 +1686,7 @@ void database_table_update_int64_by_id_2 (DatabaseTable* self, gint64 id, const
 	_tmp9_ = res;
 #line 287 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	if (_tmp9_ != SQLITE_DONE) {
-#line 1675 "DatabaseTable.c"
+#line 1690 "DatabaseTable.c"
 		const gchar* _tmp10_ = NULL;
 		const gchar* _tmp11_ = NULL;
 		gchar* _tmp12_ = NULL;
@@ -1701,7 +1716,7 @@ void database_table_update_int64_by_id_2 (DatabaseTable* self, gint64 id, const
 				_sqlite3_finalize0 (stmt);
 #line 288 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 				return;
-#line 1705 "DatabaseTable.c"
+#line 1720 "DatabaseTable.c"
 			} else {
 #line 288 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 				_sqlite3_finalize0 (stmt);
@@ -1711,13 +1726,13 @@ void database_table_update_int64_by_id_2 (DatabaseTable* self, gint64 id, const
 				g_clear_error (&_inner_error_);
 #line 288 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 				return;
-#line 1715 "DatabaseTable.c"
+#line 1730 "DatabaseTable.c"
 			}
 		}
 	}
 #line 279 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_sqlite3_finalize0 (stmt);
-#line 1721 "DatabaseTable.c"
+#line 1736 "DatabaseTable.c"
 }
 
 
@@ -1788,7 +1803,7 @@ void database_table_delete_by_id (DatabaseTable* self, gint64 id, GError** error
 	_tmp14_ = res;
 #line 300 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	if (_tmp14_ != SQLITE_DONE) {
-#line 1792 "DatabaseTable.c"
+#line 1807 "DatabaseTable.c"
 		const gchar* _tmp15_ = NULL;
 		gchar* _tmp16_ = NULL;
 		gchar* _tmp17_ = NULL;
@@ -1815,7 +1830,7 @@ void database_table_delete_by_id (DatabaseTable* self, gint64 id, GError** error
 				_sqlite3_finalize0 (stmt);
 #line 301 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 				return;
-#line 1819 "DatabaseTable.c"
+#line 1834 "DatabaseTable.c"
 			} else {
 #line 301 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 				_sqlite3_finalize0 (stmt);
@@ -1825,13 +1840,13 @@ void database_table_delete_by_id (DatabaseTable* self, gint64 id, GError** error
 				g_clear_error (&_inner_error_);
 #line 301 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 				return;
-#line 1829 "DatabaseTable.c"
+#line 1844 "DatabaseTable.c"
 			}
 		}
 	}
 #line 291 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_sqlite3_finalize0 (stmt);
-#line 1835 "DatabaseTable.c"
+#line 1850 "DatabaseTable.c"
 }
 
 
@@ -1875,20 +1890,20 @@ gboolean database_table_has_column (const gchar* table_name, const gchar* column
 	_tmp7_ = res;
 #line 307 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_vala_assert (_tmp7_ == SQLITE_OK, "res == Sqlite.OK");
-#line 1879 "DatabaseTable.c"
+#line 1894 "DatabaseTable.c"
 	{
 		gboolean _tmp8_ = FALSE;
 #line 309 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		_tmp8_ = TRUE;
 #line 309 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		while (TRUE) {
-#line 1886 "DatabaseTable.c"
+#line 1901 "DatabaseTable.c"
 			sqlite3_stmt* _tmp9_ = NULL;
 			gint _tmp10_ = 0;
 			gint _tmp11_ = 0;
 #line 309 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 			if (!_tmp8_) {
-#line 1892 "DatabaseTable.c"
+#line 1907 "DatabaseTable.c"
 			}
 #line 309 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 			_tmp8_ = FALSE;
@@ -1904,14 +1919,14 @@ gboolean database_table_has_column (const gchar* table_name, const gchar* column
 			if (_tmp11_ == SQLITE_DONE) {
 #line 312 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 				break;
-#line 1908 "DatabaseTable.c"
+#line 1923 "DatabaseTable.c"
 			} else {
 				gint _tmp12_ = 0;
 #line 313 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 				_tmp12_ = res;
 #line 313 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 				if (_tmp12_ != SQLITE_ROW) {
-#line 1915 "DatabaseTable.c"
+#line 1930 "DatabaseTable.c"
 					const gchar* _tmp13_ = NULL;
 					gchar* _tmp14_ = NULL;
 					gchar* _tmp15_ = NULL;
@@ -1930,7 +1945,7 @@ gboolean database_table_has_column (const gchar* table_name, const gchar* column
 					_g_free0 (_tmp15_);
 #line 316 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 					break;
-#line 1934 "DatabaseTable.c"
+#line 1949 "DatabaseTable.c"
 				} else {
 					gchar* column = NULL;
 					sqlite3_stmt* _tmp17_ = NULL;
@@ -1950,7 +1965,7 @@ gboolean database_table_has_column (const gchar* table_name, const gchar* column
 					_tmp21_ = column;
 #line 319 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 					if (_tmp21_ != NULL) {
-#line 1954 "DatabaseTable.c"
+#line 1969 "DatabaseTable.c"
 						const gchar* _tmp22_ = NULL;
 						const gchar* _tmp23_ = NULL;
 #line 319 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
@@ -1959,11 +1974,11 @@ gboolean database_table_has_column (const gchar* table_name, const gchar* column
 						_tmp23_ = column_name;
 #line 319 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 						_tmp20_ = g_strcmp0 (_tmp22_, _tmp23_) == 0;
-#line 1963 "DatabaseTable.c"
+#line 1978 "DatabaseTable.c"
 					} else {
 #line 319 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 						_tmp20_ = FALSE;
-#line 1967 "DatabaseTable.c"
+#line 1982 "DatabaseTable.c"
 					}
 #line 319 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 					if (_tmp20_) {
@@ -1975,11 +1990,11 @@ gboolean database_table_has_column (const gchar* table_name, const gchar* column
 						_sqlite3_finalize0 (stmt);
 #line 320 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 						return result;
-#line 1979 "DatabaseTable.c"
+#line 1994 "DatabaseTable.c"
 					}
 #line 313 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 					_g_free0 (column);
-#line 1983 "DatabaseTable.c"
+#line 1998 "DatabaseTable.c"
 				}
 			}
 		}
@@ -1990,7 +2005,7 @@ gboolean database_table_has_column (const gchar* table_name, const gchar* column
 	_sqlite3_finalize0 (stmt);
 #line 324 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	return result;
-#line 1994 "DatabaseTable.c"
+#line 2009 "DatabaseTable.c"
 }
 
 
@@ -2046,7 +2061,7 @@ gboolean database_table_has_table (const gchar* table_name) {
 	_sqlite3_finalize0 (stmt);
 #line 334 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	return result;
-#line 2050 "DatabaseTable.c"
+#line 2065 "DatabaseTable.c"
 }
 
 
@@ -2111,7 +2126,7 @@ gboolean database_table_add_column (const gchar* table_name, const gchar* column
 	_tmp12_ = res;
 #line 344 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	if (_tmp12_ != SQLITE_DONE) {
-#line 2115 "DatabaseTable.c"
+#line 2130 "DatabaseTable.c"
 		const gchar* _tmp13_ = NULL;
 		const gchar* _tmp14_ = NULL;
 		const gchar* _tmp15_ = NULL;
@@ -2138,7 +2153,7 @@ gboolean database_table_add_column (const gchar* table_name, const gchar* column
 		_sqlite3_finalize0 (stmt);
 #line 348 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		return result;
-#line 2142 "DatabaseTable.c"
+#line 2157 "DatabaseTable.c"
 	}
 #line 351 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	result = TRUE;
@@ -2146,7 +2161,7 @@ gboolean database_table_add_column (const gchar* table_name, const gchar* column
 	_sqlite3_finalize0 (stmt);
 #line 351 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	return result;
-#line 2150 "DatabaseTable.c"
+#line 2165 "DatabaseTable.c"
 }
 
 
@@ -2176,7 +2191,7 @@ gboolean database_table_ensure_column (const gchar* table_name, const gchar* col
 	if (!_tmp2_) {
 #line 359 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		_tmp0_ = TRUE;
-#line 2180 "DatabaseTable.c"
+#line 2195 "DatabaseTable.c"
 	} else {
 		const gchar* _tmp3_ = NULL;
 		const gchar* _tmp4_ = NULL;
@@ -2189,7 +2204,7 @@ gboolean database_table_ensure_column (const gchar* table_name, const gchar* col
 		_tmp5_ = database_table_has_column (_tmp3_, _tmp4_);
 #line 359 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		_tmp0_ = _tmp5_;
-#line 2193 "DatabaseTable.c"
+#line 2208 "DatabaseTable.c"
 	}
 #line 359 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	if (_tmp0_) {
@@ -2197,7 +2212,7 @@ gboolean database_table_ensure_column (const gchar* table_name, const gchar* col
 		result = TRUE;
 #line 360 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		return result;
-#line 2201 "DatabaseTable.c"
+#line 2216 "DatabaseTable.c"
 	}
 #line 362 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_tmp6_ = upgrade_msg;
@@ -2215,7 +2230,7 @@ gboolean database_table_ensure_column (const gchar* table_name, const gchar* col
 	result = _tmp10_;
 #line 364 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	return result;
-#line 2219 "DatabaseTable.c"
+#line 2234 "DatabaseTable.c"
 }
 
 
@@ -2272,7 +2287,7 @@ gint database_table_get_row_count (DatabaseTable* self) {
 	_tmp10_ = res;
 #line 373 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	if (_tmp10_ != SQLITE_ROW) {
-#line 2276 "DatabaseTable.c"
+#line 2291 "DatabaseTable.c"
 		const gchar* _tmp11_ = NULL;
 		gint _tmp12_ = 0;
 		sqlite3* _tmp13_ = NULL;
@@ -2293,7 +2308,7 @@ gint database_table_get_row_count (DatabaseTable* self) {
 		_sqlite3_finalize0 (stmt);
 #line 376 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		return result;
-#line 2297 "DatabaseTable.c"
+#line 2312 "DatabaseTable.c"
 	}
 #line 379 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_tmp15_ = stmt;
@@ -2305,7 +2320,7 @@ gint database_table_get_row_count (DatabaseTable* self) {
 	_sqlite3_finalize0 (stmt);
 #line 379 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	return result;
-#line 2309 "DatabaseTable.c"
+#line 2324 "DatabaseTable.c"
 }
 
 
@@ -2323,7 +2338,7 @@ void database_table_begin_transaction (void) {
 	if (_tmp0_ != 0) {
 #line 385 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		return;
-#line 2327 "DatabaseTable.c"
+#line 2342 "DatabaseTable.c"
 	}
 #line 387 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_tmp1_ = database_table_db;
@@ -2335,7 +2350,7 @@ void database_table_begin_transaction (void) {
 	_tmp3_ = res;
 #line 388 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_vala_assert (_tmp3_ == SQLITE_OK, "res == Sqlite.OK");
-#line 2339 "DatabaseTable.c"
+#line 2354 "DatabaseTable.c"
 }
 
 
@@ -2362,7 +2377,7 @@ void database_table_commit_transaction (GError** error) {
 	if (_tmp2_ != 0) {
 #line 395 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		return;
-#line 2366 "DatabaseTable.c"
+#line 2381 "DatabaseTable.c"
 	}
 #line 397 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_tmp3_ = database_table_db;
@@ -2374,7 +2389,7 @@ void database_table_commit_transaction (GError** error) {
 	_tmp5_ = res;
 #line 398 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	if (_tmp5_ != SQLITE_DONE) {
-#line 2378 "DatabaseTable.c"
+#line 2393 "DatabaseTable.c"
 		gint _tmp6_ = 0;
 #line 399 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		_tmp6_ = res;
@@ -2388,7 +2403,7 @@ void database_table_commit_transaction (GError** error) {
 				g_propagate_error (error, _inner_error_);
 #line 399 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 				return;
-#line 2392 "DatabaseTable.c"
+#line 2407 "DatabaseTable.c"
 			} else {
 #line 399 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 				g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -2396,7 +2411,7 @@ void database_table_commit_transaction (GError** error) {
 				g_clear_error (&_inner_error_);
 #line 399 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 				return;
-#line 2400 "DatabaseTable.c"
+#line 2415 "DatabaseTable.c"
 			}
 		}
 	}
@@ -2409,14 +2424,14 @@ DatabaseTable* database_table_construct (GType object_type) {
 	self = (DatabaseTable*) g_type_create_instance (object_type);
 #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	return self;
-#line 2413 "DatabaseTable.c"
+#line 2428 "DatabaseTable.c"
 }
 
 
 static void value_database_table_init (GValue* value) {
 #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	value->data[0].v_pointer = NULL;
-#line 2420 "DatabaseTable.c"
+#line 2435 "DatabaseTable.c"
 }
 
 
@@ -2425,7 +2440,7 @@ static void value_database_table_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		database_table_unref (value->data[0].v_pointer);
-#line 2429 "DatabaseTable.c"
+#line 2444 "DatabaseTable.c"
 	}
 }
 
@@ -2435,11 +2450,11 @@ static void value_database_table_copy_value (const GValue* src_value, GValue* de
 	if (src_value->data[0].v_pointer) {
 #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		dest_value->data[0].v_pointer = database_table_ref (src_value->data[0].v_pointer);
-#line 2439 "DatabaseTable.c"
+#line 2454 "DatabaseTable.c"
 	} else {
 #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 2443 "DatabaseTable.c"
+#line 2458 "DatabaseTable.c"
 	}
 }
 
@@ -2447,37 +2462,37 @@ static void value_database_table_copy_value (const GValue* src_value, GValue* de
 static gpointer value_database_table_peek_pointer (const GValue* value) {
 #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	return value->data[0].v_pointer;
-#line 2451 "DatabaseTable.c"
+#line 2466 "DatabaseTable.c"
 }
 
 
 static gchar* value_database_table_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	if (collect_values[0].v_pointer) {
-#line 2458 "DatabaseTable.c"
+#line 2473 "DatabaseTable.c"
 		DatabaseTable* object;
 		object = collect_values[0].v_pointer;
 #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 2465 "DatabaseTable.c"
+#line 2480 "DatabaseTable.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 2469 "DatabaseTable.c"
+#line 2484 "DatabaseTable.c"
 		}
 #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		value->data[0].v_pointer = database_table_ref (object);
-#line 2473 "DatabaseTable.c"
+#line 2488 "DatabaseTable.c"
 	} else {
 #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		value->data[0].v_pointer = NULL;
-#line 2477 "DatabaseTable.c"
+#line 2492 "DatabaseTable.c"
 	}
 #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	return NULL;
-#line 2481 "DatabaseTable.c"
+#line 2496 "DatabaseTable.c"
 }
 
 
@@ -2488,25 +2503,25 @@ static gchar* value_database_table_lcopy_value (const GValue* value, guint n_col
 	if (!object_p) {
 #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 2492 "DatabaseTable.c"
+#line 2507 "DatabaseTable.c"
 	}
 #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	if (!value->data[0].v_pointer) {
 #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		*object_p = NULL;
-#line 2498 "DatabaseTable.c"
+#line 2513 "DatabaseTable.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		*object_p = value->data[0].v_pointer;
-#line 2502 "DatabaseTable.c"
+#line 2517 "DatabaseTable.c"
 	} else {
 #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		*object_p = database_table_ref (value->data[0].v_pointer);
-#line 2506 "DatabaseTable.c"
+#line 2521 "DatabaseTable.c"
 	}
 #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	return NULL;
-#line 2510 "DatabaseTable.c"
+#line 2525 "DatabaseTable.c"
 }
 
 
@@ -2520,7 +2535,7 @@ GParamSpec* param_spec_database_table (const gchar* name, const gchar* nick, con
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	return G_PARAM_SPEC (spec);
-#line 2524 "DatabaseTable.c"
+#line 2539 "DatabaseTable.c"
 }
 
 
@@ -2529,7 +2544,7 @@ gpointer value_get_database_table (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_DATABASE_TABLE), NULL);
 #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	return value->data[0].v_pointer;
-#line 2533 "DatabaseTable.c"
+#line 2548 "DatabaseTable.c"
 }
 
 
@@ -2549,17 +2564,17 @@ void value_set_database_table (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		database_table_ref (value->data[0].v_pointer);
-#line 2553 "DatabaseTable.c"
+#line 2568 "DatabaseTable.c"
 	} else {
 #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		value->data[0].v_pointer = NULL;
-#line 2557 "DatabaseTable.c"
+#line 2572 "DatabaseTable.c"
 	}
 #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	if (old) {
 #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		database_table_unref (old);
-#line 2563 "DatabaseTable.c"
+#line 2578 "DatabaseTable.c"
 	}
 }
 
@@ -2578,17 +2593,17 @@ void value_take_database_table (GValue* value, gpointer v_object) {
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		value->data[0].v_pointer = v_object;
-#line 2582 "DatabaseTable.c"
+#line 2597 "DatabaseTable.c"
 	} else {
 #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		value->data[0].v_pointer = NULL;
-#line 2586 "DatabaseTable.c"
+#line 2601 "DatabaseTable.c"
 	}
 #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	if (old) {
 #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		database_table_unref (old);
-#line 2592 "DatabaseTable.c"
+#line 2607 "DatabaseTable.c"
 	}
 }
 
@@ -2598,7 +2613,7 @@ static void database_table_class_init (DatabaseTableClass * klass) {
 	database_table_parent_class = g_type_class_peek_parent (klass);
 #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	((DatabaseTableClass *) klass)->finalize = database_table_finalize;
-#line 2602 "DatabaseTable.c"
+#line 2617 "DatabaseTable.c"
 }
 
 
@@ -2607,7 +2622,7 @@ static void database_table_instance_init (DatabaseTable * self) {
 	self->table_name = NULL;
 #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	self->ref_count = 1;
-#line 2611 "DatabaseTable.c"
+#line 2626 "DatabaseTable.c"
 }
 
 
@@ -2619,7 +2634,7 @@ static void database_table_finalize (DatabaseTable* obj) {
 	g_signal_handlers_destroy (self);
 #line 30 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	_g_free0 (self->table_name);
-#line 2623 "DatabaseTable.c"
+#line 2638 "DatabaseTable.c"
 }
 
 
@@ -2644,7 +2659,7 @@ gpointer database_table_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 	return instance;
-#line 2648 "DatabaseTable.c"
+#line 2663 "DatabaseTable.c"
 }
 
 
@@ -2657,7 +2672,7 @@ void database_table_unref (gpointer instance) {
 		DATABASE_TABLE_GET_CLASS (self)->finalize (self);
 #line 16 "/home/jens/Source/shotwell/src/db/DatabaseTable.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 2661 "DatabaseTable.c"
+#line 2676 "DatabaseTable.c"
 	}
 }
 
diff --git a/src/db/DatabaseTable.vala b/src/db/DatabaseTable.vala
index 4fc8853..5ec5be1 100644
--- a/src/db/DatabaseTable.vala
+++ b/src/db/DatabaseTable.vala
@@ -53,7 +53,7 @@ public abstract class DatabaseTable {
         unowned string? sql_debug = Environment.get_variable
                                                          ("SHOTWELL_SQL_DEBUG");
 
-        if (sql_debug != "") {
+        if (sql_debug != null && sql_debug != "") {
             db.trace (on_trace);
         }
     }
diff --git a/src/direct/DirectPhoto.c b/src/direct/DirectPhoto.c
index 5fe58c0..b80ec06 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 __catch42_g_error;
+			goto __catch43_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 __finally42;
-	__catch42_g_error:
+	goto __finally43;
+	__catch43_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"
 	}
-	__finally42:
+	__finally43:
 #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 __catch43_g_error;
+			goto __catch44_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 __catch43_g_error;
+			goto __catch44_g_error;
 		}
 	}
-	goto __finally43;
-	__catch43_g_error:
+	goto __finally44;
+	__catch44_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"
 	}
-	__finally43:
+	__finally44:
 #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 __catch44_g_error;
+					goto __catch45_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 __catch44_g_error;
+						goto __catch45_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 __finally44;
-			__catch44_g_error:
+			goto __finally45;
+			__catch45_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"
 			}
-			__finally44:
+			__finally45:
 #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 d837f7d..1eea167 100644
--- a/src/direct/DirectPhotoPage.c
+++ b/src/direct/DirectPhotoPage.c
@@ -683,12 +683,12 @@ static void _direct_photo_page_on_save_as_gtk_action_callback (GtkAction* action
 static void _vala_array_add93 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
 static void direct_photo_page_on_send_to (DirectPhotoPage* self);
 static void _direct_photo_page_on_send_to_gtk_action_callback (GtkAction* action, gpointer self);
-#define RESOURCES_SEND_TO_MENU _ ("Send _To...")
+#define RESOURCES_SEND_TO_MENU _ ("Send _To…")
 static void _vala_array_add94 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
 #define RESOURCES_PRINT_LABEL _ ("_Print")
 static void direct_photo_page_on_print (DirectPhotoPage* self);
 static void _direct_photo_page_on_print_gtk_action_callback (GtkAction* action, gpointer self);
-#define RESOURCES_PRINT_MENU _ ("_Print...")
+#define RESOURCES_PRINT_MENU _ ("_Print…")
 static void _vala_array_add95 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
 static void _vala_array_add96 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
 static void _vala_array_add97 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
@@ -726,13 +726,13 @@ static void _vala_array_add104 (GtkActionEntry** array, int* length, int* size,
 void editing_host_page_on_enhance (EditingHostPage* self);
 static void _editing_host_page_on_enhance_gtk_action_callback (GtkAction* action, gpointer self);
 #define RESOURCES_ENHANCE_MENU _ ("_Enhance")
-#define RESOURCES_ENHANCE_TOOLTIP _ ("Automatically improve the photo's appearance")
+#define RESOURCES_ENHANCE_TOOLTIP _ ("Automatically improve the photo’s appearance")
 static void _vala_array_add105 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
 #define RESOURCES_CROP "shotwell-crop"
 void editing_host_page_toggle_crop (EditingHostPage* self);
 static void _editing_host_page_toggle_crop_gtk_action_callback (GtkAction* action, gpointer self);
 #define RESOURCES_CROP_MENU _ ("_Crop")
-#define RESOURCES_CROP_TOOLTIP _ ("Crop the photo's size")
+#define RESOURCES_CROP_TOOLTIP _ ("Crop the photo’s size")
 static void _vala_array_add106 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
 #define RESOURCES_REFRESH_LABEL _ ("_Refresh")
 void editing_host_page_toggle_straighten (EditingHostPage* self);
@@ -750,7 +750,7 @@ static void _vala_array_add108 (GtkActionEntry** array, int* length, int* size,
 void editing_host_page_toggle_adjust (EditingHostPage* self);
 static void _editing_host_page_toggle_adjust_gtk_action_callback (GtkAction* action, gpointer self);
 #define RESOURCES_ADJUST_MENU _ ("_Adjust")
-#define RESOURCES_ADJUST_TOOLTIP _ ("Adjust the photo's color and tone")
+#define RESOURCES_ADJUST_TOOLTIP _ ("Adjust the photo’s color and tone")
 static void _vala_array_add109 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
 #define RESOURCES_REVERT_LABEL _ ("Revert to Original")
 void editing_host_page_on_revert (EditingHostPage* self);
@@ -759,7 +759,7 @@ static void _editing_host_page_on_revert_gtk_action_callback (GtkAction* action,
 static void _vala_array_add110 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
 void editing_host_page_on_adjust_date_time (EditingHostPage* self);
 static void _editing_host_page_on_adjust_date_time_gtk_action_callback (GtkAction* action, gpointer self);
-#define RESOURCES_ADJUST_DATE_TIME_MENU _ ("_Adjust Date and Time...")
+#define RESOURCES_ADJUST_DATE_TIME_MENU _ ("_Adjust Date and Time…")
 static void _vala_array_add111 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
 void editing_host_page_on_set_background (EditingHostPage* self);
 static void _editing_host_page_on_set_background_gtk_action_callback (GtkAction* action, gpointer self);
@@ -1931,7 +1931,7 @@ static GtkActionEntry* direct_photo_page_real_init_collect_action_entries (Page*
 #line 55 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	save_as = _tmp11_;
 #line 57 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp12_ = _ ("Save _As...");
+	_tmp12_ = _ ("Save _As…");
 #line 57 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	save_as.label = _tmp12_;
 #line 58 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
@@ -4270,11 +4270,11 @@ static void direct_photo_page_save (DirectPhotoPage* self, GFile* dest, gint sca
 #line 467 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 4273 "DirectPhotoPage.c"
-			goto __catch45_g_error;
+			goto __catch46_g_error;
 		}
 	}
-	goto __finally45;
-	__catch45_g_error:
+	goto __finally46;
+	__catch46_g_error:
 	{
 		GError* err = NULL;
 		const gchar* _tmp11_ = NULL;
@@ -4317,7 +4317,7 @@ static void direct_photo_page_save (DirectPhotoPage* self, GFile* dest, gint sca
 		return;
 #line 4319 "DirectPhotoPage.c"
 	}
-	__finally45:
+	__finally46:
 #line 466 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 466 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
diff --git a/src/direct/DirectPhotoPage.vala b/src/direct/DirectPhotoPage.vala
index 3d23528..2a56887 100644
--- a/src/direct/DirectPhotoPage.vala
+++ b/src/direct/DirectPhotoPage.vala
@@ -54,7 +54,7 @@ public class DirectPhotoPage : EditingHostPage {
 
         Gtk.ActionEntry save_as = { "SaveAs", Resources.SAVE_AS_LABEL, TRANSLATABLE,
             "<Ctrl><Shift>S", TRANSLATABLE, on_save_as };
-        save_as.label = _("Save _As...");
+        save_as.label = _("Save _As…");
         save_as.tooltip = _("Save photo with a different name");
         actions += save_as;
         
diff --git a/src/editing_tools/EditingTools.c b/src/editing_tools/EditingTools.c
index 7c01aaa..31a2bf2 100644
--- a/src/editing_tools/EditingTools.c
+++ b/src/editing_tools/EditingTools.c
@@ -513,6 +513,16 @@ typedef struct _SaturationTransformationClass SaturationTransformationClass;
 
 typedef struct _ExposureTransformation ExposureTransformation;
 typedef struct _ExposureTransformationClass ExposureTransformationClass;
+
+#define TYPE_CONTRAST_TRANSFORMATION (contrast_transformation_get_type ())
+#define CONTRAST_TRANSFORMATION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_CONTRAST_TRANSFORMATION, ContrastTransformation))
+#define CONTRAST_TRANSFORMATION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_CONTRAST_TRANSFORMATION, ContrastTransformationClass))
+#define IS_CONTRAST_TRANSFORMATION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_CONTRAST_TRANSFORMATION))
+#define IS_CONTRAST_TRANSFORMATION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_CONTRAST_TRANSFORMATION))
+#define CONTRAST_TRANSFORMATION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_CONTRAST_TRANSFORMATION, ContrastTransformationClass))
+
+typedef struct _ContrastTransformation ContrastTransformation;
+typedef struct _ContrastTransformationClass ContrastTransformationClass;
 #define _pixel_transformation_unref0(var) ((var == NULL) ? NULL : (var = (pixel_transformation_unref (var), NULL)))
 
 #define EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_TOOL_COMMAND (editing_tools_adjust_tool_adjust_tool_command_get_type ())
@@ -885,6 +895,7 @@ struct _EditingToolsAdjustToolPrivate {
 	gboolean disable_histogram_refresh;
 	OneShotScheduler* temperature_scheduler;
 	OneShotScheduler* tint_scheduler;
+	OneShotScheduler* contrast_scheduler;
 	OneShotScheduler* saturation_scheduler;
 	OneShotScheduler* exposure_scheduler;
 	OneShotScheduler* shadows_scheduler;
@@ -898,13 +909,15 @@ typedef enum  {
 	PIXEL_TRANSFORMATION_TYPE_TEMPERATURE,
 	PIXEL_TRANSFORMATION_TYPE_TINT,
 	PIXEL_TRANSFORMATION_TYPE_SATURATION,
-	PIXEL_TRANSFORMATION_TYPE_EXPOSURE
+	PIXEL_TRANSFORMATION_TYPE_EXPOSURE,
+	PIXEL_TRANSFORMATION_TYPE_CONTRAST
 } PixelTransformationType;
 
 struct _EditingToolsAdjustToolAdjustToolWindow {
 	EditingToolsEditingToolWindow parent_instance;
 	EditingToolsAdjustToolAdjustToolWindowPrivate * priv;
 	GtkScale* exposure_slider;
+	GtkHScale* contrast_slider;
 	GtkScale* saturation_slider;
 	GtkScale* tint_slider;
 	GtkScale* temperature_slider;
@@ -1293,7 +1306,7 @@ void configuration_facade_set_last_crop_menu_choice (ConfigurationFacade* self,
 void configuration_facade_set_last_crop_width (ConfigurationFacade* self, gint choice);
 void configuration_facade_set_last_crop_height (ConfigurationFacade* self, gint choice);
 #define RESOURCES_CROP_LABEL _ ("Crop")
-#define RESOURCES_CROP_TOOLTIP _ ("Crop the photo's size")
+#define RESOURCES_CROP_TOOLTIP _ ("Crop the photo’s size")
 CropCommand* crop_command_new (Photo* photo, Box* crop, const gchar* name, const gchar* explanation);
 CropCommand* crop_command_construct (GType object_type, Photo* photo, Box* crop, const gchar* name, const gchar* explanation);
 GType page_command_get_type (void) G_GNUC_CONST;
@@ -1480,6 +1493,8 @@ GType saturation_transformation_get_type (void) G_GNUC_CONST;
 gfloat saturation_transformation_get_parameter (SaturationTransformation* self);
 GType exposure_transformation_get_type (void) G_GNUC_CONST;
 gfloat exposure_transformation_get_parameter (ExposureTransformation* self);
+GType contrast_transformation_get_type (void) G_GNUC_CONST;
+gfloat contrast_transformation_get_parameter (ContrastTransformation* self);
 static void editing_tools_adjust_tool_bind_canvas_handlers (EditingToolsAdjustTool* self, EditingToolsPhotoCanvas* canvas);
 static void editing_tools_adjust_tool_bind_window_handlers (EditingToolsAdjustTool* self);
 static void editing_tools_adjust_tool_init_fp_pixel_cache (EditingToolsAdjustTool* self, GdkPixbuf* source);
@@ -1502,7 +1517,7 @@ static EditingToolsAdjustToolAdjustResetCommand* editing_tools_adjust_tool_adjus
 static EditingToolsAdjustToolAdjustResetCommand* editing_tools_adjust_tool_adjust_reset_command_construct (GType object_type, EditingToolsAdjustTool* owner, PixelTransformationBundle* current);
 static void editing_tools_adjust_tool_on_ok (EditingToolsAdjustTool* self);
 #define RESOURCES_ADJUST_LABEL _ ("Adjust")
-#define RESOURCES_ADJUST_TOOLTIP _ ("Adjust the photo's color and tone")
+#define RESOURCES_ADJUST_TOOLTIP _ ("Adjust the photo’s color and tone")
 AdjustColorsSingleCommand* adjust_colors_single_command_new (Photo* photo, PixelTransformationBundle* transformations, const gchar* name, const gchar* explanation);
 AdjustColorsSingleCommand* adjust_colors_single_command_construct (GType object_type, Photo* photo, PixelTransformationBundle* transformations, const gchar* name, const gchar* explanation);
 GType adjust_colors_single_command_get_type (void) G_GNUC_CONST;
@@ -1529,6 +1544,11 @@ static void editing_tools_adjust_tool_on_delayed_tint_adjustment (EditingToolsAd
 static void _editing_tools_adjust_tool_on_delayed_tint_adjustment_one_shot_callback (gpointer self);
 TintTransformation* tint_transformation_new (gfloat client_param);
 TintTransformation* tint_transformation_construct (GType object_type, gfloat client_param);
+static void editing_tools_adjust_tool_on_contrast_adjustment (EditingToolsAdjustTool* self);
+static void editing_tools_adjust_tool_on_delayed_contrast_adjustment (EditingToolsAdjustTool* self);
+static void _editing_tools_adjust_tool_on_delayed_contrast_adjustment_one_shot_callback (gpointer self);
+ContrastTransformation* contrast_transformation_new (gfloat client_parameter);
+ContrastTransformation* contrast_transformation_construct (GType object_type, gfloat client_parameter);
 static void editing_tools_adjust_tool_on_saturation_adjustment (EditingToolsAdjustTool* self);
 static void editing_tools_adjust_tool_on_delayed_saturation_adjustment (EditingToolsAdjustTool* self);
 static void _editing_tools_adjust_tool_on_delayed_saturation_adjustment_one_shot_callback (gpointer self);
@@ -1561,6 +1581,7 @@ static void _editing_tools_adjust_tool_on_canvas_resize_editing_tools_photo_canv
 static void _editing_tools_adjust_tool_on_ok_gtk_button_clicked (GtkButton* _sender, gpointer self);
 static void _editing_tools_adjust_tool_on_reset_gtk_button_clicked (GtkButton* _sender, gpointer self);
 static void _editing_tools_adjust_tool_on_exposure_adjustment_gtk_range_value_changed (GtkRange* _sender, gpointer self);
+static void _editing_tools_adjust_tool_on_contrast_adjustment_gtk_range_value_changed (GtkRange* _sender, gpointer self);
 static void _editing_tools_adjust_tool_on_saturation_adjustment_gtk_range_value_changed (GtkRange* _sender, gpointer self);
 static void _editing_tools_adjust_tool_on_tint_adjustment_gtk_range_value_changed (GtkRange* _sender, gpointer self);
 static void _editing_tools_adjust_tool_on_temperature_adjustment_gtk_range_value_changed (GtkRange* _sender, gpointer self);
@@ -1580,6 +1601,8 @@ enum  {
 };
 #define EXPOSURE_TRANSFORMATION_MIN_PARAMETER (-16.0f)
 #define EXPOSURE_TRANSFORMATION_MAX_PARAMETER 16.0f
+#define CONTRAST_TRANSFORMATION_MIN_PARAMETER (-16.0f)
+#define CONTRAST_TRANSFORMATION_MAX_PARAMETER 16.0f
 #define SATURATION_TRANSFORMATION_MIN_PARAMETER (-16.0f)
 #define SATURATION_TRANSFORMATION_MAX_PARAMETER 16.0f
 #define TINT_TRANSFORMATION_MIN_PARAMETER (-16.0f)
@@ -1631,7 +1654,7 @@ enum  {
 	EDITING_TOOLS_ADJUST_TOOL_ADJUST_ENHANCE_COMMAND_DUMMY_PROPERTY
 };
 #define RESOURCES_ENHANCE_LABEL _ ("Enhance")
-#define RESOURCES_ENHANCE_TOOLTIP _ ("Automatically improve the photo's appearance")
+#define RESOURCES_ENHANCE_TOOLTIP _ ("Automatically improve the photo’s appearance")
 static void editing_tools_adjust_tool_adjust_enhance_command_real_execute (Command* base);
 PixelTransformationBundle* photo_get_enhance_transformations (Photo* self);
 static void editing_tools_adjust_tool_adjust_enhance_command_real_undo (Command* base);
@@ -1660,7 +1683,7 @@ void editing_tools_terminate (void) {
 static void _suppress_warnings_glog_func (const gchar* log_domain, GLogLevelFlags log_levels, const gchar* message, gpointer self) {
 #line 59 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	suppress_warnings (log_domain, log_levels, message);
-#line 1664 "EditingTools.c"
+#line 1687 "EditingTools.c"
 }
 
 
@@ -1724,7 +1747,7 @@ EditingToolsEditingToolWindow* editing_tools_editing_tool_window_construct (GTyp
 	_g_object_unref0 (outer_frame);
 #line 34 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return self;
-#line 1728 "EditingTools.c"
+#line 1751 "EditingTools.c"
 }
 
 
@@ -1742,7 +1765,7 @@ static void editing_tools_editing_tool_window_real_add (GtkContainer* base, GtkW
 	_tmp1_ = widget;
 #line 67 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_container_get_type (), GtkContainer), _tmp1_);
-#line 1746 "EditingTools.c"
+#line 1769 "EditingTools.c"
 }
 
 
@@ -1757,7 +1780,7 @@ gboolean editing_tools_editing_tool_window_has_user_moved (EditingToolsEditingTo
 	result = _tmp0_;
 #line 71 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 1761 "EditingTools.c"
+#line 1784 "EditingTools.c"
 }
 
 
@@ -1785,7 +1808,7 @@ static gboolean editing_tools_editing_tool_window_real_key_press_event (GtkWidge
 		result = TRUE;
 #line 76 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return result;
-#line 1789 "EditingTools.c"
+#line 1812 "EditingTools.c"
 	}
 #line 78 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = app_window_get_instance ();
@@ -1803,7 +1826,7 @@ static gboolean editing_tools_editing_tool_window_real_key_press_event (GtkWidge
 	result = _tmp6_;
 #line 78 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 1807 "EditingTools.c"
+#line 1830 "EditingTools.c"
 }
 
 
@@ -1830,11 +1853,11 @@ static gboolean editing_tools_editing_tool_window_real_button_press_event (GtkWi
 	_tmp1_ = _tmp0_->button;
 #line 83 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp1_ != ((guint) 1)) {
-#line 1834 "EditingTools.c"
+#line 1857 "EditingTools.c"
 		gboolean _tmp2_ = FALSE;
 #line 84 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		if (GTK_WIDGET_CLASS (editing_tools_editing_tool_window_parent_class)->button_press_event != NULL) {
-#line 1838 "EditingTools.c"
+#line 1861 "EditingTools.c"
 			GdkEventButton* _tmp3_ = NULL;
 			gboolean _tmp4_ = FALSE;
 #line 84 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -1843,17 +1866,17 @@ static gboolean editing_tools_editing_tool_window_real_button_press_event (GtkWi
 			_tmp4_ = GTK_WIDGET_CLASS (editing_tools_editing_tool_window_parent_class)->button_press_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), gtk_widget_get_type (), GtkWidget), _tmp3_);
 #line 84 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp2_ = _tmp4_;
-#line 1847 "EditingTools.c"
+#line 1870 "EditingTools.c"
 		} else {
 #line 84 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp2_ = TRUE;
-#line 1851 "EditingTools.c"
+#line 1874 "EditingTools.c"
 		}
 #line 84 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		result = _tmp2_;
 #line 84 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return result;
-#line 1857 "EditingTools.c"
+#line 1880 "EditingTools.c"
 	}
 #line 86 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = event;
@@ -1879,7 +1902,7 @@ static gboolean editing_tools_editing_tool_window_real_button_press_event (GtkWi
 	result = TRUE;
 #line 89 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 1883 "EditingTools.c"
+#line 1906 "EditingTools.c"
 }
 
 
@@ -1891,7 +1914,7 @@ static void editing_tools_editing_tool_window_real_realize (GtkWidget* base) {
 	gtk_window_set_opacity (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), RESOURCES_TRANSIENT_WINDOW_OPACITY);
 #line 95 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	GTK_WIDGET_CLASS (editing_tools_editing_tool_window_parent_class)->realize (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), gtk_widget_get_type (), GtkWidget));
-#line 1895 "EditingTools.c"
+#line 1918 "EditingTools.c"
 }
 
 
@@ -1910,7 +1933,7 @@ static void editing_tools_editing_tool_window_class_init (EditingToolsEditingToo
 	((GtkWidgetClass *) klass)->realize = editing_tools_editing_tool_window_real_realize;
 #line 28 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	G_OBJECT_CLASS (klass)->finalize = editing_tools_editing_tool_window_finalize;
-#line 1914 "EditingTools.c"
+#line 1937 "EditingTools.c"
 }
 
 
@@ -1926,7 +1949,7 @@ static void editing_tools_editing_tool_window_instance_init (EditingToolsEditing
 	self->priv->layout_frame = _tmp0_;
 #line 32 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->user_moved = FALSE;
-#line 1930 "EditingTools.c"
+#line 1953 "EditingTools.c"
 }
 
 
@@ -1946,7 +1969,7 @@ static void editing_tools_editing_tool_window_finalize (GObject* obj) {
 	_g_object_unref0 (self->priv->layout_frame);
 #line 28 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	G_OBJECT_CLASS (editing_tools_editing_tool_window_parent_class)->finalize (obj);
-#line 1950 "EditingTools.c"
+#line 1973 "EditingTools.c"
 }
 
 
@@ -1965,14 +1988,14 @@ GType editing_tools_editing_tool_window_get_type (void) {
 static gpointer _g_object_ref0 (gpointer self) {
 #line 114 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 1969 "EditingTools.c"
+#line 1992 "EditingTools.c"
 }
 
 
 static gpointer _cairo_reference0 (gpointer self) {
 #line 117 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return self ? cairo_reference (self) : NULL;
-#line 1976 "EditingTools.c"
+#line 1999 "EditingTools.c"
 }
 
 
@@ -2072,7 +2095,7 @@ EditingToolsPhotoCanvas* editing_tools_photo_canvas_construct (GType object_type
 	self->priv->scaled = _tmp15_;
 #line 112 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return self;
-#line 2076 "EditingTools.c"
+#line 2099 "EditingTools.c"
 }
 
 
@@ -2094,7 +2117,7 @@ void editing_tools_photo_canvas_unscaled_to_raw_rect (EditingToolsPhotoCanvas* s
 	*result = _tmp2_;
 #line 130 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return;
-#line 2098 "EditingTools.c"
+#line 2121 "EditingTools.c"
 }
 
 
@@ -2174,7 +2197,7 @@ void editing_tools_photo_canvas_active_to_unscaled_point (EditingToolsPhotoCanva
 	*result = _result_;
 #line 146 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return;
-#line 2178 "EditingTools.c"
+#line 2201 "EditingTools.c"
 }
 
 
@@ -2306,7 +2329,7 @@ void editing_tools_photo_canvas_active_to_unscaled_rect (EditingToolsPhotoCanvas
 	*result = unscaled_rect;
 #line 166 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return;
-#line 2310 "EditingTools.c"
+#line 2333 "EditingTools.c"
 }
 
 
@@ -2359,7 +2382,7 @@ void editing_tools_photo_canvas_user_to_active_point (EditingToolsPhotoCanvas* s
 	*result = _result_;
 #line 176 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return;
-#line 2363 "EditingTools.c"
+#line 2386 "EditingTools.c"
 }
 
 
@@ -2491,7 +2514,7 @@ void editing_tools_photo_canvas_user_to_active_rect (EditingToolsPhotoCanvas* se
 	*result = active_rect;
 #line 196 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return;
-#line 2495 "EditingTools.c"
+#line 2518 "EditingTools.c"
 }
 
 
@@ -2509,7 +2532,7 @@ Photo* editing_tools_photo_canvas_get_photo (EditingToolsPhotoCanvas* self) {
 	result = _tmp1_;
 #line 200 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 2513 "EditingTools.c"
+#line 2536 "EditingTools.c"
 }
 
 
@@ -2527,7 +2550,7 @@ GtkWindow* editing_tools_photo_canvas_get_container (EditingToolsPhotoCanvas* se
 	result = _tmp1_;
 #line 204 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 2531 "EditingTools.c"
+#line 2554 "EditingTools.c"
 }
 
 
@@ -2545,7 +2568,7 @@ GdkWindow* editing_tools_photo_canvas_get_drawing_window (EditingToolsPhotoCanva
 	result = _tmp1_;
 #line 208 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 2549 "EditingTools.c"
+#line 2572 "EditingTools.c"
 }
 
 
@@ -2563,7 +2586,7 @@ cairo_t* editing_tools_photo_canvas_get_default_ctx (EditingToolsPhotoCanvas* se
 	result = _tmp1_;
 #line 212 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 2567 "EditingTools.c"
+#line 2590 "EditingTools.c"
 }
 
 
@@ -2577,7 +2600,7 @@ void editing_tools_photo_canvas_get_surface_dim (EditingToolsPhotoCanvas* self,
 	*result = _tmp0_;
 #line 216 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return;
-#line 2581 "EditingTools.c"
+#line 2604 "EditingTools.c"
 }
 
 
@@ -2594,7 +2617,7 @@ void editing_tools_photo_canvas_get_scaling (EditingToolsPhotoCanvas* self, Scal
 	*result = _tmp1_;
 #line 220 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return;
-#line 2598 "EditingTools.c"
+#line 2621 "EditingTools.c"
 }
 
 
@@ -2628,14 +2651,14 @@ void editing_tools_photo_canvas_set_surface (EditingToolsPhotoCanvas* self, cair
 	_tmp4_ = *surface_dim;
 #line 227 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_emit_by_name (self, "new-surface", _tmp3_, &_tmp4_);
-#line 2632 "EditingTools.c"
+#line 2655 "EditingTools.c"
 }
 
 
 static gpointer _cairo_surface_reference0 (gpointer self) {
 #line 231 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return self ? cairo_surface_reference (self) : NULL;
-#line 2639 "EditingTools.c"
+#line 2662 "EditingTools.c"
 }
 
 
@@ -2653,7 +2676,7 @@ cairo_surface_t* editing_tools_photo_canvas_get_scaled_surface (EditingToolsPhot
 	result = _tmp1_;
 #line 231 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 2657 "EditingTools.c"
+#line 2680 "EditingTools.c"
 }
 
 
@@ -2671,7 +2694,7 @@ GdkPixbuf* editing_tools_photo_canvas_get_scaled_pixbuf (EditingToolsPhotoCanvas
 	result = _tmp1_;
 #line 235 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 2675 "EditingTools.c"
+#line 2698 "EditingTools.c"
 }
 
 
@@ -2685,7 +2708,7 @@ void editing_tools_photo_canvas_get_scaled_pixbuf_position (EditingToolsPhotoCan
 	*result = _tmp0_;
 #line 239 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return;
-#line 2689 "EditingTools.c"
+#line 2712 "EditingTools.c"
 }
 
 
@@ -2740,7 +2763,7 @@ void editing_tools_photo_canvas_resized_pixbuf (EditingToolsPhotoCanvas* self, D
 	_tmp9_ = *scaled_position;
 #line 247 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_emit_by_name (self, "resized-scaled-pixbuf", &_tmp7_, _tmp8_, &_tmp9_);
-#line 2744 "EditingTools.c"
+#line 2767 "EditingTools.c"
 }
 
 
@@ -2749,7 +2772,7 @@ static void editing_tools_photo_canvas_real_repaint (EditingToolsPhotoCanvas* se
 	g_critical ("Type `%s' does not implement abstract method `editing_tools_photo_canvas_repaint'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
 #line 250 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return;
-#line 2753 "EditingTools.c"
+#line 2776 "EditingTools.c"
 }
 
 
@@ -2758,7 +2781,7 @@ void editing_tools_photo_canvas_repaint (EditingToolsPhotoCanvas* self) {
 	g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self));
 #line 250 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	EDITING_TOOLS_PHOTO_CANVAS_GET_CLASS (self)->repaint (self);
-#line 2762 "EditingTools.c"
+#line 2785 "EditingTools.c"
 }
 
 
@@ -2858,7 +2881,7 @@ void editing_tools_photo_canvas_paint_pixbuf (EditingToolsPhotoCanvas* self, Gdk
 	_tmp24_ = self->priv->default_ctx;
 #line 271 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_restore (_tmp24_);
-#line 2862 "EditingTools.c"
+#line 2885 "EditingTools.c"
 }
 
 
@@ -2901,7 +2924,7 @@ void editing_tools_photo_canvas_paint_pixbuf_area (EditingToolsPhotoCanvas* self
 	_tmp2_ = gdk_pixbuf_get_has_alpha (_tmp1_);
 #line 276 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp2_) {
-#line 2905 "EditingTools.c"
+#line 2928 "EditingTools.c"
 		cairo_t* _tmp3_ = NULL;
 		cairo_t* _tmp4_ = NULL;
 		GdkRectangle _tmp5_ = {0};
@@ -2947,7 +2970,7 @@ void editing_tools_photo_canvas_paint_pixbuf_area (EditingToolsPhotoCanvas* self
 		_tmp15_ = self->priv->default_ctx;
 #line 281 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		cairo_fill (_tmp15_);
-#line 2951 "EditingTools.c"
+#line 2974 "EditingTools.c"
 	}
 #line 284 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp16_ = self->priv->default_ctx;
@@ -2995,7 +3018,7 @@ void editing_tools_photo_canvas_paint_pixbuf_area (EditingToolsPhotoCanvas* self
 	_tmp34_ = self->priv->default_ctx;
 #line 290 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_restore (_tmp34_);
-#line 2999 "EditingTools.c"
+#line 3022 "EditingTools.c"
 }
 
 
@@ -3029,20 +3052,20 @@ void editing_tools_photo_canvas_paint_surface (EditingToolsPhotoCanvas* self, ca
 	_tmp1_ = over;
 #line 296 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp1_ == FALSE) {
-#line 3033 "EditingTools.c"
+#line 3056 "EditingTools.c"
 		cairo_t* _tmp2_ = NULL;
 #line 297 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp2_ = self->priv->default_ctx;
 #line 297 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		cairo_set_operator (_tmp2_, CAIRO_OPERATOR_SOURCE);
-#line 3039 "EditingTools.c"
+#line 3062 "EditingTools.c"
 	} else {
 		cairo_t* _tmp3_ = NULL;
 #line 299 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp3_ = self->priv->default_ctx;
 #line 299 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		cairo_set_operator (_tmp3_, CAIRO_OPERATOR_OVER);
-#line 3046 "EditingTools.c"
+#line 3069 "EditingTools.c"
 	}
 #line 301 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = self->priv->default_ctx;
@@ -3084,7 +3107,7 @@ void editing_tools_photo_canvas_paint_surface (EditingToolsPhotoCanvas* self, ca
 	_tmp18_ = self->priv->default_ctx;
 #line 305 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_restore (_tmp18_);
-#line 3088 "EditingTools.c"
+#line 3111 "EditingTools.c"
 }
 
 
@@ -3142,20 +3165,20 @@ void editing_tools_photo_canvas_paint_surface_area (EditingToolsPhotoCanvas* sel
 	_tmp1_ = over;
 #line 310 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp1_ == FALSE) {
-#line 3146 "EditingTools.c"
+#line 3169 "EditingTools.c"
 		cairo_t* _tmp2_ = NULL;
 #line 311 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp2_ = self->priv->default_ctx;
 #line 311 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		cairo_set_operator (_tmp2_, CAIRO_OPERATOR_SOURCE);
-#line 3152 "EditingTools.c"
+#line 3175 "EditingTools.c"
 	} else {
 		cairo_t* _tmp3_ = NULL;
 #line 313 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp3_ = self->priv->default_ctx;
 #line 313 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		cairo_set_operator (_tmp3_, CAIRO_OPERATOR_OVER);
-#line 3159 "EditingTools.c"
+#line 3182 "EditingTools.c"
 	}
 #line 315 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = self->priv->default_ctx;
@@ -3245,7 +3268,7 @@ void editing_tools_photo_canvas_paint_surface_area (EditingToolsPhotoCanvas* sel
 	_tmp40_ = self->priv->default_ctx;
 #line 326 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_restore (_tmp40_);
-#line 3249 "EditingTools.c"
+#line 3272 "EditingTools.c"
 }
 
 
@@ -3318,7 +3341,7 @@ void editing_tools_photo_canvas_draw_box (EditingToolsPhotoCanvas* self, cairo_t
 	_tmp16_ = ctx;
 #line 335 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_stroke (_tmp16_);
-#line 3322 "EditingTools.c"
+#line 3345 "EditingTools.c"
 }
 
 
@@ -3359,7 +3382,7 @@ void editing_tools_photo_canvas_draw_text (EditingToolsPhotoCanvas* self, cairo_
 	_tmp0_ = use_scaled_pos;
 #line 339 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp0_) {
-#line 3363 "EditingTools.c"
+#line 3386 "EditingTools.c"
 		gint _tmp1_ = 0;
 		GdkRectangle _tmp2_ = {0};
 		gint _tmp3_ = 0;
@@ -3382,7 +3405,7 @@ void editing_tools_photo_canvas_draw_text (EditingToolsPhotoCanvas* self, cairo_
 		_tmp6_ = _tmp5_.y;
 #line 341 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		y = _tmp4_ + _tmp6_;
-#line 3386 "EditingTools.c"
+#line 3409 "EditingTools.c"
 	}
 #line 344 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7_ = ctx;
@@ -3448,7 +3471,7 @@ void editing_tools_photo_canvas_draw_text (EditingToolsPhotoCanvas* self, cairo_
 	_tmp29_ = text;
 #line 357 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_show_text (_tmp28_, _tmp29_);
-#line 3452 "EditingTools.c"
+#line 3475 "EditingTools.c"
 }
 
 
@@ -3481,7 +3504,7 @@ void editing_tools_photo_canvas_draw_horizontal_line (EditingToolsPhotoCanvas* s
 	_tmp0_ = use_scaled_pos;
 #line 372 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp0_) {
-#line 3485 "EditingTools.c"
+#line 3508 "EditingTools.c"
 		gint _tmp1_ = 0;
 		GdkRectangle _tmp2_ = {0};
 		gint _tmp3_ = 0;
@@ -3504,7 +3527,7 @@ void editing_tools_photo_canvas_draw_horizontal_line (EditingToolsPhotoCanvas* s
 		_tmp6_ = _tmp5_.y;
 #line 374 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		y = _tmp4_ + _tmp6_;
-#line 3508 "EditingTools.c"
+#line 3531 "EditingTools.c"
 	}
 #line 377 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7_ = ctx;
@@ -3528,7 +3551,7 @@ void editing_tools_photo_canvas_draw_horizontal_line (EditingToolsPhotoCanvas* s
 	_tmp14_ = ctx;
 #line 379 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_stroke (_tmp14_);
-#line 3532 "EditingTools.c"
+#line 3555 "EditingTools.c"
 }
 
 
@@ -3561,7 +3584,7 @@ void editing_tools_photo_canvas_draw_vertical_line (EditingToolsPhotoCanvas* sel
 	_tmp0_ = use_scaled_pos;
 #line 394 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp0_) {
-#line 3565 "EditingTools.c"
+#line 3588 "EditingTools.c"
 		gint _tmp1_ = 0;
 		GdkRectangle _tmp2_ = {0};
 		gint _tmp3_ = 0;
@@ -3584,7 +3607,7 @@ void editing_tools_photo_canvas_draw_vertical_line (EditingToolsPhotoCanvas* sel
 		_tmp6_ = _tmp5_.y;
 #line 396 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		y = _tmp4_ + _tmp6_;
-#line 3588 "EditingTools.c"
+#line 3611 "EditingTools.c"
 	}
 #line 399 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7_ = ctx;
@@ -3608,7 +3631,7 @@ void editing_tools_photo_canvas_draw_vertical_line (EditingToolsPhotoCanvas* sel
 	_tmp14_ = ctx;
 #line 401 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_stroke (_tmp14_);
-#line 3612 "EditingTools.c"
+#line 3635 "EditingTools.c"
 }
 
 
@@ -3681,7 +3704,7 @@ void editing_tools_photo_canvas_erase_horizontal_line (EditingToolsPhotoCanvas*
 	_tmp17_ = self->priv->default_ctx;
 #line 413 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_restore (_tmp17_);
-#line 3685 "EditingTools.c"
+#line 3708 "EditingTools.c"
 }
 
 
@@ -3727,7 +3750,7 @@ void editing_tools_photo_canvas_draw_circle (EditingToolsPhotoCanvas* self, cair
 	_tmp8_ = ctx;
 #line 422 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_stroke (_tmp8_);
-#line 3731 "EditingTools.c"
+#line 3754 "EditingTools.c"
 }
 
 
@@ -3800,7 +3823,7 @@ void editing_tools_photo_canvas_erase_vertical_line (EditingToolsPhotoCanvas* se
 	_tmp17_ = self->priv->default_ctx;
 #line 438 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_restore (_tmp17_);
-#line 3804 "EditingTools.c"
+#line 3827 "EditingTools.c"
 }
 
 
@@ -3877,7 +3900,7 @@ void editing_tools_photo_canvas_erase_box (EditingToolsPhotoCanvas* self, Box* b
 	_tmp19_ = box_get_height (box);
 #line 446 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_photo_canvas_erase_vertical_line (self, _tmp16_, _tmp18_, _tmp19_);
-#line 3881 "EditingTools.c"
+#line 3904 "EditingTools.c"
 }
 
 
@@ -3922,7 +3945,7 @@ void editing_tools_photo_canvas_invalidate_area (EditingToolsPhotoCanvas* self,
 	_tmp8_ = rect;
 #line 454 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gdk_window_invalidate_rect (_tmp7_, &_tmp8_, FALSE);
-#line 3926 "EditingTools.c"
+#line 3949 "EditingTools.c"
 }
 
 
@@ -3979,7 +4002,7 @@ static cairo_surface_t* editing_tools_photo_canvas_pixbuf_to_surface (EditingToo
 	_cairo_destroy0 (ctx);
 #line 464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 3983 "EditingTools.c"
+#line 4006 "EditingTools.c"
 }
 
 
@@ -3998,19 +4021,19 @@ static void g_cclosure_user_marshal_VOID__POINTER_BOXED (GClosure * closure, GVa
 		data1 = closure->data;
 #line 102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		data2 = param_values->data[0].v_pointer;
-#line 4002 "EditingTools.c"
+#line 4025 "EditingTools.c"
 	} else {
 #line 102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		data1 = param_values->data[0].v_pointer;
 #line 102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		data2 = closure->data;
-#line 4008 "EditingTools.c"
+#line 4031 "EditingTools.c"
 	}
 #line 102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	callback = (GMarshalFunc_VOID__POINTER_BOXED) (marshal_data ? marshal_data : cc->callback);
 #line 102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	callback (data1, g_value_get_pointer (param_values + 1), g_value_get_boxed (param_values + 2), data2);
-#line 4014 "EditingTools.c"
+#line 4037 "EditingTools.c"
 }
 
 
@@ -4029,26 +4052,26 @@ static void g_cclosure_user_marshal_VOID__BOXED_OBJECT_BOXED (GClosure * closure
 		data1 = closure->data;
 #line 102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		data2 = param_values->data[0].v_pointer;
-#line 4033 "EditingTools.c"
+#line 4056 "EditingTools.c"
 	} else {
 #line 102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		data1 = param_values->data[0].v_pointer;
 #line 102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		data2 = closure->data;
-#line 4039 "EditingTools.c"
+#line 4062 "EditingTools.c"
 	}
 #line 102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	callback = (GMarshalFunc_VOID__BOXED_OBJECT_BOXED) (marshal_data ? marshal_data : cc->callback);
 #line 102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	callback (data1, g_value_get_boxed (param_values + 1), g_value_get_object (param_values + 2), g_value_get_boxed (param_values + 3), data2);
-#line 4045 "EditingTools.c"
+#line 4068 "EditingTools.c"
 }
 
 
 static void editing_tools_value_photo_canvas_init (GValue* value) {
 #line 102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	value->data[0].v_pointer = NULL;
-#line 4052 "EditingTools.c"
+#line 4075 "EditingTools.c"
 }
 
 
@@ -4057,7 +4080,7 @@ static void editing_tools_value_photo_canvas_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_photo_canvas_unref (value->data[0].v_pointer);
-#line 4061 "EditingTools.c"
+#line 4084 "EditingTools.c"
 	}
 }
 
@@ -4067,11 +4090,11 @@ static void editing_tools_value_photo_canvas_copy_value (const GValue* src_value
 	if (src_value->data[0].v_pointer) {
 #line 102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		dest_value->data[0].v_pointer = editing_tools_photo_canvas_ref (src_value->data[0].v_pointer);
-#line 4071 "EditingTools.c"
+#line 4094 "EditingTools.c"
 	} else {
 #line 102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 4075 "EditingTools.c"
+#line 4098 "EditingTools.c"
 	}
 }
 
@@ -4079,37 +4102,37 @@ static void editing_tools_value_photo_canvas_copy_value (const GValue* src_value
 static gpointer editing_tools_value_photo_canvas_peek_pointer (const GValue* value) {
 #line 102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return value->data[0].v_pointer;
-#line 4083 "EditingTools.c"
+#line 4106 "EditingTools.c"
 }
 
 
 static gchar* editing_tools_value_photo_canvas_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (collect_values[0].v_pointer) {
-#line 4090 "EditingTools.c"
+#line 4113 "EditingTools.c"
 		EditingToolsPhotoCanvas* object;
 		object = collect_values[0].v_pointer;
 #line 102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 4097 "EditingTools.c"
+#line 4120 "EditingTools.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 4101 "EditingTools.c"
+#line 4124 "EditingTools.c"
 		}
 #line 102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		value->data[0].v_pointer = editing_tools_photo_canvas_ref (object);
-#line 4105 "EditingTools.c"
+#line 4128 "EditingTools.c"
 	} else {
 #line 102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		value->data[0].v_pointer = NULL;
-#line 4109 "EditingTools.c"
+#line 4132 "EditingTools.c"
 	}
 #line 102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return NULL;
-#line 4113 "EditingTools.c"
+#line 4136 "EditingTools.c"
 }
 
 
@@ -4120,25 +4143,25 @@ static gchar* editing_tools_value_photo_canvas_lcopy_value (const GValue* value,
 	if (!object_p) {
 #line 102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 4124 "EditingTools.c"
+#line 4147 "EditingTools.c"
 	}
 #line 102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (!value->data[0].v_pointer) {
 #line 102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*object_p = NULL;
-#line 4130 "EditingTools.c"
+#line 4153 "EditingTools.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*object_p = value->data[0].v_pointer;
-#line 4134 "EditingTools.c"
+#line 4157 "EditingTools.c"
 	} else {
 #line 102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*object_p = editing_tools_photo_canvas_ref (value->data[0].v_pointer);
-#line 4138 "EditingTools.c"
+#line 4161 "EditingTools.c"
 	}
 #line 102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return NULL;
-#line 4142 "EditingTools.c"
+#line 4165 "EditingTools.c"
 }
 
 
@@ -4152,7 +4175,7 @@ GParamSpec* editing_tools_param_spec_photo_canvas (const gchar* name, const gcha
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return G_PARAM_SPEC (spec);
-#line 4156 "EditingTools.c"
+#line 4179 "EditingTools.c"
 }
 
 
@@ -4161,7 +4184,7 @@ gpointer editing_tools_value_get_photo_canvas (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, EDITING_TOOLS_TYPE_PHOTO_CANVAS), NULL);
 #line 102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return value->data[0].v_pointer;
-#line 4165 "EditingTools.c"
+#line 4188 "EditingTools.c"
 }
 
 
@@ -4181,17 +4204,17 @@ void editing_tools_value_set_photo_canvas (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_photo_canvas_ref (value->data[0].v_pointer);
-#line 4185 "EditingTools.c"
+#line 4208 "EditingTools.c"
 	} else {
 #line 102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		value->data[0].v_pointer = NULL;
-#line 4189 "EditingTools.c"
+#line 4212 "EditingTools.c"
 	}
 #line 102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (old) {
 #line 102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_photo_canvas_unref (old);
-#line 4195 "EditingTools.c"
+#line 4218 "EditingTools.c"
 	}
 }
 
@@ -4210,17 +4233,17 @@ void editing_tools_value_take_photo_canvas (GValue* value, gpointer v_object) {
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		value->data[0].v_pointer = v_object;
-#line 4214 "EditingTools.c"
+#line 4237 "EditingTools.c"
 	} else {
 #line 102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		value->data[0].v_pointer = NULL;
-#line 4218 "EditingTools.c"
+#line 4241 "EditingTools.c"
 	}
 #line 102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (old) {
 #line 102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_photo_canvas_unref (old);
-#line 4224 "EditingTools.c"
+#line 4247 "EditingTools.c"
 	}
 }
 
@@ -4238,7 +4261,7 @@ static void editing_tools_photo_canvas_class_init (EditingToolsPhotoCanvasClass
 	g_signal_new ("new_surface", EDITING_TOOLS_TYPE_PHOTO_CANVAS, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__POINTER_BOXED, G_TYPE_NONE, 2, G_TYPE_POINTER, TYPE_DIMENSIONS);
 #line 102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_new ("resized_scaled_pixbuf", EDITING_TOOLS_TYPE_PHOTO_CANVAS, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__BOXED_OBJECT_BOXED, G_TYPE_NONE, 3, TYPE_DIMENSIONS, GDK_TYPE_PIXBUF, GDK_TYPE_RECTANGLE);
-#line 4242 "EditingTools.c"
+#line 4265 "EditingTools.c"
 }
 
 
@@ -4247,7 +4270,7 @@ static void editing_tools_photo_canvas_instance_init (EditingToolsPhotoCanvas *
 	self->priv = EDITING_TOOLS_PHOTO_CANVAS_GET_PRIVATE (self);
 #line 102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->ref_count = 1;
-#line 4251 "EditingTools.c"
+#line 4274 "EditingTools.c"
 }
 
 
@@ -4269,7 +4292,7 @@ static void editing_tools_photo_canvas_finalize (EditingToolsPhotoCanvas* obj) {
 	_cairo_surface_destroy0 (self->priv->scaled);
 #line 109 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->priv->scaled_pixbuf);
-#line 4273 "EditingTools.c"
+#line 4296 "EditingTools.c"
 }
 
 
@@ -4294,7 +4317,7 @@ gpointer editing_tools_photo_canvas_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return instance;
-#line 4298 "EditingTools.c"
+#line 4321 "EditingTools.c"
 }
 
 
@@ -4307,7 +4330,7 @@ void editing_tools_photo_canvas_unref (gpointer instance) {
 		EDITING_TOOLS_PHOTO_CANVAS_GET_CLASS (self)->finalize (self);
 #line 102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 4311 "EditingTools.c"
+#line 4334 "EditingTools.c"
 	}
 }
 
@@ -4330,14 +4353,14 @@ EditingToolsEditingTool* editing_tools_editing_tool_construct (GType object_type
 	self->name = _tmp1_;
 #line 489 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return self;
-#line 4334 "EditingTools.c"
+#line 4357 "EditingTools.c"
 }
 
 
 static gpointer _editing_tools_photo_canvas_ref0 (gpointer self) {
 #line 502 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return self ? editing_tools_photo_canvas_ref (self) : NULL;
-#line 4341 "EditingTools.c"
+#line 4364 "EditingTools.c"
 }
 
 
@@ -4346,7 +4369,7 @@ static gboolean _editing_tools_editing_tool_on_keypress_gtk_widget_key_press_eve
 	result = editing_tools_editing_tool_on_keypress ((EditingToolsEditingTool*) self, event);
 #line 506 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 4350 "EditingTools.c"
+#line 4373 "EditingTools.c"
 }
 
 
@@ -4385,17 +4408,17 @@ static void editing_tools_editing_tool_real_activate (EditingToolsEditingTool* s
 	_tmp5_ = self->priv->tool_window;
 #line 505 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp5_ != NULL) {
-#line 4389 "EditingTools.c"
+#line 4412 "EditingTools.c"
 		EditingToolsEditingToolWindow* _tmp6_ = NULL;
 #line 506 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp6_ = self->priv->tool_window;
 #line 506 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_widget_get_type (), GtkWidget), "key-press-event", (GCallback) _editing_tools_editing_tool_on_keypress_gtk_widget_key_press_event, self);
-#line 4395 "EditingTools.c"
+#line 4418 "EditingTools.c"
 	}
 #line 508 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_emit_by_name (self, "activated");
-#line 4399 "EditingTools.c"
+#line 4422 "EditingTools.c"
 }
 
 
@@ -4404,7 +4427,7 @@ void editing_tools_editing_tool_activate (EditingToolsEditingTool* self, Editing
 	g_return_if_fail (EDITING_TOOLS_IS_EDITING_TOOL (self));
 #line 497 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	EDITING_TOOLS_EDITING_TOOL_GET_CLASS (self)->activate (self, canvas);
-#line 4408 "EditingTools.c"
+#line 4431 "EditingTools.c"
 }
 
 
@@ -4416,23 +4439,23 @@ static void editing_tools_editing_tool_real_deactivate (EditingToolsEditingTool*
 	_tmp1_ = self->canvas;
 #line 514 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp1_ == NULL) {
-#line 4420 "EditingTools.c"
+#line 4443 "EditingTools.c"
 		EditingToolsEditingToolWindow* _tmp2_ = NULL;
 #line 514 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp2_ = self->priv->tool_window;
 #line 514 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp0_ = _tmp2_ == NULL;
-#line 4426 "EditingTools.c"
+#line 4449 "EditingTools.c"
 	} else {
 #line 514 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp0_ = FALSE;
-#line 4430 "EditingTools.c"
+#line 4453 "EditingTools.c"
 	}
 #line 514 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp0_) {
 #line 515 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return;
-#line 4436 "EditingTools.c"
+#line 4459 "EditingTools.c"
 	}
 #line 517 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_editing_tools_photo_canvas_unref0 (self->canvas);
@@ -4442,7 +4465,7 @@ static void editing_tools_editing_tool_real_deactivate (EditingToolsEditingTool*
 	_tmp3_ = self->priv->tool_window;
 #line 519 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp3_ != NULL) {
-#line 4446 "EditingTools.c"
+#line 4469 "EditingTools.c"
 		EditingToolsEditingToolWindow* _tmp4_ = NULL;
 		guint _tmp5_ = 0U;
 #line 520 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -4455,11 +4478,11 @@ static void editing_tools_editing_tool_real_deactivate (EditingToolsEditingTool*
 		_g_object_unref0 (self->priv->tool_window);
 #line 521 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		self->priv->tool_window = NULL;
-#line 4459 "EditingTools.c"
+#line 4482 "EditingTools.c"
 	}
 #line 524 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_emit_by_name (self, "deactivated");
-#line 4463 "EditingTools.c"
+#line 4486 "EditingTools.c"
 }
 
 
@@ -4468,7 +4491,7 @@ void editing_tools_editing_tool_deactivate (EditingToolsEditingTool* self) {
 	g_return_if_fail (EDITING_TOOLS_IS_EDITING_TOOL (self));
 #line 512 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	EDITING_TOOLS_EDITING_TOOL_GET_CLASS (self)->deactivate (self);
-#line 4472 "EditingTools.c"
+#line 4495 "EditingTools.c"
 }
 
 
@@ -4483,7 +4506,7 @@ gboolean editing_tools_editing_tool_is_activated (EditingToolsEditingTool* self)
 	result = _tmp0_ != NULL;
 #line 528 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 4487 "EditingTools.c"
+#line 4510 "EditingTools.c"
 }
 
 
@@ -4493,7 +4516,7 @@ static EditingToolsEditingToolWindow* editing_tools_editing_tool_real_get_tool_w
 	result = NULL;
 #line 532 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 4497 "EditingTools.c"
+#line 4520 "EditingTools.c"
 }
 
 
@@ -4502,7 +4525,7 @@ EditingToolsEditingToolWindow* editing_tools_editing_tool_get_tool_window (Editi
 	g_return_val_if_fail (EDITING_TOOLS_IS_EDITING_TOOL (self), NULL);
 #line 531 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return EDITING_TOOLS_EDITING_TOOL_GET_CLASS (self)->get_tool_window (self);
-#line 4506 "EditingTools.c"
+#line 4529 "EditingTools.c"
 }
 
 
@@ -4521,11 +4544,11 @@ static GdkPixbuf* editing_tools_editing_tool_real_get_display_pixbuf (EditingToo
 	if (max_dim) {
 #line 550 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*max_dim = _vala_max_dim;
-#line 4525 "EditingTools.c"
+#line 4548 "EditingTools.c"
 	}
 #line 550 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 4529 "EditingTools.c"
+#line 4552 "EditingTools.c"
 }
 
 
@@ -4534,7 +4557,7 @@ GdkPixbuf* editing_tools_editing_tool_get_display_pixbuf (EditingToolsEditingToo
 	g_return_val_if_fail (EDITING_TOOLS_IS_EDITING_TOOL (self), NULL);
 #line 546 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return EDITING_TOOLS_EDITING_TOOL_GET_CLASS (self)->get_display_pixbuf (self, scaling, photo, max_dim, error);
-#line 4538 "EditingTools.c"
+#line 4561 "EditingTools.c"
 }
 
 
@@ -4547,7 +4570,7 @@ void editing_tools_editing_tool_on_left_click (EditingToolsEditingTool* self, gi
 	g_return_if_fail (EDITING_TOOLS_IS_EDITING_TOOL (self));
 #line 553 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	EDITING_TOOLS_EDITING_TOOL_GET_CLASS (self)->on_left_click (self, x, y);
-#line 4551 "EditingTools.c"
+#line 4574 "EditingTools.c"
 }
 
 
@@ -4560,7 +4583,7 @@ void editing_tools_editing_tool_on_left_released (EditingToolsEditingTool* self,
 	g_return_if_fail (EDITING_TOOLS_IS_EDITING_TOOL (self));
 #line 556 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	EDITING_TOOLS_EDITING_TOOL_GET_CLASS (self)->on_left_released (self, x, y);
-#line 4564 "EditingTools.c"
+#line 4587 "EditingTools.c"
 }
 
 
@@ -4573,7 +4596,7 @@ void editing_tools_editing_tool_on_motion (EditingToolsEditingTool* self, gint x
 	g_return_if_fail (EDITING_TOOLS_IS_EDITING_TOOL (self));
 #line 559 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	EDITING_TOOLS_EDITING_TOOL_GET_CLASS (self)->on_motion (self, x, y, mask);
-#line 4577 "EditingTools.c"
+#line 4600 "EditingTools.c"
 }
 
 
@@ -4583,7 +4606,7 @@ static gboolean editing_tools_editing_tool_real_on_leave_notify_event (EditingTo
 	result = FALSE;
 #line 563 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 4587 "EditingTools.c"
+#line 4610 "EditingTools.c"
 }
 
 
@@ -4592,7 +4615,7 @@ gboolean editing_tools_editing_tool_on_leave_notify_event (EditingToolsEditingTo
 	g_return_val_if_fail (EDITING_TOOLS_IS_EDITING_TOOL (self), FALSE);
 #line 562 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return EDITING_TOOLS_EDITING_TOOL_GET_CLASS (self)->on_leave_notify_event (self);
-#line 4596 "EditingTools.c"
+#line 4619 "EditingTools.c"
 }
 
 
@@ -4617,13 +4640,13 @@ static gboolean editing_tools_editing_tool_real_on_keypress (EditingToolsEditing
 		result = TRUE;
 #line 571 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return result;
-#line 4621 "EditingTools.c"
+#line 4644 "EditingTools.c"
 	}
 #line 574 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	result = FALSE;
 #line 574 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 4627 "EditingTools.c"
+#line 4650 "EditingTools.c"
 }
 
 
@@ -4632,14 +4655,14 @@ gboolean editing_tools_editing_tool_on_keypress (EditingToolsEditingTool* self,
 	g_return_val_if_fail (EDITING_TOOLS_IS_EDITING_TOOL (self), FALSE);
 #line 566 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return EDITING_TOOLS_EDITING_TOOL_GET_CLASS (self)->on_keypress (self, event);
-#line 4636 "EditingTools.c"
+#line 4659 "EditingTools.c"
 }
 
 
 static void editing_tools_editing_tool_real_paint (EditingToolsEditingTool* self, cairo_t* ctx) {
 #line 577 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (ctx != NULL);
-#line 4643 "EditingTools.c"
+#line 4666 "EditingTools.c"
 }
 
 
@@ -4648,7 +4671,7 @@ void editing_tools_editing_tool_paint (EditingToolsEditingTool* self, cairo_t* c
 	g_return_if_fail (EDITING_TOOLS_IS_EDITING_TOOL (self));
 #line 577 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	EDITING_TOOLS_EDITING_TOOL_GET_CLASS (self)->paint (self, ctx);
-#line 4652 "EditingTools.c"
+#line 4675 "EditingTools.c"
 }
 
 
@@ -4657,7 +4680,7 @@ void editing_tools_editing_tool_notify_cancel (EditingToolsEditingTool* self) {
 	g_return_if_fail (EDITING_TOOLS_IS_EDITING_TOOL (self));
 #line 582 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_emit_by_name (self, "cancelled");
-#line 4661 "EditingTools.c"
+#line 4684 "EditingTools.c"
 }
 
 
@@ -4676,26 +4699,26 @@ static void g_cclosure_user_marshal_VOID__OBJECT_OBJECT_BOXED_BOOLEAN (GClosure
 		data1 = closure->data;
 #line 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		data2 = param_values->data[0].v_pointer;
-#line 4680 "EditingTools.c"
+#line 4703 "EditingTools.c"
 	} else {
 #line 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		data1 = param_values->data[0].v_pointer;
 #line 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		data2 = closure->data;
-#line 4686 "EditingTools.c"
+#line 4709 "EditingTools.c"
 	}
 #line 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	callback = (GMarshalFunc_VOID__OBJECT_OBJECT_BOXED_BOOLEAN) (marshal_data ? marshal_data : cc->callback);
 #line 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	callback (data1, g_value_get_object (param_values + 1), g_value_get_object (param_values + 2), g_value_get_boxed (param_values + 3), g_value_get_boolean (param_values + 4), data2);
-#line 4692 "EditingTools.c"
+#line 4715 "EditingTools.c"
 }
 
 
 static void editing_tools_value_editing_tool_init (GValue* value) {
 #line 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	value->data[0].v_pointer = NULL;
-#line 4699 "EditingTools.c"
+#line 4722 "EditingTools.c"
 }
 
 
@@ -4704,7 +4727,7 @@ static void editing_tools_value_editing_tool_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_editing_tool_unref (value->data[0].v_pointer);
-#line 4708 "EditingTools.c"
+#line 4731 "EditingTools.c"
 	}
 }
 
@@ -4714,11 +4737,11 @@ static void editing_tools_value_editing_tool_copy_value (const GValue* src_value
 	if (src_value->data[0].v_pointer) {
 #line 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		dest_value->data[0].v_pointer = editing_tools_editing_tool_ref (src_value->data[0].v_pointer);
-#line 4718 "EditingTools.c"
+#line 4741 "EditingTools.c"
 	} else {
 #line 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 4722 "EditingTools.c"
+#line 4745 "EditingTools.c"
 	}
 }
 
@@ -4726,37 +4749,37 @@ static void editing_tools_value_editing_tool_copy_value (const GValue* src_value
 static gpointer editing_tools_value_editing_tool_peek_pointer (const GValue* value) {
 #line 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return value->data[0].v_pointer;
-#line 4730 "EditingTools.c"
+#line 4753 "EditingTools.c"
 }
 
 
 static gchar* editing_tools_value_editing_tool_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (collect_values[0].v_pointer) {
-#line 4737 "EditingTools.c"
+#line 4760 "EditingTools.c"
 		EditingToolsEditingTool* object;
 		object = collect_values[0].v_pointer;
 #line 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 4744 "EditingTools.c"
+#line 4767 "EditingTools.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 4748 "EditingTools.c"
+#line 4771 "EditingTools.c"
 		}
 #line 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		value->data[0].v_pointer = editing_tools_editing_tool_ref (object);
-#line 4752 "EditingTools.c"
+#line 4775 "EditingTools.c"
 	} else {
 #line 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		value->data[0].v_pointer = NULL;
-#line 4756 "EditingTools.c"
+#line 4779 "EditingTools.c"
 	}
 #line 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return NULL;
-#line 4760 "EditingTools.c"
+#line 4783 "EditingTools.c"
 }
 
 
@@ -4767,25 +4790,25 @@ static gchar* editing_tools_value_editing_tool_lcopy_value (const GValue* value,
 	if (!object_p) {
 #line 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 4771 "EditingTools.c"
+#line 4794 "EditingTools.c"
 	}
 #line 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (!value->data[0].v_pointer) {
 #line 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*object_p = NULL;
-#line 4777 "EditingTools.c"
+#line 4800 "EditingTools.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*object_p = value->data[0].v_pointer;
-#line 4781 "EditingTools.c"
+#line 4804 "EditingTools.c"
 	} else {
 #line 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*object_p = editing_tools_editing_tool_ref (value->data[0].v_pointer);
-#line 4785 "EditingTools.c"
+#line 4808 "EditingTools.c"
 	}
 #line 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return NULL;
-#line 4789 "EditingTools.c"
+#line 4812 "EditingTools.c"
 }
 
 
@@ -4799,7 +4822,7 @@ GParamSpec* editing_tools_param_spec_editing_tool (const gchar* name, const gcha
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return G_PARAM_SPEC (spec);
-#line 4803 "EditingTools.c"
+#line 4826 "EditingTools.c"
 }
 
 
@@ -4808,7 +4831,7 @@ gpointer editing_tools_value_get_editing_tool (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, EDITING_TOOLS_TYPE_EDITING_TOOL), NULL);
 #line 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return value->data[0].v_pointer;
-#line 4812 "EditingTools.c"
+#line 4835 "EditingTools.c"
 }
 
 
@@ -4828,17 +4851,17 @@ void editing_tools_value_set_editing_tool (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_editing_tool_ref (value->data[0].v_pointer);
-#line 4832 "EditingTools.c"
+#line 4855 "EditingTools.c"
 	} else {
 #line 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		value->data[0].v_pointer = NULL;
-#line 4836 "EditingTools.c"
+#line 4859 "EditingTools.c"
 	}
 #line 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (old) {
 #line 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_editing_tool_unref (old);
-#line 4842 "EditingTools.c"
+#line 4865 "EditingTools.c"
 	}
 }
 
@@ -4857,17 +4880,17 @@ void editing_tools_value_take_editing_tool (GValue* value, gpointer v_object) {
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		value->data[0].v_pointer = v_object;
-#line 4861 "EditingTools.c"
+#line 4884 "EditingTools.c"
 	} else {
 #line 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		value->data[0].v_pointer = NULL;
-#line 4865 "EditingTools.c"
+#line 4888 "EditingTools.c"
 	}
 #line 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (old) {
 #line 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_editing_tool_unref (old);
-#line 4871 "EditingTools.c"
+#line 4894 "EditingTools.c"
 	}
 }
 
@@ -4909,7 +4932,7 @@ static void editing_tools_editing_tool_class_init (EditingToolsEditingToolClass
 	g_signal_new ("cancelled", EDITING_TOOLS_TYPE_EDITING_TOOL, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
 #line 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_new ("aborted", EDITING_TOOLS_TYPE_EDITING_TOOL, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-#line 4913 "EditingTools.c"
+#line 4936 "EditingTools.c"
 }
 
 
@@ -4922,7 +4945,7 @@ static void editing_tools_editing_tool_instance_init (EditingToolsEditingTool *
 	self->priv->tool_window = NULL;
 #line 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->ref_count = 1;
-#line 4926 "EditingTools.c"
+#line 4949 "EditingTools.c"
 }
 
 
@@ -4940,7 +4963,7 @@ static void editing_tools_editing_tool_finalize (EditingToolsEditingTool* obj) {
 	_cairo_surface_destroy0 (self->surface);
 #line 473 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_free0 (self->name);
-#line 4944 "EditingTools.c"
+#line 4967 "EditingTools.c"
 }
 
 
@@ -4965,7 +4988,7 @@ gpointer editing_tools_editing_tool_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return instance;
-#line 4969 "EditingTools.c"
+#line 4992 "EditingTools.c"
 }
 
 
@@ -4978,7 +5001,7 @@ void editing_tools_editing_tool_unref (gpointer instance) {
 		EDITING_TOOLS_EDITING_TOOL_GET_CLASS (self)->finalize (self);
 #line 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 4982 "EditingTools.c"
+#line 5005 "EditingTools.c"
 	}
 }
 
@@ -4990,17 +5013,17 @@ static EditingToolsCropToolReticleOrientation editing_tools_crop_tool_reticle_or
 	if (self == EDITING_TOOLS_CROP_TOOL_RETICLE_ORIENTATION_LANDSCAPE) {
 #line 636 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp0_ = EDITING_TOOLS_CROP_TOOL_RETICLE_ORIENTATION_PORTRAIT;
-#line 4994 "EditingTools.c"
+#line 5017 "EditingTools.c"
 	} else {
 #line 637 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp0_ = EDITING_TOOLS_CROP_TOOL_RETICLE_ORIENTATION_LANDSCAPE;
-#line 4998 "EditingTools.c"
+#line 5021 "EditingTools.c"
 	}
 #line 636 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	result = _tmp0_;
 #line 636 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 5004 "EditingTools.c"
+#line 5027 "EditingTools.c"
 }
 
 
@@ -5034,14 +5057,14 @@ static EditingToolsCropTool* editing_tools_crop_tool_construct (GType object_typ
 	self = (EditingToolsCropTool*) editing_tools_editing_tool_construct (object_type, "CropTool");
 #line 736 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return self;
-#line 5038 "EditingTools.c"
+#line 5061 "EditingTools.c"
 }
 
 
 static EditingToolsCropTool* editing_tools_crop_tool_new (void) {
 #line 736 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return editing_tools_crop_tool_construct (EDITING_TOOLS_TYPE_CROP_TOOL);
-#line 5045 "EditingTools.c"
+#line 5068 "EditingTools.c"
 }
 
 
@@ -5054,7 +5077,7 @@ EditingToolsCropTool* editing_tools_crop_tool_factory (void) {
 	result = _tmp0_;
 #line 741 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 5058 "EditingTools.c"
+#line 5081 "EditingTools.c"
 }
 
 
@@ -5085,7 +5108,7 @@ gboolean editing_tools_crop_tool_is_available (Photo* photo, Scaling* scaling) {
 	_tmp5_ = _tmp4_.width;
 #line 747 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp5_ > EDITING_TOOLS_CROP_TOOL_CROP_MIN_SIZE) {
-#line 5089 "EditingTools.c"
+#line 5112 "EditingTools.c"
 		Dimensions _tmp6_ = {0};
 		gint _tmp7_ = 0;
 #line 747 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -5094,17 +5117,17 @@ gboolean editing_tools_crop_tool_is_available (Photo* photo, Scaling* scaling) {
 		_tmp7_ = _tmp6_.height;
 #line 747 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp3_ = _tmp7_ > EDITING_TOOLS_CROP_TOOL_CROP_MIN_SIZE;
-#line 5098 "EditingTools.c"
+#line 5121 "EditingTools.c"
 	} else {
 #line 747 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp3_ = FALSE;
-#line 5102 "EditingTools.c"
+#line 5125 "EditingTools.c"
 	}
 #line 747 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	result = _tmp3_;
 #line 747 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 5108 "EditingTools.c"
+#line 5131 "EditingTools.c"
 }
 
 
@@ -5115,13 +5138,13 @@ static void _vala_array_add4 (EditingToolsCropToolConstraintDescription*** array
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 753 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5119 "EditingTools.c"
+#line 5142 "EditingTools.c"
 	}
 #line 753 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[(*length)++] = value;
 #line 753 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[*length] = NULL;
-#line 5125 "EditingTools.c"
+#line 5148 "EditingTools.c"
 }
 
 
@@ -5132,13 +5155,13 @@ static void _vala_array_add5 (EditingToolsCropToolConstraintDescription*** array
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 754 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5136 "EditingTools.c"
+#line 5159 "EditingTools.c"
 	}
 #line 754 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[(*length)++] = value;
 #line 754 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[*length] = NULL;
-#line 5142 "EditingTools.c"
+#line 5165 "EditingTools.c"
 }
 
 
@@ -5149,13 +5172,13 @@ static void _vala_array_add6 (EditingToolsCropToolConstraintDescription*** array
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 755 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5153 "EditingTools.c"
+#line 5176 "EditingTools.c"
 	}
 #line 755 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[(*length)++] = value;
 #line 755 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[*length] = NULL;
-#line 5159 "EditingTools.c"
+#line 5182 "EditingTools.c"
 }
 
 
@@ -5166,13 +5189,13 @@ static void _vala_array_add7 (EditingToolsCropToolConstraintDescription*** array
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 756 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5170 "EditingTools.c"
+#line 5193 "EditingTools.c"
 	}
 #line 756 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[(*length)++] = value;
 #line 756 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[*length] = NULL;
-#line 5176 "EditingTools.c"
+#line 5199 "EditingTools.c"
 }
 
 
@@ -5183,13 +5206,13 @@ static void _vala_array_add8 (EditingToolsCropToolConstraintDescription*** array
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 757 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5187 "EditingTools.c"
+#line 5210 "EditingTools.c"
 	}
 #line 757 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[(*length)++] = value;
 #line 757 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[*length] = NULL;
-#line 5193 "EditingTools.c"
+#line 5216 "EditingTools.c"
 }
 
 
@@ -5200,13 +5223,13 @@ static void _vala_array_add9 (EditingToolsCropToolConstraintDescription*** array
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 758 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5204 "EditingTools.c"
+#line 5227 "EditingTools.c"
 	}
 #line 758 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[(*length)++] = value;
 #line 758 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[*length] = NULL;
-#line 5210 "EditingTools.c"
+#line 5233 "EditingTools.c"
 }
 
 
@@ -5217,13 +5240,13 @@ static void _vala_array_add10 (EditingToolsCropToolConstraintDescription*** arra
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 759 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5221 "EditingTools.c"
+#line 5244 "EditingTools.c"
 	}
 #line 759 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[(*length)++] = value;
 #line 759 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[*length] = NULL;
-#line 5227 "EditingTools.c"
+#line 5250 "EditingTools.c"
 }
 
 
@@ -5234,13 +5257,13 @@ static void _vala_array_add11 (EditingToolsCropToolConstraintDescription*** arra
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 760 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5238 "EditingTools.c"
+#line 5261 "EditingTools.c"
 	}
 #line 760 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[(*length)++] = value;
 #line 760 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[*length] = NULL;
-#line 5244 "EditingTools.c"
+#line 5267 "EditingTools.c"
 }
 
 
@@ -5251,13 +5274,13 @@ static void _vala_array_add12 (EditingToolsCropToolConstraintDescription*** arra
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 761 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5255 "EditingTools.c"
+#line 5278 "EditingTools.c"
 	}
 #line 761 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[(*length)++] = value;
 #line 761 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[*length] = NULL;
-#line 5261 "EditingTools.c"
+#line 5284 "EditingTools.c"
 }
 
 
@@ -5268,13 +5291,13 @@ static void _vala_array_add13 (EditingToolsCropToolConstraintDescription*** arra
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 762 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5272 "EditingTools.c"
+#line 5295 "EditingTools.c"
 	}
 #line 762 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[(*length)++] = value;
 #line 762 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[*length] = NULL;
-#line 5278 "EditingTools.c"
+#line 5301 "EditingTools.c"
 }
 
 
@@ -5285,13 +5308,13 @@ static void _vala_array_add14 (EditingToolsCropToolConstraintDescription*** arra
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 763 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5289 "EditingTools.c"
+#line 5312 "EditingTools.c"
 	}
 #line 763 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[(*length)++] = value;
 #line 763 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[*length] = NULL;
-#line 5295 "EditingTools.c"
+#line 5318 "EditingTools.c"
 }
 
 
@@ -5302,13 +5325,13 @@ static void _vala_array_add15 (EditingToolsCropToolConstraintDescription*** arra
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 764 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5306 "EditingTools.c"
+#line 5329 "EditingTools.c"
 	}
 #line 764 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[(*length)++] = value;
 #line 764 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[*length] = NULL;
-#line 5312 "EditingTools.c"
+#line 5335 "EditingTools.c"
 }
 
 
@@ -5319,13 +5342,13 @@ static void _vala_array_add16 (EditingToolsCropToolConstraintDescription*** arra
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 765 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5323 "EditingTools.c"
+#line 5346 "EditingTools.c"
 	}
 #line 765 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[(*length)++] = value;
 #line 765 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[*length] = NULL;
-#line 5329 "EditingTools.c"
+#line 5352 "EditingTools.c"
 }
 
 
@@ -5336,13 +5359,13 @@ static void _vala_array_add17 (EditingToolsCropToolConstraintDescription*** arra
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 766 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5340 "EditingTools.c"
+#line 5363 "EditingTools.c"
 	}
 #line 766 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[(*length)++] = value;
 #line 766 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[*length] = NULL;
-#line 5346 "EditingTools.c"
+#line 5369 "EditingTools.c"
 }
 
 
@@ -5353,13 +5376,13 @@ static void _vala_array_add18 (EditingToolsCropToolConstraintDescription*** arra
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 767 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5357 "EditingTools.c"
+#line 5380 "EditingTools.c"
 	}
 #line 767 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[(*length)++] = value;
 #line 767 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[*length] = NULL;
-#line 5363 "EditingTools.c"
+#line 5386 "EditingTools.c"
 }
 
 
@@ -5370,13 +5393,13 @@ static void _vala_array_add19 (EditingToolsCropToolConstraintDescription*** arra
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 768 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5374 "EditingTools.c"
+#line 5397 "EditingTools.c"
 	}
 #line 768 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[(*length)++] = value;
 #line 768 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[*length] = NULL;
-#line 5380 "EditingTools.c"
+#line 5403 "EditingTools.c"
 }
 
 
@@ -5387,13 +5410,13 @@ static void _vala_array_add20 (EditingToolsCropToolConstraintDescription*** arra
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 769 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5391 "EditingTools.c"
+#line 5414 "EditingTools.c"
 	}
 #line 769 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[(*length)++] = value;
 #line 769 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[*length] = NULL;
-#line 5397 "EditingTools.c"
+#line 5420 "EditingTools.c"
 }
 
 
@@ -5404,13 +5427,13 @@ static void _vala_array_add21 (EditingToolsCropToolConstraintDescription*** arra
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 770 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5408 "EditingTools.c"
+#line 5431 "EditingTools.c"
 	}
 #line 770 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[(*length)++] = value;
 #line 770 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[*length] = NULL;
-#line 5414 "EditingTools.c"
+#line 5437 "EditingTools.c"
 }
 
 
@@ -5421,13 +5444,13 @@ static void _vala_array_add22 (EditingToolsCropToolConstraintDescription*** arra
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 771 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5425 "EditingTools.c"
+#line 5448 "EditingTools.c"
 	}
 #line 771 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[(*length)++] = value;
 #line 771 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[*length] = NULL;
-#line 5431 "EditingTools.c"
+#line 5454 "EditingTools.c"
 }
 
 
@@ -5438,13 +5461,13 @@ static void _vala_array_add23 (EditingToolsCropToolConstraintDescription*** arra
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 772 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5442 "EditingTools.c"
+#line 5465 "EditingTools.c"
 	}
 #line 772 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[(*length)++] = value;
 #line 772 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[*length] = NULL;
-#line 5448 "EditingTools.c"
+#line 5471 "EditingTools.c"
 }
 
 
@@ -5455,13 +5478,13 @@ static void _vala_array_add24 (EditingToolsCropToolConstraintDescription*** arra
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 773 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5459 "EditingTools.c"
+#line 5482 "EditingTools.c"
 	}
 #line 773 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[(*length)++] = value;
 #line 773 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[*length] = NULL;
-#line 5465 "EditingTools.c"
+#line 5488 "EditingTools.c"
 }
 
 
@@ -5472,13 +5495,13 @@ static void _vala_array_add25 (EditingToolsCropToolConstraintDescription*** arra
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 774 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5476 "EditingTools.c"
+#line 5499 "EditingTools.c"
 	}
 #line 774 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[(*length)++] = value;
 #line 774 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[*length] = NULL;
-#line 5482 "EditingTools.c"
+#line 5505 "EditingTools.c"
 }
 
 
@@ -5489,13 +5512,13 @@ static void _vala_array_add26 (EditingToolsCropToolConstraintDescription*** arra
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 775 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5493 "EditingTools.c"
+#line 5516 "EditingTools.c"
 	}
 #line 775 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[(*length)++] = value;
 #line 775 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[*length] = NULL;
-#line 5499 "EditingTools.c"
+#line 5522 "EditingTools.c"
 }
 
 
@@ -5506,13 +5529,13 @@ static void _vala_array_add27 (EditingToolsCropToolConstraintDescription*** arra
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 776 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5510 "EditingTools.c"
+#line 5533 "EditingTools.c"
 	}
 #line 776 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[(*length)++] = value;
 #line 776 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[*length] = NULL;
-#line 5516 "EditingTools.c"
+#line 5539 "EditingTools.c"
 }
 
 
@@ -5523,13 +5546,13 @@ static void _vala_array_add28 (EditingToolsCropToolConstraintDescription*** arra
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 777 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5527 "EditingTools.c"
+#line 5550 "EditingTools.c"
 	}
 #line 777 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[(*length)++] = value;
 #line 777 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[*length] = NULL;
-#line 5533 "EditingTools.c"
+#line 5556 "EditingTools.c"
 }
 
 
@@ -5540,13 +5563,13 @@ static void _vala_array_add29 (EditingToolsCropToolConstraintDescription*** arra
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 778 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5544 "EditingTools.c"
+#line 5567 "EditingTools.c"
 	}
 #line 778 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[(*length)++] = value;
 #line 778 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[*length] = NULL;
-#line 5550 "EditingTools.c"
+#line 5573 "EditingTools.c"
 }
 
 
@@ -5557,13 +5580,13 @@ static void _vala_array_add30 (EditingToolsCropToolConstraintDescription*** arra
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 779 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5561 "EditingTools.c"
+#line 5584 "EditingTools.c"
 	}
 #line 779 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[(*length)++] = value;
 #line 779 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[*length] = NULL;
-#line 5567 "EditingTools.c"
+#line 5590 "EditingTools.c"
 }
 
 
@@ -5574,13 +5597,13 @@ static void _vala_array_add31 (EditingToolsCropToolConstraintDescription*** arra
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 780 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5578 "EditingTools.c"
+#line 5601 "EditingTools.c"
 	}
 #line 780 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[(*length)++] = value;
 #line 780 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[*length] = NULL;
-#line 5584 "EditingTools.c"
+#line 5607 "EditingTools.c"
 }
 
 
@@ -5591,13 +5614,13 @@ static void _vala_array_add32 (EditingToolsCropToolConstraintDescription*** arra
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 781 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5595 "EditingTools.c"
+#line 5618 "EditingTools.c"
 	}
 #line 781 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[(*length)++] = value;
 #line 781 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[*length] = NULL;
-#line 5601 "EditingTools.c"
+#line 5624 "EditingTools.c"
 }
 
 
@@ -5788,7 +5811,7 @@ static EditingToolsCropToolConstraintDescription** editing_tools_crop_tool_creat
 #line 758 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp16__length1 = _result__length1;
 #line 758 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp17_ = _ ("SD Video (4 : 3)");
+	_tmp17_ = _ ("SD Video (4 ∶ 3)");
 #line 758 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp18_ = editing_tools_crop_tool_constraint_description_new (_tmp17_, 4, 3, TRUE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS);
 #line 758 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -5798,7 +5821,7 @@ static EditingToolsCropToolConstraintDescription** editing_tools_crop_tool_creat
 #line 759 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp19__length1 = _result__length1;
 #line 759 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp20_ = _ ("HD Video (16 : 9)");
+	_tmp20_ = _ ("HD Video (16 ∶ 9)");
 #line 759 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp21_ = editing_tools_crop_tool_constraint_description_new (_tmp20_, 16, 9, TRUE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS);
 #line 759 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -5818,7 +5841,7 @@ static EditingToolsCropToolConstraintDescription** editing_tools_crop_tool_creat
 #line 761 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp25__length1 = _result__length1;
 #line 761 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp26_ = _ ("Wallet (2 x 3 in.)");
+	_tmp26_ = _ ("Wallet (2 × 3 in.)");
 #line 761 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp27_ = editing_tools_crop_tool_constraint_description_new (_tmp26_, 3, 2, TRUE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS);
 #line 761 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -5828,7 +5851,7 @@ static EditingToolsCropToolConstraintDescription** editing_tools_crop_tool_creat
 #line 762 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp28__length1 = _result__length1;
 #line 762 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp29_ = _ ("Notecard (3 x 5 in.)");
+	_tmp29_ = _ ("Notecard (3 × 5 in.)");
 #line 762 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp30_ = editing_tools_crop_tool_constraint_description_new (_tmp29_, 5, 3, TRUE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS);
 #line 762 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -5838,7 +5861,7 @@ static EditingToolsCropToolConstraintDescription** editing_tools_crop_tool_creat
 #line 763 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp31__length1 = _result__length1;
 #line 763 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp32_ = _ ("4 x 6 in.");
+	_tmp32_ = _ ("4 × 6 in.");
 #line 763 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp33_ = editing_tools_crop_tool_constraint_description_new (_tmp32_, 6, 4, TRUE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS);
 #line 763 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -5848,7 +5871,7 @@ static EditingToolsCropToolConstraintDescription** editing_tools_crop_tool_creat
 #line 764 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp34__length1 = _result__length1;
 #line 764 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp35_ = _ ("5 x 7 in.");
+	_tmp35_ = _ ("5 × 7 in.");
 #line 764 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp36_ = editing_tools_crop_tool_constraint_description_new (_tmp35_, 7, 5, TRUE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS);
 #line 764 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -5858,7 +5881,7 @@ static EditingToolsCropToolConstraintDescription** editing_tools_crop_tool_creat
 #line 765 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp37__length1 = _result__length1;
 #line 765 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp38_ = _ ("8 x 10 in.");
+	_tmp38_ = _ ("8 × 10 in.");
 #line 765 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp39_ = editing_tools_crop_tool_constraint_description_new (_tmp38_, 10, 8, TRUE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS);
 #line 765 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -5868,7 +5891,7 @@ static EditingToolsCropToolConstraintDescription** editing_tools_crop_tool_creat
 #line 766 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp40__length1 = _result__length1;
 #line 766 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp41_ = _ ("Letter (8.5 x 11 in.)");
+	_tmp41_ = _ ("Letter (8.5 × 11 in.)");
 #line 766 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp42_ = editing_tools_crop_tool_constraint_description_new (_tmp41_, 85, 110, TRUE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS);
 #line 766 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -5878,7 +5901,7 @@ static EditingToolsCropToolConstraintDescription** editing_tools_crop_tool_creat
 #line 767 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp43__length1 = _result__length1;
 #line 767 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp44_ = _ ("11 x 14 in.");
+	_tmp44_ = _ ("11 × 14 in.");
 #line 767 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp45_ = editing_tools_crop_tool_constraint_description_new (_tmp44_, 14, 11, TRUE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS);
 #line 767 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -5888,7 +5911,7 @@ static EditingToolsCropToolConstraintDescription** editing_tools_crop_tool_creat
 #line 768 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp46__length1 = _result__length1;
 #line 768 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp47_ = _ ("Tabloid (11 x 17 in.)");
+	_tmp47_ = _ ("Tabloid (11 × 17 in.)");
 #line 768 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp48_ = editing_tools_crop_tool_constraint_description_new (_tmp47_, 17, 11, TRUE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS);
 #line 768 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -5898,7 +5921,7 @@ static EditingToolsCropToolConstraintDescription** editing_tools_crop_tool_creat
 #line 769 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp49__length1 = _result__length1;
 #line 769 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp50_ = _ ("16 x 20 in.");
+	_tmp50_ = _ ("16 × 20 in.");
 #line 769 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp51_ = editing_tools_crop_tool_constraint_description_new (_tmp50_, 20, 16, TRUE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS);
 #line 769 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -5918,7 +5941,7 @@ static EditingToolsCropToolConstraintDescription** editing_tools_crop_tool_creat
 #line 771 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp55__length1 = _result__length1;
 #line 771 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp56_ = _ ("Metric Wallet (9 x 13 cm)");
+	_tmp56_ = _ ("Metric Wallet (9 × 13 cm)");
 #line 771 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp57_ = editing_tools_crop_tool_constraint_description_new (_tmp56_, 13, 9, TRUE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS);
 #line 771 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -5928,7 +5951,7 @@ static EditingToolsCropToolConstraintDescription** editing_tools_crop_tool_creat
 #line 772 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp58__length1 = _result__length1;
 #line 772 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp59_ = _ ("Postcard (10 x 15 cm)");
+	_tmp59_ = _ ("Postcard (10 × 15 cm)");
 #line 772 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp60_ = editing_tools_crop_tool_constraint_description_new (_tmp59_, 15, 10, TRUE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS);
 #line 772 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -5938,7 +5961,7 @@ static EditingToolsCropToolConstraintDescription** editing_tools_crop_tool_creat
 #line 773 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp61__length1 = _result__length1;
 #line 773 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp62_ = _ ("13 x 18 cm");
+	_tmp62_ = _ ("13 × 18 cm");
 #line 773 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp63_ = editing_tools_crop_tool_constraint_description_new (_tmp62_, 18, 13, TRUE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS);
 #line 773 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -5948,7 +5971,7 @@ static EditingToolsCropToolConstraintDescription** editing_tools_crop_tool_creat
 #line 774 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp64__length1 = _result__length1;
 #line 774 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp65_ = _ ("18 x 24 cm");
+	_tmp65_ = _ ("18 × 24 cm");
 #line 774 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp66_ = editing_tools_crop_tool_constraint_description_new (_tmp65_, 24, 18, TRUE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS);
 #line 774 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -5958,7 +5981,7 @@ static EditingToolsCropToolConstraintDescription** editing_tools_crop_tool_creat
 #line 775 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp67__length1 = _result__length1;
 #line 775 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp68_ = _ ("A4 (210 x 297 mm)");
+	_tmp68_ = _ ("A4 (210 × 297 mm)");
 #line 775 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp69_ = editing_tools_crop_tool_constraint_description_new (_tmp68_, 210, 297, TRUE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS);
 #line 775 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -5968,7 +5991,7 @@ static EditingToolsCropToolConstraintDescription** editing_tools_crop_tool_creat
 #line 776 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp70__length1 = _result__length1;
 #line 776 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp71_ = _ ("20 x 30 cm");
+	_tmp71_ = _ ("20 × 30 cm");
 #line 776 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp72_ = editing_tools_crop_tool_constraint_description_new (_tmp71_, 30, 20, TRUE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS);
 #line 776 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -5978,7 +6001,7 @@ static EditingToolsCropToolConstraintDescription** editing_tools_crop_tool_creat
 #line 777 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp73__length1 = _result__length1;
 #line 777 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp74_ = _ ("24 x 40 cm");
+	_tmp74_ = _ ("24 × 40 cm");
 #line 777 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp75_ = editing_tools_crop_tool_constraint_description_new (_tmp74_, 40, 24, TRUE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS);
 #line 777 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -5988,7 +6011,7 @@ static EditingToolsCropToolConstraintDescription** editing_tools_crop_tool_creat
 #line 778 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp76__length1 = _result__length1;
 #line 778 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp77_ = _ ("30 x 40 cm");
+	_tmp77_ = _ ("30 × 40 cm");
 #line 778 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp78_ = editing_tools_crop_tool_constraint_description_new (_tmp77_, 40, 30, TRUE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS);
 #line 778 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -5998,7 +6021,7 @@ static EditingToolsCropToolConstraintDescription** editing_tools_crop_tool_creat
 #line 779 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp79__length1 = _result__length1;
 #line 779 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp80_ = _ ("A3 (297 x 420 mm)");
+	_tmp80_ = _ ("A3 (297 × 420 mm)");
 #line 779 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp81_ = editing_tools_crop_tool_constraint_description_new (_tmp80_, 420, 297, TRUE, EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS);
 #line 779 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -6031,20 +6054,20 @@ static EditingToolsCropToolConstraintDescription** editing_tools_crop_tool_creat
 	if (result_length1) {
 #line 783 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*result_length1 = _tmp88__length1;
-#line 6035 "EditingTools.c"
+#line 6058 "EditingTools.c"
 	}
 #line 783 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	result = _tmp88_;
 #line 783 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 6041 "EditingTools.c"
+#line 6064 "EditingTools.c"
 }
 
 
 static gpointer _editing_tools_crop_tool_constraint_description_ref0 (gpointer self) {
 #line 790 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return self ? editing_tools_crop_tool_constraint_description_ref (self) : NULL;
-#line 6048 "EditingTools.c"
+#line 6071 "EditingTools.c"
 }
 
 
@@ -6063,7 +6086,7 @@ static GtkListStore* editing_tools_crop_tool_create_constraint_list (EditingTool
 	_tmp1_ = constraint_data;
 #line 790 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1__length1 = constraint_data_length1;
-#line 6067 "EditingTools.c"
+#line 6090 "EditingTools.c"
 	{
 		EditingToolsCropToolConstraintDescription** constraint_collection = NULL;
 		gint constraint_collection_length1 = 0;
@@ -6075,14 +6098,14 @@ static GtkListStore* editing_tools_crop_tool_create_constraint_list (EditingTool
 		constraint_collection_length1 = _tmp1__length1;
 #line 790 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		for (constraint_it = 0; constraint_it < _tmp1__length1; constraint_it = constraint_it + 1) {
-#line 6079 "EditingTools.c"
+#line 6102 "EditingTools.c"
 			EditingToolsCropToolConstraintDescription* _tmp2_ = NULL;
 			EditingToolsCropToolConstraintDescription* constraint = NULL;
 #line 790 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp2_ = _editing_tools_crop_tool_constraint_description_ref0 (constraint_collection[constraint_it]);
 #line 790 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			constraint = _tmp2_;
-#line 6086 "EditingTools.c"
+#line 6109 "EditingTools.c"
 			{
 				GtkListStore* _tmp3_ = NULL;
 				GtkTreeIter _tmp4_ = {0};
@@ -6115,7 +6138,7 @@ static GtkListStore* editing_tools_crop_tool_create_constraint_list (EditingTool
 				G_IS_VALUE (&_tmp9_) ? (g_value_unset (&_tmp9_), NULL) : NULL;
 #line 790 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_editing_tools_crop_tool_constraint_description_unref0 (constraint);
-#line 6119 "EditingTools.c"
+#line 6142 "EditingTools.c"
 			}
 		}
 	}
@@ -6123,7 +6146,7 @@ static GtkListStore* editing_tools_crop_tool_create_constraint_list (EditingTool
 	result = _result_;
 #line 795 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 6127 "EditingTools.c"
+#line 6150 "EditingTools.c"
 }
 
 
@@ -6149,7 +6172,7 @@ static void editing_tools_crop_tool_update_pivot_button_state (EditingToolsCropT
 	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_widget_get_type (), GtkWidget), _tmp4_);
 #line 799 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_editing_tools_crop_tool_constraint_description_unref0 (_tmp3_);
-#line 6153 "EditingTools.c"
+#line 6176 "EditingTools.c"
 }
 
 
@@ -6189,7 +6212,7 @@ static EditingToolsCropToolConstraintDescription* editing_tools_crop_tool_get_se
 	_tmp7_ = _tmp6_->aspect_ratio;
 #line 806 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp7_ == EDITING_TOOLS_CROP_TOOL_ORIGINAL_ASPECT_RATIO) {
-#line 6193 "EditingTools.c"
+#line 6216 "EditingTools.c"
 		EditingToolsCropToolConstraintDescription* _tmp8_ = NULL;
 		EditingToolsPhotoCanvas* _tmp9_ = NULL;
 		GdkRectangle _tmp10_ = {0};
@@ -6218,7 +6241,7 @@ static EditingToolsCropToolConstraintDescription* editing_tools_crop_tool_get_se
 		_tmp15_ = _tmp14_.height;
 #line 808 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp12_->basis_height = _tmp15_;
-#line 6222 "EditingTools.c"
+#line 6245 "EditingTools.c"
 	} else {
 		EditingToolsCropToolConstraintDescription* _tmp16_ = NULL;
 		gfloat _tmp17_ = 0.0F;
@@ -6228,7 +6251,7 @@ static EditingToolsCropToolConstraintDescription* editing_tools_crop_tool_get_se
 		_tmp17_ = _tmp16_->aspect_ratio;
 #line 809 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		if (_tmp17_ == EDITING_TOOLS_CROP_TOOL_SCREEN_ASPECT_RATIO) {
-#line 6232 "EditingTools.c"
+#line 6255 "EditingTools.c"
 			GdkScreen* screen = NULL;
 			GdkScreen* _tmp18_ = NULL;
 			GdkScreen* _tmp19_ = NULL;
@@ -6262,14 +6285,14 @@ static EditingToolsCropToolConstraintDescription* editing_tools_crop_tool_get_se
 			_tmp23_->basis_height = _tmp25_;
 #line 809 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_g_object_unref0 (screen);
-#line 6266 "EditingTools.c"
+#line 6289 "EditingTools.c"
 		}
 	}
 #line 815 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	result = _result_;
 #line 815 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 6273 "EditingTools.c"
+#line 6296 "EditingTools.c"
 }
 
 
@@ -6305,7 +6328,7 @@ static gboolean editing_tools_crop_tool_on_width_entry_focus_out (EditingToolsCr
 	result = _tmp5_;
 #line 820 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 6309 "EditingTools.c"
+#line 6332 "EditingTools.c"
 }
 
 
@@ -6341,7 +6364,7 @@ static gboolean editing_tools_crop_tool_on_height_entry_focus_out (EditingToolsC
 	result = _tmp5_;
 #line 825 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 6345 "EditingTools.c"
+#line 6368 "EditingTools.c"
 }
 
 
@@ -6411,7 +6434,7 @@ static gboolean editing_tools_crop_tool_on_custom_entry_focus_out (EditingToolsC
 	_tmp10_ = width;
 #line 832 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp10_ < 1) {
-#line 6415 "EditingTools.c"
+#line 6438 "EditingTools.c"
 		EditingToolsCropToolCropToolWindow* _tmp11_ = NULL;
 		GtkEntry* _tmp12_ = NULL;
 		gint _tmp13_ = 0;
@@ -6433,13 +6456,13 @@ static gboolean editing_tools_crop_tool_on_custom_entry_focus_out (EditingToolsC
 		gtk_entry_set_text (_tmp12_, _tmp15_);
 #line 834 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_free0 (_tmp15_);
-#line 6437 "EditingTools.c"
+#line 6460 "EditingTools.c"
 	}
 #line 837 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp16_ = height;
 #line 837 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp16_ < 1) {
-#line 6443 "EditingTools.c"
+#line 6466 "EditingTools.c"
 		EditingToolsCropToolCropToolWindow* _tmp17_ = NULL;
 		GtkEntry* _tmp18_ = NULL;
 		gint _tmp19_ = 0;
@@ -6461,7 +6484,7 @@ static gboolean editing_tools_crop_tool_on_custom_entry_focus_out (EditingToolsC
 		gtk_entry_set_text (_tmp18_, _tmp21_);
 #line 839 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_free0 (_tmp21_);
-#line 6465 "EditingTools.c"
+#line 6488 "EditingTools.c"
 	}
 #line 842 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp23_ = width;
@@ -6469,7 +6492,7 @@ static gboolean editing_tools_crop_tool_on_custom_entry_focus_out (EditingToolsC
 	_tmp24_ = self->priv->custom_width;
 #line 842 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp23_ == _tmp24_) {
-#line 6473 "EditingTools.c"
+#line 6496 "EditingTools.c"
 		gint _tmp25_ = 0;
 		gint _tmp26_ = 0;
 #line 842 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -6478,11 +6501,11 @@ static gboolean editing_tools_crop_tool_on_custom_entry_focus_out (EditingToolsC
 		_tmp26_ = self->priv->custom_height;
 #line 842 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp22_ = _tmp25_ == _tmp26_;
-#line 6482 "EditingTools.c"
+#line 6505 "EditingTools.c"
 	} else {
 #line 842 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp22_ = FALSE;
-#line 6486 "EditingTools.c"
+#line 6509 "EditingTools.c"
 	}
 #line 842 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp22_) {
@@ -6490,7 +6513,7 @@ static gboolean editing_tools_crop_tool_on_custom_entry_focus_out (EditingToolsC
 		result = FALSE;
 #line 843 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return result;
-#line 6494 "EditingTools.c"
+#line 6517 "EditingTools.c"
 	}
 #line 845 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp27_ = width;
@@ -6502,7 +6525,7 @@ static gboolean editing_tools_crop_tool_on_custom_entry_focus_out (EditingToolsC
 	_tmp29_ = self->priv->custom_aspect_ratio;
 #line 847 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp29_ < EDITING_TOOLS_CROP_TOOL_MIN_ASPECT_RATIO) {
-#line 6506 "EditingTools.c"
+#line 6529 "EditingTools.c"
 		EditingToolsCropToolCropToolWindow* _tmp30_ = NULL;
 		GtkEntry* _tmp31_ = NULL;
 		EditingToolsCropToolCropToolWindow* _tmp32_ = NULL;
@@ -6517,7 +6540,7 @@ static gboolean editing_tools_crop_tool_on_custom_entry_focus_out (EditingToolsC
 		_tmp33_ = _tmp32_->custom_height_entry;
 #line 848 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		if (_tmp31_ == _tmp33_) {
-#line 6521 "EditingTools.c"
+#line 6544 "EditingTools.c"
 			gint _tmp34_ = 0;
 			EditingToolsCropToolCropToolWindow* _tmp35_ = NULL;
 			GtkEntry* _tmp36_ = NULL;
@@ -6542,7 +6565,7 @@ static gboolean editing_tools_crop_tool_on_custom_entry_focus_out (EditingToolsC
 			gtk_entry_set_text (_tmp36_, _tmp39_);
 #line 850 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_g_free0 (_tmp39_);
-#line 6546 "EditingTools.c"
+#line 6569 "EditingTools.c"
 		} else {
 			gint _tmp40_ = 0;
 			EditingToolsCropToolCropToolWindow* _tmp41_ = NULL;
@@ -6568,7 +6591,7 @@ static gboolean editing_tools_crop_tool_on_custom_entry_focus_out (EditingToolsC
 			gtk_entry_set_text (_tmp42_, _tmp45_);
 #line 853 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_g_free0 (_tmp45_);
-#line 6572 "EditingTools.c"
+#line 6595 "EditingTools.c"
 		}
 	} else {
 		gfloat _tmp46_ = 0.0F;
@@ -6576,7 +6599,7 @@ static gboolean editing_tools_crop_tool_on_custom_entry_focus_out (EditingToolsC
 		_tmp46_ = self->priv->custom_aspect_ratio;
 #line 855 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		if (_tmp46_ > EDITING_TOOLS_CROP_TOOL_MAX_ASPECT_RATIO) {
-#line 6580 "EditingTools.c"
+#line 6603 "EditingTools.c"
 			EditingToolsCropToolCropToolWindow* _tmp47_ = NULL;
 			GtkEntry* _tmp48_ = NULL;
 			EditingToolsCropToolCropToolWindow* _tmp49_ = NULL;
@@ -6591,7 +6614,7 @@ static gboolean editing_tools_crop_tool_on_custom_entry_focus_out (EditingToolsC
 			_tmp50_ = _tmp49_->custom_height_entry;
 #line 856 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			if (_tmp48_ == _tmp50_) {
-#line 6595 "EditingTools.c"
+#line 6618 "EditingTools.c"
 				gint _tmp51_ = 0;
 				EditingToolsCropToolCropToolWindow* _tmp52_ = NULL;
 				GtkEntry* _tmp53_ = NULL;
@@ -6616,7 +6639,7 @@ static gboolean editing_tools_crop_tool_on_custom_entry_focus_out (EditingToolsC
 				gtk_entry_set_text (_tmp53_, _tmp56_);
 #line 858 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_g_free0 (_tmp56_);
-#line 6620 "EditingTools.c"
+#line 6643 "EditingTools.c"
 			} else {
 				gint _tmp57_ = 0;
 				EditingToolsCropToolCropToolWindow* _tmp58_ = NULL;
@@ -6642,7 +6665,7 @@ static gboolean editing_tools_crop_tool_on_custom_entry_focus_out (EditingToolsC
 				gtk_entry_set_text (_tmp59_, _tmp62_);
 #line 861 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_g_free0 (_tmp62_);
-#line 6646 "EditingTools.c"
+#line 6669 "EditingTools.c"
 			}
 		}
 	}
@@ -6688,7 +6711,7 @@ static gboolean editing_tools_crop_tool_on_custom_entry_focus_out (EditingToolsC
 	result = FALSE;
 #line 877 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 6692 "EditingTools.c"
+#line 6715 "EditingTools.c"
 }
 
 
@@ -6711,7 +6734,7 @@ static void editing_tools_crop_tool_on_width_insert_text (EditingToolsCropTool*
 	_tmp3_ = length;
 #line 881 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_crop_tool_on_entry_insert_text (self, _tmp1_, _tmp2_, _tmp3_, position);
-#line 6715 "EditingTools.c"
+#line 6738 "EditingTools.c"
 }
 
 
@@ -6734,7 +6757,7 @@ static void editing_tools_crop_tool_on_height_insert_text (EditingToolsCropTool*
 	_tmp3_ = length;
 #line 885 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_crop_tool_on_entry_insert_text (self, _tmp1_, _tmp2_, _tmp3_, position);
-#line 6738 "EditingTools.c"
+#line 6761 "EditingTools.c"
 }
 
 
@@ -6752,7 +6775,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 6756 "EditingTools.c"
+#line 6779 "EditingTools.c"
 }
 
 
@@ -6777,7 +6800,7 @@ static void editing_tools_crop_tool_on_entry_insert_text (EditingToolsCropTool*
 	if (_tmp0_) {
 #line 890 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return;
-#line 6781 "EditingTools.c"
+#line 6804 "EditingTools.c"
 	}
 #line 892 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->entry_insert_in_progress = TRUE;
@@ -6785,7 +6808,7 @@ static void editing_tools_crop_tool_on_entry_insert_text (EditingToolsCropTool*
 	_tmp1_ = length;
 #line 894 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp1_ == -1) {
-#line 6789 "EditingTools.c"
+#line 6812 "EditingTools.c"
 		const gchar* _tmp2_ = NULL;
 		gint _tmp3_ = 0;
 		gint _tmp4_ = 0;
@@ -6797,25 +6820,25 @@ static void editing_tools_crop_tool_on_entry_insert_text (EditingToolsCropTool*
 		_tmp4_ = _tmp3_;
 #line 895 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		length = (gint) _tmp4_;
-#line 6801 "EditingTools.c"
+#line 6824 "EditingTools.c"
 	}
 #line 898 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = g_strdup ("");
 #line 898 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	new_text = _tmp5_;
-#line 6807 "EditingTools.c"
+#line 6830 "EditingTools.c"
 	{
 		gint ctr = 0;
 #line 899 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		ctr = 0;
-#line 6812 "EditingTools.c"
+#line 6835 "EditingTools.c"
 		{
 			gboolean _tmp6_ = FALSE;
 #line 899 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp6_ = TRUE;
 #line 899 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			while (TRUE) {
-#line 6819 "EditingTools.c"
+#line 6842 "EditingTools.c"
 				gint _tmp8_ = 0;
 				gint _tmp9_ = 0;
 				const gchar* _tmp10_ = NULL;
@@ -6824,13 +6847,13 @@ static void editing_tools_crop_tool_on_entry_insert_text (EditingToolsCropTool*
 				gboolean _tmp13_ = FALSE;
 #line 899 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				if (!_tmp6_) {
-#line 6828 "EditingTools.c"
+#line 6851 "EditingTools.c"
 					gint _tmp7_ = 0;
 #line 899 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp7_ = ctr;
 #line 899 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					ctr = _tmp7_ + 1;
-#line 6834 "EditingTools.c"
+#line 6857 "EditingTools.c"
 				}
 #line 899 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp6_ = FALSE;
@@ -6842,7 +6865,7 @@ static void editing_tools_crop_tool_on_entry_insert_text (EditingToolsCropTool*
 				if (!(_tmp8_ < _tmp9_)) {
 #line 899 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					break;
-#line 6846 "EditingTools.c"
+#line 6869 "EditingTools.c"
 				}
 #line 900 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp10_ = text;
@@ -6854,7 +6877,7 @@ static void editing_tools_crop_tool_on_entry_insert_text (EditingToolsCropTool*
 				_tmp13_ = g_ascii_isdigit (_tmp12_);
 #line 900 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				if (_tmp13_) {
-#line 6858 "EditingTools.c"
+#line 6881 "EditingTools.c"
 					const gchar* _tmp14_ = NULL;
 					const gchar* _tmp15_ = NULL;
 					gint _tmp16_ = 0;
@@ -6882,7 +6905,7 @@ static void editing_tools_crop_tool_on_entry_insert_text (EditingToolsCropTool*
 					new_text = _tmp20_;
 #line 901 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_g_free0 (_tmp19_);
-#line 6886 "EditingTools.c"
+#line 6909 "EditingTools.c"
 				}
 			}
 		}
@@ -6895,7 +6918,7 @@ static void editing_tools_crop_tool_on_entry_insert_text (EditingToolsCropTool*
 	_tmp23_ = _tmp22_;
 #line 905 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp23_ > 0) {
-#line 6899 "EditingTools.c"
+#line 6922 "EditingTools.c"
 		GtkEntry* _tmp24_ = NULL;
 		const gchar* _tmp25_ = NULL;
 		const gchar* _tmp26_ = NULL;
@@ -6913,7 +6936,7 @@ static void editing_tools_crop_tool_on_entry_insert_text (EditingToolsCropTool*
 		_tmp28_ = _tmp27_;
 #line 906 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		gtk_editable_insert_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GTK_TYPE_EDITABLE, GtkEditable), _tmp25_, (gint) _tmp28_, position);
-#line 6917 "EditingTools.c"
+#line 6940 "EditingTools.c"
 	}
 #line 908 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp29_ = sender;
@@ -6923,7 +6946,7 @@ static void editing_tools_crop_tool_on_entry_insert_text (EditingToolsCropTool*
 	self->priv->entry_insert_in_progress = FALSE;
 #line 888 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_free0 (new_text);
-#line 6927 "EditingTools.c"
+#line 6950 "EditingTools.c"
 }
 
 
@@ -6954,7 +6977,7 @@ static gfloat editing_tools_crop_tool_get_constraint_aspect_ratio (EditingToolsC
 	_tmp4_ = _result_;
 #line 916 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp4_ == EDITING_TOOLS_CROP_TOOL_ORIGINAL_ASPECT_RATIO) {
-#line 6958 "EditingTools.c"
+#line 6981 "EditingTools.c"
 		EditingToolsPhotoCanvas* _tmp5_ = NULL;
 		GdkRectangle _tmp6_ = {0};
 		gint _tmp7_ = 0;
@@ -6975,14 +6998,14 @@ static gfloat editing_tools_crop_tool_get_constraint_aspect_ratio (EditingToolsC
 		_tmp10_ = _tmp9_.height;
 #line 917 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_result_ = ((gfloat) _tmp7_) / ((gfloat) _tmp10_);
-#line 6979 "EditingTools.c"
+#line 7002 "EditingTools.c"
 	} else {
 		gfloat _tmp11_ = 0.0F;
 #line 919 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp11_ = _result_;
 #line 919 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		if (_tmp11_ == EDITING_TOOLS_CROP_TOOL_SCREEN_ASPECT_RATIO) {
-#line 6986 "EditingTools.c"
+#line 7009 "EditingTools.c"
 			GdkScreen* screen = NULL;
 			GdkScreen* _tmp12_ = NULL;
 			GdkScreen* _tmp13_ = NULL;
@@ -7008,20 +7031,20 @@ static gfloat editing_tools_crop_tool_get_constraint_aspect_ratio (EditingToolsC
 			_result_ = ((gfloat) _tmp15_) / ((gfloat) _tmp17_);
 #line 919 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_g_object_unref0 (screen);
-#line 7012 "EditingTools.c"
+#line 7035 "EditingTools.c"
 		} else {
 			gfloat _tmp18_ = 0.0F;
 #line 922 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp18_ = _result_;
 #line 922 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			if (_tmp18_ == EDITING_TOOLS_CROP_TOOL_CUSTOM_ASPECT_RATIO) {
-#line 7019 "EditingTools.c"
+#line 7042 "EditingTools.c"
 				gfloat _tmp19_ = 0.0F;
 #line 923 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp19_ = self->priv->custom_aspect_ratio;
 #line 923 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_result_ = _tmp19_;
-#line 7025 "EditingTools.c"
+#line 7048 "EditingTools.c"
 			}
 		}
 	}
@@ -7029,19 +7052,19 @@ static gfloat editing_tools_crop_tool_get_constraint_aspect_ratio (EditingToolsC
 	_tmp20_ = self->priv->reticle_orientation;
 #line 925 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp20_ == EDITING_TOOLS_CROP_TOOL_RETICLE_ORIENTATION_PORTRAIT) {
-#line 7033 "EditingTools.c"
+#line 7056 "EditingTools.c"
 		gfloat _tmp21_ = 0.0F;
 #line 926 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp21_ = _result_;
 #line 926 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_result_ = 1.0f / _tmp21_;
-#line 7039 "EditingTools.c"
+#line 7062 "EditingTools.c"
 	}
 #line 928 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	result = _result_;
 #line 928 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 7045 "EditingTools.c"
+#line 7068 "EditingTools.c"
 }
 
 
@@ -7068,7 +7091,7 @@ static gfloat editing_tools_crop_tool_get_constraint_aspect_ratio_for_constraint
 	_tmp2_ = _result_;
 #line 934 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp2_ == EDITING_TOOLS_CROP_TOOL_ORIGINAL_ASPECT_RATIO) {
-#line 7072 "EditingTools.c"
+#line 7095 "EditingTools.c"
 		Dimensions orig_dim = {0};
 		Photo* _tmp3_ = NULL;
 		Dimensions _tmp4_ = {0};
@@ -7092,14 +7115,14 @@ static gfloat editing_tools_crop_tool_get_constraint_aspect_ratio_for_constraint
 		_tmp8_ = _tmp7_.height;
 #line 936 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_result_ = ((gfloat) _tmp6_) / ((gfloat) _tmp8_);
-#line 7096 "EditingTools.c"
+#line 7119 "EditingTools.c"
 	} else {
 		gfloat _tmp9_ = 0.0F;
 #line 937 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp9_ = _result_;
 #line 937 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		if (_tmp9_ == EDITING_TOOLS_CROP_TOOL_SCREEN_ASPECT_RATIO) {
-#line 7103 "EditingTools.c"
+#line 7126 "EditingTools.c"
 			GdkScreen* screen = NULL;
 			GdkScreen* _tmp10_ = NULL;
 			GdkScreen* _tmp11_ = NULL;
@@ -7125,20 +7148,20 @@ static gfloat editing_tools_crop_tool_get_constraint_aspect_ratio_for_constraint
 			_result_ = ((gfloat) _tmp13_) / ((gfloat) _tmp15_);
 #line 937 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_g_object_unref0 (screen);
-#line 7129 "EditingTools.c"
+#line 7152 "EditingTools.c"
 		} else {
 			gfloat _tmp16_ = 0.0F;
 #line 940 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp16_ = _result_;
 #line 940 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			if (_tmp16_ == EDITING_TOOLS_CROP_TOOL_CUSTOM_ASPECT_RATIO) {
-#line 7136 "EditingTools.c"
+#line 7159 "EditingTools.c"
 				gfloat _tmp17_ = 0.0F;
 #line 941 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp17_ = self->priv->custom_aspect_ratio;
 #line 941 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_result_ = _tmp17_;
-#line 7142 "EditingTools.c"
+#line 7165 "EditingTools.c"
 			}
 		}
 	}
@@ -7146,19 +7169,19 @@ static gfloat editing_tools_crop_tool_get_constraint_aspect_ratio_for_constraint
 	_tmp18_ = self->priv->reticle_orientation;
 #line 943 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp18_ == EDITING_TOOLS_CROP_TOOL_RETICLE_ORIENTATION_PORTRAIT) {
-#line 7150 "EditingTools.c"
+#line 7173 "EditingTools.c"
 		gfloat _tmp19_ = 0.0F;
 #line 944 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp19_ = _result_;
 #line 944 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_result_ = 1.0f / _tmp19_;
-#line 7156 "EditingTools.c"
+#line 7179 "EditingTools.c"
 	}
 #line 946 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	result = _result_;
 #line 946 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 7162 "EditingTools.c"
+#line 7185 "EditingTools.c"
 }
 
 
@@ -7187,7 +7210,7 @@ static void editing_tools_crop_tool_constraint_changed (EditingToolsCropTool* se
 	if (_tmp2_ == EDITING_TOOLS_CROP_TOOL_CUSTOM_ASPECT_RATIO) {
 #line 953 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_crop_tool_set_custom_constraint_mode (self);
-#line 7191 "EditingTools.c"
+#line 7214 "EditingTools.c"
 	} else {
 		EditingToolsCropToolConstraintDescription* _tmp3_ = NULL;
 		gfloat _tmp4_ = 0.0F;
@@ -7199,7 +7222,7 @@ static void editing_tools_crop_tool_constraint_changed (EditingToolsCropTool* se
 		_tmp4_ = _tmp3_->aspect_ratio;
 #line 957 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		if (_tmp4_ != EDITING_TOOLS_CROP_TOOL_ANY_ASPECT_RATIO) {
-#line 7203 "EditingTools.c"
+#line 7226 "EditingTools.c"
 			ConfigFacade* _tmp5_ = NULL;
 			ConfigFacade* _tmp6_ = NULL;
 			gint _tmp7_ = 0;
@@ -7234,7 +7257,7 @@ static void editing_tools_crop_tool_constraint_changed (EditingToolsCropTool* se
 			_tmp12_ = self->priv->custom_init_height;
 #line 963 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			self->priv->custom_aspect_ratio = ((gfloat) _tmp11_) / ((gfloat) _tmp12_);
-#line 7238 "EditingTools.c"
+#line 7261 "EditingTools.c"
 		}
 	}
 #line 967 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -7253,7 +7276,7 @@ static void editing_tools_crop_tool_constraint_changed (EditingToolsCropTool* se
 	if (_tmp16_) {
 #line 970 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		self->priv->reticle_orientation = EDITING_TOOLS_CROP_TOOL_RETICLE_ORIENTATION_LANDSCAPE;
-#line 7257 "EditingTools.c"
+#line 7280 "EditingTools.c"
 	}
 #line 972 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp17_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self);
@@ -7261,7 +7284,7 @@ static void editing_tools_crop_tool_constraint_changed (EditingToolsCropTool* se
 	_tmp18_ = self->priv->pre_aspect_ratio;
 #line 972 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp17_ != _tmp18_) {
-#line 7265 "EditingTools.c"
+#line 7288 "EditingTools.c"
 		Box new_crop = {0};
 		Box _tmp19_ = {0};
 		Box _tmp20_ = {0};
@@ -7299,11 +7322,11 @@ static void editing_tools_crop_tool_constraint_changed (EditingToolsCropTool* se
 		_tmp26_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self);
 #line 980 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		self->priv->pre_aspect_ratio = _tmp26_;
-#line 7303 "EditingTools.c"
+#line 7326 "EditingTools.c"
 	}
 #line 950 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_editing_tools_crop_tool_constraint_description_unref0 (selected_constraint);
-#line 7307 "EditingTools.c"
+#line 7330 "EditingTools.c"
 }
 
 
@@ -7360,7 +7383,7 @@ static void editing_tools_crop_tool_set_custom_constraint_mode (EditingToolsCrop
 	if (_tmp0_ == EDITING_TOOLS_CROP_TOOL_CONSTRAINT_MODE_CUSTOM) {
 #line 986 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return;
-#line 7364 "EditingTools.c"
+#line 7387 "EditingTools.c"
 	}
 #line 988 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = self->priv->crop_tool_window;
@@ -7370,7 +7393,7 @@ static void editing_tools_crop_tool_set_custom_constraint_mode (EditingToolsCrop
 	if (_tmp3_ == -1) {
 #line 988 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp1_ = TRUE;
-#line 7374 "EditingTools.c"
+#line 7397 "EditingTools.c"
 	} else {
 		EditingToolsCropToolCropToolWindow* _tmp4_ = NULL;
 		gint _tmp5_ = 0;
@@ -7380,11 +7403,11 @@ static void editing_tools_crop_tool_set_custom_constraint_mode (EditingToolsCrop
 		_tmp5_ = _tmp4_->normal_height;
 #line 988 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp1_ = _tmp5_ == -1;
-#line 7384 "EditingTools.c"
+#line 7407 "EditingTools.c"
 	}
 #line 988 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp1_) {
-#line 7388 "EditingTools.c"
+#line 7411 "EditingTools.c"
 		EditingToolsCropToolCropToolWindow* _tmp6_ = NULL;
 		EditingToolsCropToolCropToolWindow* _tmp7_ = NULL;
 		EditingToolsCropToolCropToolWindow* _tmp8_ = NULL;
@@ -7402,7 +7425,7 @@ static void editing_tools_crop_tool_set_custom_constraint_mode (EditingToolsCrop
 		_tmp7_->normal_width = _tmp9_;
 #line 989 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp8_->normal_height = _tmp10_;
-#line 7406 "EditingTools.c"
+#line 7429 "EditingTools.c"
 	}
 #line 992 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp11_ = self->priv->crop_tool_window;
@@ -7498,7 +7521,7 @@ static void editing_tools_crop_tool_set_custom_constraint_mode (EditingToolsCrop
 	_tmp47_ = self->priv->reticle_orientation;
 #line 1003 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp47_ == EDITING_TOOLS_CROP_TOOL_RETICLE_ORIENTATION_LANDSCAPE) {
-#line 7502 "EditingTools.c"
+#line 7525 "EditingTools.c"
 		EditingToolsCropToolCropToolWindow* _tmp48_ = NULL;
 		GtkEntry* _tmp49_ = NULL;
 		gint _tmp50_ = 0;
@@ -7537,7 +7560,7 @@ static void editing_tools_crop_tool_set_custom_constraint_mode (EditingToolsCrop
 		gtk_entry_set_text (_tmp54_, _tmp57_);
 #line 1005 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_free0 (_tmp57_);
-#line 7541 "EditingTools.c"
+#line 7564 "EditingTools.c"
 	} else {
 		EditingToolsCropToolCropToolWindow* _tmp58_ = NULL;
 		GtkEntry* _tmp59_ = NULL;
@@ -7577,7 +7600,7 @@ static void editing_tools_crop_tool_set_custom_constraint_mode (EditingToolsCrop
 		gtk_entry_set_text (_tmp64_, _tmp67_);
 #line 1008 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_free0 (_tmp67_);
-#line 7581 "EditingTools.c"
+#line 7604 "EditingTools.c"
 	}
 #line 1010 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp68_ = self->priv->custom_init_width;
@@ -7591,7 +7614,7 @@ static void editing_tools_crop_tool_set_custom_constraint_mode (EditingToolsCrop
 	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp70_, gtk_widget_get_type (), GtkWidget));
 #line 1014 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->constraint_mode = EDITING_TOOLS_CROP_TOOL_CONSTRAINT_MODE_CUSTOM;
-#line 7595 "EditingTools.c"
+#line 7618 "EditingTools.c"
 }
 
 
@@ -7647,7 +7670,7 @@ static void editing_tools_crop_tool_set_normal_constraint_mode (EditingToolsCrop
 	if (_tmp0_ == EDITING_TOOLS_CROP_TOOL_CONSTRAINT_MODE_NORMAL) {
 #line 1019 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return;
-#line 7651 "EditingTools.c"
+#line 7674 "EditingTools.c"
 	}
 #line 1021 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = self->priv->crop_tool_window;
@@ -7757,7 +7780,7 @@ static void editing_tools_crop_tool_set_normal_constraint_mode (EditingToolsCrop
 	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, gtk_widget_get_type (), GtkWidget));
 #line 1037 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->constraint_mode = EDITING_TOOLS_CROP_TOOL_CONSTRAINT_MODE_NORMAL;
-#line 7761 "EditingTools.c"
+#line 7784 "EditingTools.c"
 }
 
 
@@ -7804,7 +7827,7 @@ static void editing_tools_crop_tool_constrain_crop (EditingToolsCropTool* self,
 	_tmp1_ = user_aspect_ratio;
 #line 1042 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp1_ == EDITING_TOOLS_CROP_TOOL_ANY_ASPECT_RATIO) {
-#line 7808 "EditingTools.c"
+#line 7831 "EditingTools.c"
 		Box _tmp2_ = {0};
 #line 1043 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp2_ = *crop;
@@ -7812,7 +7835,7 @@ static void editing_tools_crop_tool_constrain_crop (EditingToolsCropTool* self,
 		*result = _tmp2_;
 #line 1043 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return;
-#line 7816 "EditingTools.c"
+#line 7839 "EditingTools.c"
 	}
 #line 1046 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = box_get_width (crop);
@@ -7876,7 +7899,7 @@ static void editing_tools_crop_tool_constrain_crop (EditingToolsCropTool* self,
 	_tmp25_ = user_aspect_ratio;
 #line 1057 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (((gfloat) _tmp23_) >= (_tmp24_ * _tmp25_)) {
-#line 7880 "EditingTools.c"
+#line 7903 "EditingTools.c"
 		gint _tmp26_ = 0;
 		gfloat _tmp27_ = 0.0F;
 #line 1058 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -7885,7 +7908,7 @@ static void editing_tools_crop_tool_constrain_crop (EditingToolsCropTool* self,
 		_tmp27_ = user_aspect_ratio;
 #line 1058 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		box_adjust_width (crop, (gint) (_tmp26_ * _tmp27_));
-#line 7889 "EditingTools.c"
+#line 7912 "EditingTools.c"
 	} else {
 		gint _tmp28_ = 0;
 		gfloat _tmp29_ = 0.0F;
@@ -7895,7 +7918,7 @@ static void editing_tools_crop_tool_constrain_crop (EditingToolsCropTool* self,
 		_tmp29_ = user_aspect_ratio;
 #line 1060 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		box_adjust_height (crop, (gint) (_tmp28_ / _tmp29_));
-#line 7899 "EditingTools.c"
+#line 7922 "EditingTools.c"
 	}
 #line 1062 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp30_ = *crop;
@@ -7903,7 +7926,7 @@ static void editing_tools_crop_tool_constrain_crop (EditingToolsCropTool* self,
 	*result = _tmp30_;
 #line 1062 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return;
-#line 7907 "EditingTools.c"
+#line 7930 "EditingTools.c"
 }
 
 
@@ -7938,7 +7961,7 @@ static EditingToolsCropToolConstraintDescription* editing_tools_crop_tool_get_la
 	_tmp5__length1 = self->priv->constraints_length1;
 #line 1068 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp4_ < _tmp5__length1) {
-#line 7942 "EditingTools.c"
+#line 7965 "EditingTools.c"
 		EditingToolsCropToolConstraintDescription** _tmp6_ = NULL;
 		gint _tmp6__length1 = 0;
 		gint _tmp7_ = 0;
@@ -7953,11 +7976,11 @@ static EditingToolsCropToolConstraintDescription* editing_tools_crop_tool_get_la
 		_tmp8_ = _tmp6_[_tmp7_];
 #line 1068 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp3_ = _tmp8_;
-#line 7957 "EditingTools.c"
+#line 7980 "EditingTools.c"
 	} else {
 #line 1068 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp3_ = NULL;
-#line 7961 "EditingTools.c"
+#line 7984 "EditingTools.c"
 	}
 #line 1068 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp9_ = _editing_tools_crop_tool_constraint_description_ref0 (_tmp3_);
@@ -7967,11 +7990,11 @@ static EditingToolsCropToolConstraintDescription* editing_tools_crop_tool_get_la
 	if (index) {
 #line 1068 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*index = _vala_index;
-#line 7971 "EditingTools.c"
+#line 7994 "EditingTools.c"
 	}
 #line 1068 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 7975 "EditingTools.c"
+#line 7998 "EditingTools.c"
 }
 
 
@@ -8082,7 +8105,7 @@ static void editing_tools_crop_tool_real_activate (EditingToolsEditingTool* base
 		_cairo_surface_destroy0 (self->priv->crop_surface);
 #line 1077 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		self->priv->crop_surface = NULL;
-#line 8086 "EditingTools.c"
+#line 8109 "EditingTools.c"
 	}
 #line 1079 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7_ = canvas;
@@ -8154,7 +8177,7 @@ static void editing_tools_crop_tool_real_activate (EditingToolsEditingTool* base
 	_g_object_unref0 (_tmp27_);
 #line 1092 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp29_) {
-#line 8158 "EditingTools.c"
+#line 8181 "EditingTools.c"
 		gint index = 0;
 		EditingToolsCropToolConstraintDescription* desc = NULL;
 		gint _tmp30_ = 0;
@@ -8171,7 +8194,7 @@ static void editing_tools_crop_tool_real_activate (EditingToolsEditingTool* base
 		_tmp33_ = desc;
 #line 1095 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		if (_tmp33_ != NULL) {
-#line 8175 "EditingTools.c"
+#line 8198 "EditingTools.c"
 			EditingToolsCropToolConstraintDescription* _tmp34_ = NULL;
 			gboolean _tmp35_ = FALSE;
 #line 1095 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -8180,15 +8203,15 @@ static void editing_tools_crop_tool_real_activate (EditingToolsEditingTool* base
 			_tmp35_ = editing_tools_crop_tool_constraint_description_is_separator (_tmp34_);
 #line 1095 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp32_ = !_tmp35_;
-#line 8184 "EditingTools.c"
+#line 8207 "EditingTools.c"
 		} else {
 #line 1095 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp32_ = FALSE;
-#line 8188 "EditingTools.c"
+#line 8211 "EditingTools.c"
 		}
 #line 1095 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		if (_tmp32_) {
-#line 8192 "EditingTools.c"
+#line 8215 "EditingTools.c"
 			EditingToolsCropToolCropToolWindow* _tmp36_ = NULL;
 			GtkComboBox* _tmp37_ = NULL;
 			gint _tmp38_ = 0;
@@ -8200,11 +8223,11 @@ static void editing_tools_crop_tool_real_activate (EditingToolsEditingTool* base
 			_tmp38_ = index;
 #line 1096 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			gtk_combo_box_set_active (_tmp37_, _tmp38_);
-#line 8204 "EditingTools.c"
+#line 8227 "EditingTools.c"
 		}
 #line 1092 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_editing_tools_crop_tool_constraint_description_unref0 (desc);
-#line 8208 "EditingTools.c"
+#line 8231 "EditingTools.c"
 	} else {
 		Photo* photo = NULL;
 		EditingToolsPhotoCanvas* _tmp39_ = NULL;
@@ -8239,19 +8262,19 @@ static void editing_tools_crop_tool_real_activate (EditingToolsEditingTool* base
 		_tmp46_ = _tmp45_.height;
 #line 1102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		ratio = ((gfloat) _tmp44_) / ((gfloat) _tmp46_);
-#line 8243 "EditingTools.c"
+#line 8266 "EditingTools.c"
 		{
 			gint index = 0;
 #line 1103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			index = 1;
-#line 8248 "EditingTools.c"
+#line 8271 "EditingTools.c"
 			{
 				gboolean _tmp47_ = FALSE;
 #line 1103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp47_ = TRUE;
 #line 1103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				while (TRUE) {
-#line 8255 "EditingTools.c"
+#line 8278 "EditingTools.c"
 					gint _tmp49_ = 0;
 					EditingToolsCropToolConstraintDescription** _tmp50_ = NULL;
 					gint _tmp50__length1 = 0;
@@ -8265,13 +8288,13 @@ static void editing_tools_crop_tool_real_activate (EditingToolsEditingTool* base
 					gdouble _tmp57_ = 0.0;
 #line 1103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					if (!_tmp47_) {
-#line 8269 "EditingTools.c"
+#line 8292 "EditingTools.c"
 						gint _tmp48_ = 0;
 #line 1103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 						_tmp48_ = index;
 #line 1103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 						index = _tmp48_ + 1;
-#line 8275 "EditingTools.c"
+#line 8298 "EditingTools.c"
 					}
 #line 1103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp47_ = FALSE;
@@ -8285,7 +8308,7 @@ static void editing_tools_crop_tool_real_activate (EditingToolsEditingTool* base
 					if (!(_tmp49_ < _tmp50__length1)) {
 #line 1103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 						break;
-#line 8289 "EditingTools.c"
+#line 8312 "EditingTools.c"
 					}
 #line 1104 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp51_ = ratio;
@@ -8305,7 +8328,7 @@ static void editing_tools_crop_tool_real_activate (EditingToolsEditingTool* base
 					_tmp57_ = fabs ((gdouble) (_tmp51_ - _tmp56_));
 #line 1104 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					if (_tmp57_ < 0.005) {
-#line 8309 "EditingTools.c"
+#line 8332 "EditingTools.c"
 						EditingToolsCropToolCropToolWindow* _tmp58_ = NULL;
 						GtkComboBox* _tmp59_ = NULL;
 						gint _tmp60_ = 0;
@@ -8317,14 +8340,14 @@ static void editing_tools_crop_tool_real_activate (EditingToolsEditingTool* base
 						_tmp60_ = index;
 #line 1105 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 						gtk_combo_box_set_active (_tmp59_, _tmp60_);
-#line 8321 "EditingTools.c"
+#line 8344 "EditingTools.c"
 					}
 				}
 			}
 		}
 #line 1092 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_object_unref0 (photo);
-#line 8328 "EditingTools.c"
+#line 8351 "EditingTools.c"
 	}
 #line 1110 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_crop_tool_update_pivot_button_state (self);
@@ -8362,7 +8385,7 @@ static void editing_tools_crop_tool_real_activate (EditingToolsEditingTool* base
 	_g_object_unref0 (_tmp68_);
 #line 1119 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp71_) {
-#line 8366 "EditingTools.c"
+#line 8389 "EditingTools.c"
 		gint xofs = 0;
 		Dimensions _tmp72_ = {0};
 		gint _tmp73_ = 0;
@@ -8407,7 +8430,7 @@ static void editing_tools_crop_tool_real_activate (EditingToolsEditingTool* base
 		_tmp83_ = yofs;
 #line 1125 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		box_init (&crop, _tmp76_, _tmp77_, _tmp79_ - _tmp80_, _tmp82_ - _tmp83_);
-#line 8411 "EditingTools.c"
+#line 8434 "EditingTools.c"
 	}
 #line 1130 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp84_ = uncropped_dim;
@@ -8479,7 +8502,7 @@ static void editing_tools_crop_tool_real_activate (EditingToolsEditingTool* base
 	_g_object_unref0 (_tmp103_);
 #line 1148 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp105_) {
-#line 8483 "EditingTools.c"
+#line 8506 "EditingTools.c"
 		EditingToolsCropToolConstraintDescription* desc = NULL;
 		EditingToolsCropToolConstraintDescription* _tmp106_ = NULL;
 		gboolean _tmp107_ = FALSE;
@@ -8493,7 +8516,7 @@ static void editing_tools_crop_tool_real_activate (EditingToolsEditingTool* base
 		_tmp109_ = desc;
 #line 1150 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		if (_tmp109_ != NULL) {
-#line 8497 "EditingTools.c"
+#line 8520 "EditingTools.c"
 			EditingToolsCropToolConstraintDescription* _tmp110_ = NULL;
 			gboolean _tmp111_ = FALSE;
 #line 1150 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -8502,15 +8525,15 @@ static void editing_tools_crop_tool_real_activate (EditingToolsEditingTool* base
 			_tmp111_ = editing_tools_crop_tool_constraint_description_is_separator (_tmp110_);
 #line 1150 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp108_ = !_tmp111_;
-#line 8506 "EditingTools.c"
+#line 8529 "EditingTools.c"
 		} else {
 #line 1150 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp108_ = FALSE;
-#line 8510 "EditingTools.c"
+#line 8533 "EditingTools.c"
 		}
 #line 1150 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		if (_tmp108_) {
-#line 8514 "EditingTools.c"
+#line 8537 "EditingTools.c"
 			EditingToolsCropToolConstraintDescription* _tmp112_ = NULL;
 			gfloat _tmp113_ = 0.0F;
 #line 1150 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -8519,21 +8542,21 @@ static void editing_tools_crop_tool_real_activate (EditingToolsEditingTool* base
 			_tmp113_ = _tmp112_->aspect_ratio;
 #line 1150 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp107_ = _tmp113_ == EDITING_TOOLS_CROP_TOOL_CUSTOM_ASPECT_RATIO;
-#line 8523 "EditingTools.c"
+#line 8546 "EditingTools.c"
 		} else {
 #line 1150 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp107_ = FALSE;
-#line 8527 "EditingTools.c"
+#line 8550 "EditingTools.c"
 		}
 #line 1150 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		if (_tmp107_) {
 #line 1151 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			editing_tools_crop_tool_set_custom_constraint_mode (self);
-#line 8533 "EditingTools.c"
+#line 8556 "EditingTools.c"
 		}
 #line 1148 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_editing_tools_crop_tool_constraint_description_unref0 (desc);
-#line 8537 "EditingTools.c"
+#line 8560 "EditingTools.c"
 	}
 #line 1158 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp114_ = self->priv->scaled_crop;
@@ -8565,21 +8588,21 @@ static void editing_tools_crop_tool_real_activate (EditingToolsEditingTool* base
 	self->priv->pre_aspect_ratio = _tmp121_;
 #line 1071 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_cairo_destroy0 (ctx);
-#line 8569 "EditingTools.c"
+#line 8592 "EditingTools.c"
 }
 
 
 static void _editing_tools_crop_tool_prepare_ctx_editing_tools_photo_canvas_new_surface (EditingToolsPhotoCanvas* _sender, cairo_t* ctx, Dimensions* dim, gpointer self) {
 #line 1169 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_crop_tool_prepare_ctx ((EditingToolsCropTool*) self, ctx, dim);
-#line 8576 "EditingTools.c"
+#line 8599 "EditingTools.c"
 }
 
 
 static void _editing_tools_crop_tool_on_resized_pixbuf_editing_tools_photo_canvas_resized_scaled_pixbuf (EditingToolsPhotoCanvas* _sender, Dimensions* old_dim, GdkPixbuf* scaled, GdkRectangle* scaled_position, gpointer self) {
 #line 1170 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_crop_tool_on_resized_pixbuf ((EditingToolsCropTool*) self, old_dim, scaled, scaled_position);
-#line 8583 "EditingTools.c"
+#line 8606 "EditingTools.c"
 }
 
 
@@ -8598,7 +8621,7 @@ static void editing_tools_crop_tool_bind_canvas_handlers (EditingToolsCropTool*
 	_tmp1_ = canvas;
 #line 1170 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_connect (_tmp1_, "resized-scaled-pixbuf", (GCallback) _editing_tools_crop_tool_on_resized_pixbuf_editing_tools_photo_canvas_resized_scaled_pixbuf, self);
-#line 8602 "EditingTools.c"
+#line 8625 "EditingTools.c"
 }
 
 
@@ -8623,35 +8646,35 @@ static void editing_tools_crop_tool_unbind_canvas_handlers (EditingToolsCropTool
 	g_signal_parse_name ("resized-scaled-pixbuf", EDITING_TOOLS_TYPE_PHOTO_CANVAS, &_tmp3_, NULL, FALSE);
 #line 1175 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _editing_tools_crop_tool_on_resized_pixbuf_editing_tools_photo_canvas_resized_scaled_pixbuf, self);
-#line 8627 "EditingTools.c"
+#line 8650 "EditingTools.c"
 }
 
 
 static void _editing_tools_crop_tool_on_crop_ok_gtk_button_clicked (GtkButton* _sender, gpointer self) {
 #line 1180 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_crop_tool_on_crop_ok ((EditingToolsCropTool*) self);
-#line 8634 "EditingTools.c"
+#line 8657 "EditingTools.c"
 }
 
 
 static void _editing_tools_editing_tool_notify_cancel_gtk_button_clicked (GtkButton* _sender, gpointer self) {
 #line 1181 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_editing_tool_notify_cancel ((EditingToolsEditingTool*) self);
-#line 8641 "EditingTools.c"
+#line 8664 "EditingTools.c"
 }
 
 
 static void _editing_tools_crop_tool_constraint_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
 #line 1182 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_crop_tool_constraint_changed ((EditingToolsCropTool*) self);
-#line 8648 "EditingTools.c"
+#line 8671 "EditingTools.c"
 }
 
 
 static void _editing_tools_crop_tool_on_pivot_button_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
 #line 1183 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_crop_tool_on_pivot_button_clicked ((EditingToolsCropTool*) self);
-#line 8655 "EditingTools.c"
+#line 8678 "EditingTools.c"
 }
 
 
@@ -8660,7 +8683,7 @@ static gboolean _editing_tools_crop_tool_on_width_entry_focus_out_gtk_widget_foc
 	result = editing_tools_crop_tool_on_width_entry_focus_out ((EditingToolsCropTool*) self, event);
 #line 1186 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 8664 "EditingTools.c"
+#line 8687 "EditingTools.c"
 }
 
 
@@ -8669,21 +8692,21 @@ static gboolean _editing_tools_crop_tool_on_height_entry_focus_out_gtk_widget_fo
 	result = editing_tools_crop_tool_on_height_entry_focus_out ((EditingToolsCropTool*) self, event);
 #line 1187 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 8673 "EditingTools.c"
+#line 8696 "EditingTools.c"
 }
 
 
 static void _editing_tools_crop_tool_on_width_insert_text_gtk_editable_insert_text (GtkEditable* _sender, const gchar* new_text, gint new_text_length, gint* position, gpointer self) {
 #line 1188 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_crop_tool_on_width_insert_text ((EditingToolsCropTool*) self, new_text, new_text_length, position);
-#line 8680 "EditingTools.c"
+#line 8703 "EditingTools.c"
 }
 
 
 static void _editing_tools_crop_tool_on_height_insert_text_gtk_editable_insert_text (GtkEditable* _sender, const gchar* new_text, gint new_text_length, gint* position, gpointer self) {
 #line 1189 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_crop_tool_on_height_insert_text ((EditingToolsCropTool*) self, new_text, new_text_length, position);
-#line 8687 "EditingTools.c"
+#line 8710 "EditingTools.c"
 }
 
 
@@ -8759,7 +8782,7 @@ static void editing_tools_crop_tool_bind_window_handlers (EditingToolsCropTool*
 	_tmp16_ = _tmp15_->custom_height_entry;
 #line 1189 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GTK_TYPE_EDITABLE, GtkEditable), "insert-text", (GCallback) _editing_tools_crop_tool_on_height_insert_text_gtk_editable_insert_text, self);
-#line 8763 "EditingTools.c"
+#line 8786 "EditingTools.c"
 }
 
 
@@ -8851,7 +8874,7 @@ static void editing_tools_crop_tool_unbind_window_handlers (EditingToolsCropTool
 	g_signal_parse_name ("insert-text", GTK_TYPE_EDITABLE, &_tmp22_, NULL, FALSE);
 #line 1202 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, GTK_TYPE_EDITABLE, GtkEditable), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp22_, 0, NULL, (GCallback) _editing_tools_crop_tool_on_width_insert_text_gtk_editable_insert_text, self);
-#line 8855 "EditingTools.c"
+#line 8878 "EditingTools.c"
 }
 
 
@@ -8879,7 +8902,7 @@ static gboolean editing_tools_crop_tool_real_on_keypress (EditingToolsEditingToo
 	if (g_strcmp0 (_tmp4_, "KP_Enter") == 0) {
 #line 1206 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp1_ = TRUE;
-#line 8883 "EditingTools.c"
+#line 8906 "EditingTools.c"
 	} else {
 		GdkEventKey* _tmp5_ = NULL;
 		guint _tmp6_ = 0U;
@@ -8892,13 +8915,13 @@ static gboolean editing_tools_crop_tool_real_on_keypress (EditingToolsEditingToo
 		_tmp7_ = gdk_keyval_name (_tmp6_);
 #line 1207 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp1_ = g_strcmp0 (_tmp7_, "Enter") == 0;
-#line 8896 "EditingTools.c"
+#line 8919 "EditingTools.c"
 	}
 #line 1206 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp1_) {
 #line 1206 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp0_ = TRUE;
-#line 8902 "EditingTools.c"
+#line 8925 "EditingTools.c"
 	} else {
 		GdkEventKey* _tmp8_ = NULL;
 		guint _tmp9_ = 0U;
@@ -8911,7 +8934,7 @@ static gboolean editing_tools_crop_tool_real_on_keypress (EditingToolsEditingToo
 		_tmp10_ = gdk_keyval_name (_tmp9_);
 #line 1208 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp0_ = g_strcmp0 (_tmp10_, "Return") == 0;
-#line 8915 "EditingTools.c"
+#line 8938 "EditingTools.c"
 	}
 #line 1206 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp0_) {
@@ -8921,7 +8944,7 @@ static gboolean editing_tools_crop_tool_real_on_keypress (EditingToolsEditingToo
 		result = TRUE;
 #line 1210 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return result;
-#line 8925 "EditingTools.c"
+#line 8948 "EditingTools.c"
 	}
 #line 1213 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp11_ = event;
@@ -8931,7 +8954,7 @@ static gboolean editing_tools_crop_tool_real_on_keypress (EditingToolsEditingToo
 	result = _tmp12_;
 #line 1213 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 8935 "EditingTools.c"
+#line 8958 "EditingTools.c"
 }
 
 
@@ -8956,7 +8979,7 @@ static void editing_tools_crop_tool_on_pivot_button_clicked (EditingToolsCropToo
 	_editing_tools_crop_tool_constraint_description_unref0 (_tmp1_);
 #line 1217 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp3_) {
-#line 8960 "EditingTools.c"
+#line 8983 "EditingTools.c"
 		gchar* width_text = NULL;
 		EditingToolsCropToolCropToolWindow* _tmp4_ = NULL;
 		GtkEntry* _tmp5_ = NULL;
@@ -9029,7 +9052,7 @@ static void editing_tools_crop_tool_on_pivot_button_clicked (EditingToolsCropToo
 		_g_free0 (height_text);
 #line 1217 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_free0 (width_text);
-#line 9033 "EditingTools.c"
+#line 9056 "EditingTools.c"
 	}
 #line 1227 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp21_ = self->priv->reticle_orientation;
@@ -9039,7 +9062,7 @@ static void editing_tools_crop_tool_on_pivot_button_clicked (EditingToolsCropToo
 	self->priv->reticle_orientation = _tmp22_;
 #line 1228 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_crop_tool_constraint_changed (self);
-#line 9043 "EditingTools.c"
+#line 9066 "EditingTools.c"
 }
 
 
@@ -9054,19 +9077,19 @@ static void editing_tools_crop_tool_real_deactivate (EditingToolsEditingTool* ba
 	_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
 #line 1232 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp0_ != NULL) {
-#line 9058 "EditingTools.c"
+#line 9081 "EditingTools.c"
 		EditingToolsPhotoCanvas* _tmp1_ = NULL;
 #line 1233 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp1_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
 #line 1233 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_crop_tool_unbind_canvas_handlers (self, _tmp1_);
-#line 9064 "EditingTools.c"
+#line 9087 "EditingTools.c"
 	}
 #line 1235 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = self->priv->crop_tool_window;
 #line 1235 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp2_ != NULL) {
-#line 9070 "EditingTools.c"
+#line 9093 "EditingTools.c"
 		EditingToolsCropToolCropToolWindow* _tmp3_ = NULL;
 		EditingToolsCropToolCropToolWindow* _tmp4_ = NULL;
 #line 1236 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -9083,13 +9106,13 @@ static void editing_tools_crop_tool_real_deactivate (EditingToolsEditingTool* ba
 		_g_object_unref0 (self->priv->crop_tool_window);
 #line 1239 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		self->priv->crop_tool_window = NULL;
-#line 9087 "EditingTools.c"
+#line 9110 "EditingTools.c"
 	}
 #line 1243 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
 #line 1243 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp5_ != NULL) {
-#line 9093 "EditingTools.c"
+#line 9116 "EditingTools.c"
 		EditingToolsPhotoCanvas* _tmp6_ = NULL;
 		GdkWindow* _tmp7_ = NULL;
 		GdkWindow* _tmp8_ = NULL;
@@ -9111,7 +9134,7 @@ static void editing_tools_crop_tool_real_deactivate (EditingToolsEditingTool* ba
 		_g_object_unref0 (_tmp10_);
 #line 1244 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_object_unref0 (_tmp8_);
-#line 9115 "EditingTools.c"
+#line 9138 "EditingTools.c"
 	}
 #line 1246 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_cairo_surface_destroy0 (self->priv->crop_surface);
@@ -9119,7 +9142,7 @@ static void editing_tools_crop_tool_real_deactivate (EditingToolsEditingTool* ba
 	self->priv->crop_surface = NULL;
 #line 1248 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	EDITING_TOOLS_EDITING_TOOL_CLASS (editing_tools_crop_tool_parent_class)->deactivate (G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool));
-#line 9123 "EditingTools.c"
+#line 9146 "EditingTools.c"
 }
 
 
@@ -9138,7 +9161,7 @@ static EditingToolsEditingToolWindow* editing_tools_crop_tool_real_get_tool_wind
 	result = _tmp1_;
 #line 1252 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 9142 "EditingTools.c"
+#line 9165 "EditingTools.c"
 }
 
 
@@ -9180,7 +9203,7 @@ static GdkPixbuf* editing_tools_crop_tool_real_get_display_pixbuf (EditingToolsE
 		g_propagate_error (error, _inner_error_);
 #line 1259 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return NULL;
-#line 9184 "EditingTools.c"
+#line 9207 "EditingTools.c"
 	}
 #line 1259 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = _tmp2_;
@@ -9194,11 +9217,11 @@ static GdkPixbuf* editing_tools_crop_tool_real_get_display_pixbuf (EditingToolsE
 	if (max_dim) {
 #line 1259 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*max_dim = _vala_max_dim;
-#line 9198 "EditingTools.c"
+#line 9221 "EditingTools.c"
 	}
 #line 1259 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 9202 "EditingTools.c"
+#line 9225 "EditingTools.c"
 }
 
 
@@ -9296,7 +9319,7 @@ static void editing_tools_crop_tool_prepare_ctx (EditingToolsCropTool* self, cai
 	_tmp18_ = self->priv->text_ctx;
 #line 1276 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_select_font_face (_tmp18_, "Sans", CAIRO_FONT_SLANT_NORMAL, CAIRO_FONT_WEIGHT_NORMAL);
-#line 9300 "EditingTools.c"
+#line 9323 "EditingTools.c"
 }
 
 
@@ -9380,7 +9403,7 @@ static void editing_tools_crop_tool_on_resized_pixbuf (EditingToolsCropTool* sel
 		_cairo_surface_destroy0 (self->priv->crop_surface);
 #line 1289 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		self->priv->crop_surface = NULL;
-#line 9384 "EditingTools.c"
+#line 9407 "EditingTools.c"
 	}
 #line 1291 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp14_ = scaled;
@@ -9412,7 +9435,7 @@ static void editing_tools_crop_tool_on_resized_pixbuf (EditingToolsCropTool* sel
 	cairo_paint (ctx);
 #line 1279 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_cairo_destroy0 (ctx);
-#line 9416 "EditingTools.c"
+#line 9439 "EditingTools.c"
 }
 
 
@@ -9495,7 +9518,7 @@ static void editing_tools_crop_tool_real_on_left_click (EditingToolsEditingTool*
 	_tmp18_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
 #line 1310 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_photo_canvas_repaint (_tmp18_);
-#line 9499 "EditingTools.c"
+#line 9522 "EditingTools.c"
 }
 
 
@@ -9513,7 +9536,7 @@ static void editing_tools_crop_tool_real_on_left_released (EditingToolsEditingTo
 	if (_tmp0_ == BOX_LOCATION_OUTSIDE) {
 #line 1316 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return;
-#line 9517 "EditingTools.c"
+#line 9540 "EditingTools.c"
 	}
 #line 1319 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->in_manipulation = BOX_LOCATION_OUTSIDE;
@@ -9531,7 +9554,7 @@ static void editing_tools_crop_tool_real_on_left_released (EditingToolsEditingTo
 	_tmp3_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
 #line 1326 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_photo_canvas_repaint (_tmp3_);
-#line 9535 "EditingTools.c"
+#line 9558 "EditingTools.c"
 }
 
 
@@ -9547,7 +9570,7 @@ static void editing_tools_crop_tool_real_on_motion (EditingToolsEditingTool* bas
 	_tmp0_ = self->priv->in_manipulation;
 #line 1332 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp0_ != BOX_LOCATION_OUTSIDE) {
-#line 9551 "EditingTools.c"
+#line 9574 "EditingTools.c"
 		gint _tmp1_ = 0;
 		gint _tmp2_ = 0;
 #line 1333 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -9556,7 +9579,7 @@ static void editing_tools_crop_tool_real_on_motion (EditingToolsEditingTool* bas
 		_tmp2_ = y;
 #line 1333 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_crop_tool_on_canvas_manipulation (self, _tmp1_, _tmp2_);
-#line 9560 "EditingTools.c"
+#line 9583 "EditingTools.c"
 	}
 #line 1335 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = x;
@@ -9568,7 +9591,7 @@ static void editing_tools_crop_tool_real_on_motion (EditingToolsEditingTool* bas
 	_tmp5_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
 #line 1336 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_photo_canvas_repaint (_tmp5_);
-#line 9572 "EditingTools.c"
+#line 9595 "EditingTools.c"
 }
 
 
@@ -9692,7 +9715,7 @@ static void editing_tools_crop_tool_real_paint (EditingToolsEditingTool* base, c
 	editing_tools_crop_tool_paint_crop_tool (self, &_tmp24_);
 #line 1339 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_cairo_destroy0 (ctx);
-#line 9696 "EditingTools.c"
+#line 9719 "EditingTools.c"
 }
 
 
@@ -9843,7 +9866,7 @@ static void editing_tools_crop_tool_on_crop_ok (EditingToolsCropTool* self) {
 	_g_object_unref0 (_tmp33_);
 #line 1365 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (cropped);
-#line 9847 "EditingTools.c"
+#line 9870 "EditingTools.c"
 }
 
 
@@ -9895,99 +9918,99 @@ static void editing_tools_crop_tool_update_cursor (EditingToolsCropTool* self, g
 	switch (_tmp9_) {
 #line 1395 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		case BOX_LOCATION_LEFT_SIDE:
-#line 9899 "EditingTools.c"
+#line 9922 "EditingTools.c"
 		{
 #line 1397 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			cursor_type = GDK_LEFT_SIDE;
 #line 1398 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			break;
-#line 9905 "EditingTools.c"
+#line 9928 "EditingTools.c"
 		}
 #line 1395 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		case BOX_LOCATION_TOP_SIDE:
-#line 9909 "EditingTools.c"
+#line 9932 "EditingTools.c"
 		{
 #line 1401 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			cursor_type = GDK_TOP_SIDE;
 #line 1402 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			break;
-#line 9915 "EditingTools.c"
+#line 9938 "EditingTools.c"
 		}
 #line 1395 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		case BOX_LOCATION_RIGHT_SIDE:
-#line 9919 "EditingTools.c"
+#line 9942 "EditingTools.c"
 		{
 #line 1405 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			cursor_type = GDK_RIGHT_SIDE;
 #line 1406 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			break;
-#line 9925 "EditingTools.c"
+#line 9948 "EditingTools.c"
 		}
 #line 1395 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		case BOX_LOCATION_BOTTOM_SIDE:
-#line 9929 "EditingTools.c"
+#line 9952 "EditingTools.c"
 		{
 #line 1409 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			cursor_type = GDK_BOTTOM_SIDE;
 #line 1410 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			break;
-#line 9935 "EditingTools.c"
+#line 9958 "EditingTools.c"
 		}
 #line 1395 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		case BOX_LOCATION_TOP_LEFT:
-#line 9939 "EditingTools.c"
+#line 9962 "EditingTools.c"
 		{
 #line 1413 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			cursor_type = GDK_TOP_LEFT_CORNER;
 #line 1414 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			break;
-#line 9945 "EditingTools.c"
+#line 9968 "EditingTools.c"
 		}
 #line 1395 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		case BOX_LOCATION_BOTTOM_LEFT:
-#line 9949 "EditingTools.c"
+#line 9972 "EditingTools.c"
 		{
 #line 1417 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			cursor_type = GDK_BOTTOM_LEFT_CORNER;
 #line 1418 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			break;
-#line 9955 "EditingTools.c"
+#line 9978 "EditingTools.c"
 		}
 #line 1395 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		case BOX_LOCATION_TOP_RIGHT:
-#line 9959 "EditingTools.c"
+#line 9982 "EditingTools.c"
 		{
 #line 1421 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			cursor_type = GDK_TOP_RIGHT_CORNER;
 #line 1422 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			break;
-#line 9965 "EditingTools.c"
+#line 9988 "EditingTools.c"
 		}
 #line 1395 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		case BOX_LOCATION_BOTTOM_RIGHT:
-#line 9969 "EditingTools.c"
+#line 9992 "EditingTools.c"
 		{
 #line 1425 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			cursor_type = GDK_BOTTOM_RIGHT_CORNER;
 #line 1426 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			break;
-#line 9975 "EditingTools.c"
+#line 9998 "EditingTools.c"
 		}
 #line 1395 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		case BOX_LOCATION_INSIDE:
-#line 9979 "EditingTools.c"
+#line 10002 "EditingTools.c"
 		{
 #line 1429 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			cursor_type = GDK_FLEUR;
 #line 1430 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			break;
-#line 9985 "EditingTools.c"
+#line 10008 "EditingTools.c"
 		}
 		default:
 		{
 #line 1434 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			break;
-#line 9991 "EditingTools.c"
+#line 10014 "EditingTools.c"
 		}
 	}
 #line 1437 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -9996,7 +10019,7 @@ static void editing_tools_crop_tool_update_cursor (EditingToolsCropTool* self, g
 	_tmp11_ = self->priv->current_cursor_type;
 #line 1437 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp10_ != _tmp11_) {
-#line 10000 "EditingTools.c"
+#line 10023 "EditingTools.c"
 		GdkCursor* cursor = NULL;
 		GdkCursorType _tmp12_ = 0;
 		GdkCursor* _tmp13_ = NULL;
@@ -10029,7 +10052,7 @@ static void editing_tools_crop_tool_update_cursor (EditingToolsCropTool* self, g
 		self->priv->current_cursor_type = _tmp18_;
 #line 1437 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_object_unref0 (cursor);
-#line 10033 "EditingTools.c"
+#line 10056 "EditingTools.c"
 	}
 }
 
@@ -10069,7 +10092,7 @@ static gint editing_tools_crop_tool_eval_radial_line (EditingToolsCropTool* self
 	result = (gint) ((decision_slope * _tmp6_) + decision_intercept);
 #line 1449 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 10073 "EditingTools.c"
+#line 10096 "EditingTools.c"
 }
 
 
@@ -10186,7 +10209,7 @@ static void editing_tools_crop_tool_get_photo_dimensions (EditingToolsCropTool*
 	*result = _tmp28_;
 #line 1463 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return;
-#line 10190 "EditingTools.c"
+#line 10213 "EditingTools.c"
 }
 
 
@@ -10195,47 +10218,47 @@ static gboolean _box_equal (const Box* s1, const Box* s2) {
 	if (s1 == s2) {
 #line 1725 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return TRUE;
-#line 10199 "EditingTools.c"
+#line 10222 "EditingTools.c"
 	}
 #line 1725 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (s1 == NULL) {
 #line 1725 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return FALSE;
-#line 10205 "EditingTools.c"
+#line 10228 "EditingTools.c"
 	}
 #line 1725 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (s2 == NULL) {
 #line 1725 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return FALSE;
-#line 10211 "EditingTools.c"
+#line 10234 "EditingTools.c"
 	}
 #line 1725 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (s1->left != s2->left) {
 #line 1725 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return FALSE;
-#line 10217 "EditingTools.c"
+#line 10240 "EditingTools.c"
 	}
 #line 1725 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (s1->top != s2->top) {
 #line 1725 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return FALSE;
-#line 10223 "EditingTools.c"
+#line 10246 "EditingTools.c"
 	}
 #line 1725 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (s1->right != s2->right) {
 #line 1725 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return FALSE;
-#line 10229 "EditingTools.c"
+#line 10252 "EditingTools.c"
 	}
 #line 1725 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (s1->bottom != s2->bottom) {
 #line 1725 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return FALSE;
-#line 10235 "EditingTools.c"
+#line 10258 "EditingTools.c"
 	}
 #line 1725 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return TRUE;
-#line 10239 "EditingTools.c"
+#line 10262 "EditingTools.c"
 }
 
 
@@ -10311,7 +10334,7 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
 	if (_tmp5_ < 0) {
 #line 1474 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		x = 0;
-#line 10315 "EditingTools.c"
+#line 10338 "EditingTools.c"
 	} else {
 		gint _tmp6_ = 0;
 		GdkRectangle _tmp7_ = {0};
@@ -10324,7 +10347,7 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
 		_tmp8_ = _tmp7_.width;
 #line 1475 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		if (_tmp6_ >= _tmp8_) {
-#line 10328 "EditingTools.c"
+#line 10351 "EditingTools.c"
 			GdkRectangle _tmp9_ = {0};
 			gint _tmp10_ = 0;
 #line 1476 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -10333,7 +10356,7 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
 			_tmp10_ = _tmp9_.width;
 #line 1476 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			x = _tmp10_ - 1;
-#line 10337 "EditingTools.c"
+#line 10360 "EditingTools.c"
 		}
 	}
 #line 1478 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -10350,7 +10373,7 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
 	if (_tmp14_ < 0) {
 #line 1480 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		y = 0;
-#line 10354 "EditingTools.c"
+#line 10377 "EditingTools.c"
 	} else {
 		gint _tmp15_ = 0;
 		GdkRectangle _tmp16_ = {0};
@@ -10363,7 +10386,7 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
 		_tmp17_ = _tmp16_.height;
 #line 1481 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		if (_tmp15_ >= _tmp17_) {
-#line 10367 "EditingTools.c"
+#line 10390 "EditingTools.c"
 			GdkRectangle _tmp18_ = {0};
 			gint _tmp19_ = 0;
 #line 1482 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -10372,7 +10395,7 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
 			_tmp19_ = _tmp18_.height;
 #line 1482 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			y = _tmp19_ - 1;
-#line 10376 "EditingTools.c"
+#line 10399 "EditingTools.c"
 		}
 	}
 #line 1486 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -10417,7 +10440,7 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
 	switch (_tmp32_) {
 #line 1495 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		case BOX_LOCATION_LEFT_SIDE:
-#line 10421 "EditingTools.c"
+#line 10444 "EditingTools.c"
 		{
 			gint _tmp33_ = 0;
 			gfloat _tmp34_ = 0.0F;
@@ -10429,7 +10452,7 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
 			_tmp34_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self);
 #line 1498 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			if (_tmp34_ != EDITING_TOOLS_CROP_TOOL_ANY_ASPECT_RATIO) {
-#line 10433 "EditingTools.c"
+#line 10456 "EditingTools.c"
 				gfloat new_height = 0.0F;
 				gint _tmp35_ = 0;
 				gint _tmp36_ = 0;
@@ -10450,15 +10473,15 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
 				_tmp39_ = new_height;
 #line 1500 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				bottom = _tmp38_ + ((gint) _tmp39_);
-#line 10454 "EditingTools.c"
+#line 10477 "EditingTools.c"
 			}
 #line 1502 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			break;
-#line 10458 "EditingTools.c"
+#line 10481 "EditingTools.c"
 		}
 #line 1495 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		case BOX_LOCATION_TOP_SIDE:
-#line 10462 "EditingTools.c"
+#line 10485 "EditingTools.c"
 		{
 			gint _tmp40_ = 0;
 			gfloat _tmp41_ = 0.0F;
@@ -10470,7 +10493,7 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
 			_tmp41_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self);
 #line 1506 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			if (_tmp41_ != EDITING_TOOLS_CROP_TOOL_ANY_ASPECT_RATIO) {
-#line 10474 "EditingTools.c"
+#line 10497 "EditingTools.c"
 				gfloat new_width = 0.0F;
 				gint _tmp42_ = 0;
 				gint _tmp43_ = 0;
@@ -10491,15 +10514,15 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
 				_tmp46_ = new_width;
 #line 1508 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				right = _tmp45_ + ((gint) _tmp46_);
-#line 10495 "EditingTools.c"
+#line 10518 "EditingTools.c"
 			}
 #line 1510 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			break;
-#line 10499 "EditingTools.c"
+#line 10522 "EditingTools.c"
 		}
 #line 1495 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		case BOX_LOCATION_RIGHT_SIDE:
-#line 10503 "EditingTools.c"
+#line 10526 "EditingTools.c"
 		{
 			gint _tmp47_ = 0;
 			gfloat _tmp48_ = 0.0F;
@@ -10511,7 +10534,7 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
 			_tmp48_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self);
 #line 1514 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			if (_tmp48_ != EDITING_TOOLS_CROP_TOOL_ANY_ASPECT_RATIO) {
-#line 10515 "EditingTools.c"
+#line 10538 "EditingTools.c"
 				gfloat new_height = 0.0F;
 				gint _tmp49_ = 0;
 				gint _tmp50_ = 0;
@@ -10532,15 +10555,15 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
 				_tmp53_ = new_height;
 #line 1516 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				bottom = _tmp52_ + ((gint) _tmp53_);
-#line 10536 "EditingTools.c"
+#line 10559 "EditingTools.c"
 			}
 #line 1518 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			break;
-#line 10540 "EditingTools.c"
+#line 10563 "EditingTools.c"
 		}
 #line 1495 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		case BOX_LOCATION_BOTTOM_SIDE:
-#line 10544 "EditingTools.c"
+#line 10567 "EditingTools.c"
 		{
 			gint _tmp54_ = 0;
 			gfloat _tmp55_ = 0.0F;
@@ -10552,7 +10575,7 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
 			_tmp55_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self);
 #line 1522 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			if (_tmp55_ != EDITING_TOOLS_CROP_TOOL_ANY_ASPECT_RATIO) {
-#line 10556 "EditingTools.c"
+#line 10579 "EditingTools.c"
 				gfloat new_width = 0.0F;
 				gint _tmp56_ = 0;
 				gint _tmp57_ = 0;
@@ -10573,22 +10596,22 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
 				_tmp60_ = new_width;
 #line 1524 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				right = _tmp59_ + ((gint) _tmp60_);
-#line 10577 "EditingTools.c"
+#line 10600 "EditingTools.c"
 			}
 #line 1526 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			break;
-#line 10581 "EditingTools.c"
+#line 10604 "EditingTools.c"
 		}
 #line 1495 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		case BOX_LOCATION_TOP_LEFT:
-#line 10585 "EditingTools.c"
+#line 10608 "EditingTools.c"
 		{
 			gfloat _tmp61_ = 0.0F;
 #line 1529 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp61_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self);
 #line 1529 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			if (_tmp61_ == EDITING_TOOLS_CROP_TOOL_ANY_ASPECT_RATIO) {
-#line 10592 "EditingTools.c"
+#line 10615 "EditingTools.c"
 				gint _tmp62_ = 0;
 				gint _tmp63_ = 0;
 #line 1530 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -10599,7 +10622,7 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
 				_tmp63_ = x;
 #line 1531 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				left = _tmp63_;
-#line 10603 "EditingTools.c"
+#line 10626 "EditingTools.c"
 			} else {
 				gint _tmp64_ = 0;
 				gint _tmp65_ = 0;
@@ -10624,7 +10647,7 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
 				_tmp70_ = editing_tools_crop_tool_eval_radial_line (self, (gdouble) _tmp65_, (gdouble) _tmp66_, (gdouble) _tmp67_, (gdouble) _tmp68_, (gdouble) _tmp69_);
 #line 1533 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				if (_tmp64_ < _tmp70_) {
-#line 10628 "EditingTools.c"
+#line 10651 "EditingTools.c"
 					gint _tmp71_ = 0;
 					gfloat new_width = 0.0F;
 					gint _tmp72_ = 0;
@@ -10650,7 +10673,7 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
 					_tmp76_ = new_width;
 #line 1536 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					left = _tmp75_ - ((gint) _tmp76_);
-#line 10654 "EditingTools.c"
+#line 10677 "EditingTools.c"
 				} else {
 					gint _tmp77_ = 0;
 					gfloat new_height = 0.0F;
@@ -10677,23 +10700,23 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
 					_tmp82_ = new_height;
 #line 1540 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					top = _tmp81_ - ((gint) _tmp82_);
-#line 10681 "EditingTools.c"
+#line 10704 "EditingTools.c"
 				}
 			}
 #line 1543 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			break;
-#line 10686 "EditingTools.c"
+#line 10709 "EditingTools.c"
 		}
 #line 1495 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		case BOX_LOCATION_BOTTOM_LEFT:
-#line 10690 "EditingTools.c"
+#line 10713 "EditingTools.c"
 		{
 			gfloat _tmp83_ = 0.0F;
 #line 1546 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp83_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self);
 #line 1546 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			if (_tmp83_ == EDITING_TOOLS_CROP_TOOL_ANY_ASPECT_RATIO) {
-#line 10697 "EditingTools.c"
+#line 10720 "EditingTools.c"
 				gint _tmp84_ = 0;
 				gint _tmp85_ = 0;
 #line 1547 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -10704,7 +10727,7 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
 				_tmp85_ = x;
 #line 1548 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				left = _tmp85_;
-#line 10708 "EditingTools.c"
+#line 10731 "EditingTools.c"
 			} else {
 				gint _tmp86_ = 0;
 				gint _tmp87_ = 0;
@@ -10729,7 +10752,7 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
 				_tmp92_ = editing_tools_crop_tool_eval_radial_line (self, (gdouble) _tmp87_, (gdouble) _tmp88_, (gdouble) _tmp89_, (gdouble) _tmp90_, (gdouble) _tmp91_);
 #line 1550 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				if (_tmp86_ < _tmp92_) {
-#line 10733 "EditingTools.c"
+#line 10756 "EditingTools.c"
 					gint _tmp93_ = 0;
 					gfloat new_height = 0.0F;
 					gint _tmp94_ = 0;
@@ -10755,7 +10778,7 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
 					_tmp98_ = new_height;
 #line 1553 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					bottom = _tmp97_ + ((gint) _tmp98_);
-#line 10759 "EditingTools.c"
+#line 10782 "EditingTools.c"
 				} else {
 					gint _tmp99_ = 0;
 					gfloat new_width = 0.0F;
@@ -10782,23 +10805,23 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
 					_tmp104_ = new_width;
 #line 1557 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					left = _tmp103_ - ((gint) _tmp104_);
-#line 10786 "EditingTools.c"
+#line 10809 "EditingTools.c"
 				}
 			}
 #line 1560 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			break;
-#line 10791 "EditingTools.c"
+#line 10814 "EditingTools.c"
 		}
 #line 1495 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		case BOX_LOCATION_TOP_RIGHT:
-#line 10795 "EditingTools.c"
+#line 10818 "EditingTools.c"
 		{
 			gfloat _tmp105_ = 0.0F;
 #line 1563 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp105_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self);
 #line 1563 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			if (_tmp105_ == EDITING_TOOLS_CROP_TOOL_ANY_ASPECT_RATIO) {
-#line 10802 "EditingTools.c"
+#line 10825 "EditingTools.c"
 				gint _tmp106_ = 0;
 				gint _tmp107_ = 0;
 #line 1564 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -10809,7 +10832,7 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
 				_tmp107_ = x;
 #line 1565 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				right = _tmp107_;
-#line 10813 "EditingTools.c"
+#line 10836 "EditingTools.c"
 			} else {
 				gint _tmp108_ = 0;
 				gint _tmp109_ = 0;
@@ -10834,7 +10857,7 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
 				_tmp114_ = editing_tools_crop_tool_eval_radial_line (self, (gdouble) _tmp109_, (gdouble) _tmp110_, (gdouble) _tmp111_, (gdouble) _tmp112_, (gdouble) _tmp113_);
 #line 1567 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				if (_tmp108_ < _tmp114_) {
-#line 10838 "EditingTools.c"
+#line 10861 "EditingTools.c"
 					gint _tmp115_ = 0;
 					gfloat new_width = 0.0F;
 					gint _tmp116_ = 0;
@@ -10860,7 +10883,7 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
 					_tmp120_ = new_width;
 #line 1570 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					right = _tmp119_ + ((gint) _tmp120_);
-#line 10864 "EditingTools.c"
+#line 10887 "EditingTools.c"
 				} else {
 					gint _tmp121_ = 0;
 					gfloat new_height = 0.0F;
@@ -10887,23 +10910,23 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
 					_tmp126_ = new_height;
 #line 1574 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					top = _tmp125_ - ((gint) _tmp126_);
-#line 10891 "EditingTools.c"
+#line 10914 "EditingTools.c"
 				}
 			}
 #line 1577 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			break;
-#line 10896 "EditingTools.c"
+#line 10919 "EditingTools.c"
 		}
 #line 1495 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		case BOX_LOCATION_BOTTOM_RIGHT:
-#line 10900 "EditingTools.c"
+#line 10923 "EditingTools.c"
 		{
 			gfloat _tmp127_ = 0.0F;
 #line 1580 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp127_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self);
 #line 1580 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			if (_tmp127_ == EDITING_TOOLS_CROP_TOOL_ANY_ASPECT_RATIO) {
-#line 10907 "EditingTools.c"
+#line 10930 "EditingTools.c"
 				gint _tmp128_ = 0;
 				gint _tmp129_ = 0;
 #line 1581 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -10914,7 +10937,7 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
 				_tmp129_ = x;
 #line 1582 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				right = _tmp129_;
-#line 10918 "EditingTools.c"
+#line 10941 "EditingTools.c"
 			} else {
 				gint _tmp130_ = 0;
 				gint _tmp131_ = 0;
@@ -10939,7 +10962,7 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
 				_tmp136_ = editing_tools_crop_tool_eval_radial_line (self, (gdouble) _tmp131_, (gdouble) _tmp132_, (gdouble) _tmp133_, (gdouble) _tmp134_, (gdouble) _tmp135_);
 #line 1584 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				if (_tmp130_ < _tmp136_) {
-#line 10943 "EditingTools.c"
+#line 10966 "EditingTools.c"
 					gint _tmp137_ = 0;
 					gfloat new_height = 0.0F;
 					gint _tmp138_ = 0;
@@ -10965,7 +10988,7 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
 					_tmp142_ = new_height;
 #line 1587 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					bottom = _tmp141_ + ((gint) _tmp142_);
-#line 10969 "EditingTools.c"
+#line 10992 "EditingTools.c"
 				} else {
 					gint _tmp143_ = 0;
 					gfloat new_width = 0.0F;
@@ -10992,16 +11015,16 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
 					_tmp148_ = new_width;
 #line 1591 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					right = _tmp147_ + ((gint) _tmp148_);
-#line 10996 "EditingTools.c"
+#line 11019 "EditingTools.c"
 				}
 			}
 #line 1594 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			break;
-#line 11001 "EditingTools.c"
+#line 11024 "EditingTools.c"
 		}
 #line 1495 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		case BOX_LOCATION_INSIDE:
-#line 11005 "EditingTools.c"
+#line 11028 "EditingTools.c"
 		{
 			gint _tmp149_ = 0;
 			gint _tmp150_ = 0;
@@ -11115,7 +11138,7 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
 			if (_tmp169_ < 0) {
 #line 1616 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				left = 0;
-#line 11119 "EditingTools.c"
+#line 11142 "EditingTools.c"
 			}
 #line 1618 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp170_ = top;
@@ -11123,7 +11146,7 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
 			if (_tmp170_ < 0) {
 #line 1619 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				top = 0;
-#line 11127 "EditingTools.c"
+#line 11150 "EditingTools.c"
 			}
 #line 1621 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp171_ = right;
@@ -11133,7 +11156,7 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
 			_tmp173_ = _tmp172_.width;
 #line 1621 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			if (_tmp171_ >= _tmp173_) {
-#line 11137 "EditingTools.c"
+#line 11160 "EditingTools.c"
 				GdkRectangle _tmp174_ = {0};
 				gint _tmp175_ = 0;
 #line 1622 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -11142,7 +11165,7 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
 				_tmp175_ = _tmp174_.width;
 #line 1622 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				right = _tmp175_ - 1;
-#line 11146 "EditingTools.c"
+#line 11169 "EditingTools.c"
 			}
 #line 1624 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp176_ = bottom;
@@ -11152,7 +11175,7 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
 			_tmp178_ = _tmp177_.height;
 #line 1624 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			if (_tmp176_ >= _tmp178_) {
-#line 11156 "EditingTools.c"
+#line 11179 "EditingTools.c"
 				GdkRectangle _tmp179_ = {0};
 				gint _tmp180_ = 0;
 #line 1625 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -11161,7 +11184,7 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
 				_tmp180_ = _tmp179_.height;
 #line 1625 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				bottom = _tmp180_ - 1;
-#line 11165 "EditingTools.c"
+#line 11188 "EditingTools.c"
 			}
 #line 1627 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp181_ = right;
@@ -11181,13 +11204,13 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
 			_tmp186_ = width;
 #line 1631 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			if (_tmp185_ != _tmp186_) {
-#line 11185 "EditingTools.c"
+#line 11208 "EditingTools.c"
 				gint _tmp187_ = 0;
 #line 1632 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp187_ = delta_x;
 #line 1632 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				if (_tmp187_ < 0) {
-#line 11191 "EditingTools.c"
+#line 11214 "EditingTools.c"
 					gint _tmp188_ = 0;
 					gint _tmp189_ = 0;
 #line 1633 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -11196,7 +11219,7 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
 					_tmp189_ = width;
 #line 1633 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					right = (_tmp188_ + _tmp189_) - 1;
-#line 11200 "EditingTools.c"
+#line 11223 "EditingTools.c"
 				} else {
 					gint _tmp190_ = 0;
 					gint _tmp191_ = 0;
@@ -11206,7 +11229,7 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
 					_tmp191_ = width;
 #line 1635 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					left = (_tmp190_ - _tmp191_) + 1;
-#line 11210 "EditingTools.c"
+#line 11233 "EditingTools.c"
 				}
 			}
 #line 1638 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -11215,13 +11238,13 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
 			_tmp193_ = height;
 #line 1638 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			if (_tmp192_ != _tmp193_) {
-#line 11219 "EditingTools.c"
+#line 11242 "EditingTools.c"
 				gint _tmp194_ = 0;
 #line 1639 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp194_ = delta_y;
 #line 1639 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				if (_tmp194_ < 0) {
-#line 11225 "EditingTools.c"
+#line 11248 "EditingTools.c"
 					gint _tmp195_ = 0;
 					gint _tmp196_ = 0;
 #line 1640 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -11230,7 +11253,7 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
 					_tmp196_ = height;
 #line 1640 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					bottom = (_tmp195_ + _tmp196_) - 1;
-#line 11234 "EditingTools.c"
+#line 11257 "EditingTools.c"
 				} else {
 					gint _tmp197_ = 0;
 					gint _tmp198_ = 0;
@@ -11240,12 +11263,12 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
 					_tmp198_ = height;
 #line 1642 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					top = (_tmp197_ - _tmp198_) + 1;
-#line 11244 "EditingTools.c"
+#line 11267 "EditingTools.c"
 				}
 			}
 #line 1644 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			break;
-#line 11249 "EditingTools.c"
+#line 11272 "EditingTools.c"
 		}
 		default:
 		{
@@ -11253,7 +11276,7 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
 			result = FALSE;
 #line 1648 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			return result;
-#line 11257 "EditingTools.c"
+#line 11280 "EditingTools.c"
 		}
 	}
 #line 1658 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -11288,7 +11311,7 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
 	_tmp208_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self);
 #line 1666 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp208_ == EDITING_TOOLS_CROP_TOOL_ANY_ASPECT_RATIO) {
-#line 11292 "EditingTools.c"
+#line 11315 "EditingTools.c"
 		gint _tmp209_ = 0;
 		gint _tmp210_ = 0;
 		gint _tmp211_ = 0;
@@ -11329,24 +11352,24 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
 			case BOX_LOCATION_TOP_LEFT:
 #line 1670 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			case BOX_LOCATION_BOTTOM_LEFT:
-#line 11333 "EditingTools.c"
+#line 11356 "EditingTools.c"
 			{
 				gint _tmp214_ = 0;
 #line 1674 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp214_ = width;
 #line 1674 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				if (_tmp214_ < EDITING_TOOLS_CROP_TOOL_CROP_MIN_SIZE) {
-#line 11340 "EditingTools.c"
+#line 11363 "EditingTools.c"
 					gint _tmp215_ = 0;
 #line 1675 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp215_ = right;
 #line 1675 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					left = _tmp215_ - EDITING_TOOLS_CROP_TOOL_CROP_MIN_SIZE;
-#line 11346 "EditingTools.c"
+#line 11369 "EditingTools.c"
 				}
 #line 1676 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				break;
-#line 11350 "EditingTools.c"
+#line 11373 "EditingTools.c"
 			}
 #line 1670 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			case BOX_LOCATION_RIGHT_SIDE:
@@ -11354,30 +11377,30 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
 			case BOX_LOCATION_TOP_RIGHT:
 #line 1670 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			case BOX_LOCATION_BOTTOM_RIGHT:
-#line 11358 "EditingTools.c"
+#line 11381 "EditingTools.c"
 			{
 				gint _tmp216_ = 0;
 #line 1681 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp216_ = width;
 #line 1681 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				if (_tmp216_ < EDITING_TOOLS_CROP_TOOL_CROP_MIN_SIZE) {
-#line 11365 "EditingTools.c"
+#line 11388 "EditingTools.c"
 					gint _tmp217_ = 0;
 #line 1682 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp217_ = left;
 #line 1682 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					right = _tmp217_ + EDITING_TOOLS_CROP_TOOL_CROP_MIN_SIZE;
-#line 11371 "EditingTools.c"
+#line 11394 "EditingTools.c"
 				}
 #line 1683 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				break;
-#line 11375 "EditingTools.c"
+#line 11398 "EditingTools.c"
 			}
 			default:
 			{
 #line 1686 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				break;
-#line 11381 "EditingTools.c"
+#line 11404 "EditingTools.c"
 			}
 		}
 #line 1689 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -11390,24 +11413,24 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
 			case BOX_LOCATION_TOP_LEFT:
 #line 1689 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			case BOX_LOCATION_TOP_RIGHT:
-#line 11394 "EditingTools.c"
+#line 11417 "EditingTools.c"
 			{
 				gint _tmp219_ = 0;
 #line 1693 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp219_ = height;
 #line 1693 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				if (_tmp219_ < EDITING_TOOLS_CROP_TOOL_CROP_MIN_SIZE) {
-#line 11401 "EditingTools.c"
+#line 11424 "EditingTools.c"
 					gint _tmp220_ = 0;
 #line 1694 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp220_ = bottom;
 #line 1694 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					top = _tmp220_ - EDITING_TOOLS_CROP_TOOL_CROP_MIN_SIZE;
-#line 11407 "EditingTools.c"
+#line 11430 "EditingTools.c"
 				}
 #line 1695 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				break;
-#line 11411 "EditingTools.c"
+#line 11434 "EditingTools.c"
 			}
 #line 1689 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			case BOX_LOCATION_BOTTOM_SIDE:
@@ -11415,30 +11438,30 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
 			case BOX_LOCATION_BOTTOM_LEFT:
 #line 1689 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			case BOX_LOCATION_BOTTOM_RIGHT:
-#line 11419 "EditingTools.c"
+#line 11442 "EditingTools.c"
 			{
 				gint _tmp221_ = 0;
 #line 1700 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp221_ = height;
 #line 1700 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				if (_tmp221_ < EDITING_TOOLS_CROP_TOOL_CROP_MIN_SIZE) {
-#line 11426 "EditingTools.c"
+#line 11449 "EditingTools.c"
 					gint _tmp222_ = 0;
 #line 1701 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp222_ = top;
 #line 1701 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					bottom = _tmp222_ + EDITING_TOOLS_CROP_TOOL_CROP_MIN_SIZE;
-#line 11432 "EditingTools.c"
+#line 11455 "EditingTools.c"
 				}
 #line 1702 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				break;
-#line 11436 "EditingTools.c"
+#line 11459 "EditingTools.c"
 			}
 			default:
 			{
 #line 1705 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				break;
-#line 11442 "EditingTools.c"
+#line 11465 "EditingTools.c"
 			}
 		}
 #line 1711 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -11467,7 +11490,7 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
 		clamp_inside_rotated_image (&_tmp227_, _tmp229_, _tmp231_, _tmp232_, _tmp233_ == BOX_LOCATION_INSIDE, &_tmp234_);
 #line 1711 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		new_crop = _tmp234_;
-#line 11471 "EditingTools.c"
+#line 11494 "EditingTools.c"
 	} else {
 		gint _tmp235_ = 0;
 		gint _tmp236_ = 0;
@@ -11522,57 +11545,57 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
 		if (_box_equal (&_tmp249_, &_tmp250_) != TRUE) {
 #line 1725 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp248_ = TRUE;
-#line 11526 "EditingTools.c"
+#line 11549 "EditingTools.c"
 		} else {
 			gint _tmp251_ = 0;
 #line 1725 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp251_ = width;
 #line 1725 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp248_ = _tmp251_ < EDITING_TOOLS_CROP_TOOL_CROP_MIN_SIZE;
-#line 11533 "EditingTools.c"
+#line 11556 "EditingTools.c"
 		}
 #line 1725 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		if (_tmp248_) {
 #line 1725 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp247_ = TRUE;
-#line 11539 "EditingTools.c"
+#line 11562 "EditingTools.c"
 		} else {
 			gint _tmp252_ = 0;
 #line 1725 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp252_ = height;
 #line 1725 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp247_ = _tmp252_ < EDITING_TOOLS_CROP_TOOL_CROP_MIN_SIZE;
-#line 11546 "EditingTools.c"
+#line 11569 "EditingTools.c"
 		}
 #line 1725 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		if (_tmp247_) {
-#line 11550 "EditingTools.c"
+#line 11573 "EditingTools.c"
 			Box _tmp253_ = {0};
 #line 1726 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp253_ = self->priv->scaled_crop;
 #line 1726 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			new_crop = _tmp253_;
-#line 11556 "EditingTools.c"
+#line 11579 "EditingTools.c"
 		}
 	}
 #line 1730 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp254_ = self->priv->in_manipulation;
 #line 1730 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp254_ != BOX_LOCATION_INSIDE) {
-#line 11563 "EditingTools.c"
+#line 11586 "EditingTools.c"
 		Box _tmp255_ = {0};
 #line 1731 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp255_ = new_crop;
 #line 1731 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_crop_tool_crop_resized (self, &_tmp255_);
-#line 11569 "EditingTools.c"
+#line 11592 "EditingTools.c"
 	} else {
 		Box _tmp256_ = {0};
 #line 1733 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp256_ = new_crop;
 #line 1733 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_crop_tool_crop_moved (self, &_tmp256_);
-#line 11576 "EditingTools.c"
+#line 11599 "EditingTools.c"
 	}
 #line 1736 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp257_ = new_crop;
@@ -11582,7 +11605,7 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
 	_tmp258_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self);
 #line 1738 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp258_ == EDITING_TOOLS_CROP_TOOL_ANY_ASPECT_RATIO) {
-#line 11586 "EditingTools.c"
+#line 11609 "EditingTools.c"
 		gint _tmp259_ = 0;
 		gint _tmp260_ = 0;
 		gint _tmp261_ = 0;
@@ -11601,13 +11624,13 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
 		_tmp262_ = self->priv->custom_init_height;
 #line 1741 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		self->priv->custom_aspect_ratio = ((gfloat) _tmp261_) / ((gfloat) _tmp262_);
-#line 11605 "EditingTools.c"
+#line 11628 "EditingTools.c"
 	}
 #line 1744 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	result = FALSE;
 #line 1744 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 11611 "EditingTools.c"
+#line 11634 "EditingTools.c"
 }
 
 
@@ -11647,7 +11670,7 @@ static void editing_tools_crop_tool_crop_resized (EditingToolsCropTool* self, Bo
 	if (_tmp1_) {
 #line 1750 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return;
-#line 11651 "EditingTools.c"
+#line 11674 "EditingTools.c"
 	}
 #line 1753 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
@@ -11679,18 +11702,18 @@ static void editing_tools_crop_tool_crop_resized (EditingToolsCropTool* self, Bo
 	if (_tmp12_ == BOX_COMPLEMENTS_HORIZONTAL) {
 #line 1765 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp11_ = TRUE;
-#line 11683 "EditingTools.c"
+#line 11706 "EditingTools.c"
 	} else {
 		BoxComplements _tmp13_ = 0;
 #line 1765 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp13_ = complements;
 #line 1765 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp11_ = _tmp13_ == BOX_COMPLEMENTS_BOTH;
-#line 11690 "EditingTools.c"
+#line 11713 "EditingTools.c"
 	}
 #line 1765 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp11_) {
-#line 11694 "EditingTools.c"
+#line 11717 "EditingTools.c"
 		gdouble _tmp14_ = 0.0;
 		gboolean _tmp15_ = FALSE;
 		Box _tmp16_ = {0};
@@ -11700,17 +11723,17 @@ static void editing_tools_crop_tool_crop_resized (EditingToolsCropTool* self, Bo
 		if (_tmp15_) {
 #line 1766 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp14_ = 0.0;
-#line 11704 "EditingTools.c"
+#line 11727 "EditingTools.c"
 		} else {
 #line 1766 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp14_ = 0.5;
-#line 11708 "EditingTools.c"
+#line 11731 "EditingTools.c"
 		}
 #line 1766 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp16_ = horizontal;
 #line 1766 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_crop_tool_set_area_alpha (self, &_tmp16_, _tmp14_);
-#line 11714 "EditingTools.c"
+#line 11737 "EditingTools.c"
 	}
 #line 1768 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp18_ = complements;
@@ -11718,18 +11741,18 @@ static void editing_tools_crop_tool_crop_resized (EditingToolsCropTool* self, Bo
 	if (_tmp18_ == BOX_COMPLEMENTS_VERTICAL) {
 #line 1768 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp17_ = TRUE;
-#line 11722 "EditingTools.c"
+#line 11745 "EditingTools.c"
 	} else {
 		BoxComplements _tmp19_ = 0;
 #line 1768 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp19_ = complements;
 #line 1768 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp17_ = _tmp19_ == BOX_COMPLEMENTS_BOTH;
-#line 11729 "EditingTools.c"
+#line 11752 "EditingTools.c"
 	}
 #line 1768 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp17_) {
-#line 11733 "EditingTools.c"
+#line 11756 "EditingTools.c"
 		gdouble _tmp20_ = 0.0;
 		gboolean _tmp21_ = FALSE;
 		Box _tmp22_ = {0};
@@ -11739,17 +11762,17 @@ static void editing_tools_crop_tool_crop_resized (EditingToolsCropTool* self, Bo
 		if (_tmp21_) {
 #line 1769 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp20_ = 0.0;
-#line 11743 "EditingTools.c"
+#line 11766 "EditingTools.c"
 		} else {
 #line 1769 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp20_ = 0.5;
-#line 11747 "EditingTools.c"
+#line 11770 "EditingTools.c"
 		}
 #line 1769 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp22_ = vertical;
 #line 1769 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_crop_tool_set_area_alpha (self, &_tmp22_, _tmp20_);
-#line 11753 "EditingTools.c"
+#line 11776 "EditingTools.c"
 	}
 #line 1771 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp23_ = *new_crop;
@@ -11761,7 +11784,7 @@ static void editing_tools_crop_tool_crop_resized (EditingToolsCropTool* self, Bo
 	_tmp25_ = *new_crop;
 #line 1772 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_photo_canvas_invalidate_area (_tmp24_, &_tmp25_);
-#line 11765 "EditingTools.c"
+#line 11788 "EditingTools.c"
 }
 
 
@@ -11787,7 +11810,7 @@ static void editing_tools_crop_tool_crop_moved (EditingToolsCropTool* self, Box*
 	if (_tmp1_) {
 #line 1778 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return;
-#line 11791 "EditingTools.c"
+#line 11814 "EditingTools.c"
 	}
 #line 1781 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
@@ -11813,7 +11836,7 @@ static void editing_tools_crop_tool_crop_moved (EditingToolsCropTool* self, Box*
 	_tmp8_ = *new_crop;
 #line 1789 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_photo_canvas_invalidate_area (_tmp7_, &_tmp8_);
-#line 11817 "EditingTools.c"
+#line 11840 "EditingTools.c"
 }
 
 
@@ -11873,7 +11896,7 @@ static void editing_tools_crop_tool_set_area_alpha (EditingToolsCropTool* self,
 	editing_tools_photo_canvas_paint_surface_area (_tmp9_, _tmp10_, &_tmp11_, TRUE);
 #line 1792 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_cairo_destroy0 (ctx);
-#line 11877 "EditingTools.c"
+#line 11900 "EditingTools.c"
 }
 
 
@@ -11896,7 +11919,7 @@ static void editing_tools_crop_tool_paint_crop_tool (EditingToolsCropTool* self,
 	_tmp0_ = self->priv->in_manipulation;
 #line 1803 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp0_ != BOX_LOCATION_OUTSIDE) {
-#line 11900 "EditingTools.c"
+#line 11923 "EditingTools.c"
 		gint one_third_x = 0;
 		gint _tmp1_ = 0;
 		gint one_third_y = 0;
@@ -12127,7 +12150,7 @@ static void editing_tools_crop_tool_paint_crop_tool (EditingToolsCropTool* self,
 		editing_tools_photo_canvas_draw_text (_tmp60_, _tmp61_, _tmp62_, _tmp63_, _tmp64_, TRUE);
 #line 1803 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_free0 (text);
-#line 12131 "EditingTools.c"
+#line 12154 "EditingTools.c"
 	}
 #line 1825 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp65_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
@@ -12153,7 +12176,7 @@ static void editing_tools_crop_tool_paint_crop_tool (EditingToolsCropTool* self,
 	box_get_reduced (crop, 2, &_tmp73_);
 #line 1827 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_photo_canvas_draw_box (_tmp71_, _tmp72_, &_tmp73_);
-#line 12157 "EditingTools.c"
+#line 12180 "EditingTools.c"
 }
 
 
@@ -12189,7 +12212,7 @@ static EditingToolsCropToolConstraintDescription* editing_tools_crop_tool_constr
 	_tmp4_ = new_aspect_ratio;
 #line 619 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp4_ == EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS) {
-#line 12193 "EditingTools.c"
+#line 12216 "EditingTools.c"
 		gint _tmp5_ = 0;
 		gint _tmp6_ = 0;
 #line 620 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -12198,14 +12221,14 @@ static EditingToolsCropToolConstraintDescription* editing_tools_crop_tool_constr
 		_tmp6_ = self->basis_height;
 #line 620 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		self->aspect_ratio = ((gfloat) _tmp5_) / ((gfloat) _tmp6_);
-#line 12202 "EditingTools.c"
+#line 12225 "EditingTools.c"
 	} else {
 		gfloat _tmp7_ = 0.0F;
 #line 622 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp7_ = new_aspect_ratio;
 #line 622 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		self->aspect_ratio = _tmp7_;
-#line 12209 "EditingTools.c"
+#line 12232 "EditingTools.c"
 	}
 #line 623 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp8_ = new_pivotable;
@@ -12213,14 +12236,14 @@ static EditingToolsCropToolConstraintDescription* editing_tools_crop_tool_constr
 	self->is_pivotable = _tmp8_;
 #line 614 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return self;
-#line 12217 "EditingTools.c"
+#line 12240 "EditingTools.c"
 }
 
 
 static EditingToolsCropToolConstraintDescription* editing_tools_crop_tool_constraint_description_new (const gchar* new_name, gint new_basis_width, gint new_basis_height, gboolean new_pivotable, gfloat new_aspect_ratio) {
 #line 614 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return editing_tools_crop_tool_constraint_description_construct (EDITING_TOOLS_CROP_TOOL_TYPE_CONSTRAINT_DESCRIPTION, new_name, new_basis_width, new_basis_height, new_pivotable, new_aspect_ratio);
-#line 12224 "EditingTools.c"
+#line 12247 "EditingTools.c"
 }
 
 
@@ -12234,30 +12257,30 @@ static gboolean editing_tools_crop_tool_constraint_description_is_separator (Edi
 	_tmp1_ = self->is_pivotable;
 #line 627 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (!_tmp1_) {
-#line 12238 "EditingTools.c"
+#line 12261 "EditingTools.c"
 		gfloat _tmp2_ = 0.0F;
 #line 627 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp2_ = self->aspect_ratio;
 #line 627 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp0_ = _tmp2_ == EDITING_TOOLS_CROP_TOOL_SEPARATOR;
-#line 12244 "EditingTools.c"
+#line 12267 "EditingTools.c"
 	} else {
 #line 627 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp0_ = FALSE;
-#line 12248 "EditingTools.c"
+#line 12271 "EditingTools.c"
 	}
 #line 627 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	result = _tmp0_;
 #line 627 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 12254 "EditingTools.c"
+#line 12277 "EditingTools.c"
 }
 
 
 static void editing_tools_crop_tool_value_constraint_description_init (GValue* value) {
 #line 607 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	value->data[0].v_pointer = NULL;
-#line 12261 "EditingTools.c"
+#line 12284 "EditingTools.c"
 }
 
 
@@ -12266,7 +12289,7 @@ static void editing_tools_crop_tool_value_constraint_description_free_value (GVa
 	if (value->data[0].v_pointer) {
 #line 607 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_crop_tool_constraint_description_unref (value->data[0].v_pointer);
-#line 12270 "EditingTools.c"
+#line 12293 "EditingTools.c"
 	}
 }
 
@@ -12276,11 +12299,11 @@ static void editing_tools_crop_tool_value_constraint_description_copy_value (con
 	if (src_value->data[0].v_pointer) {
 #line 607 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		dest_value->data[0].v_pointer = editing_tools_crop_tool_constraint_description_ref (src_value->data[0].v_pointer);
-#line 12280 "EditingTools.c"
+#line 12303 "EditingTools.c"
 	} else {
 #line 607 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 12284 "EditingTools.c"
+#line 12307 "EditingTools.c"
 	}
 }
 
@@ -12288,37 +12311,37 @@ static void editing_tools_crop_tool_value_constraint_description_copy_value (con
 static gpointer editing_tools_crop_tool_value_constraint_description_peek_pointer (const GValue* value) {
 #line 607 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return value->data[0].v_pointer;
-#line 12292 "EditingTools.c"
+#line 12315 "EditingTools.c"
 }
 
 
 static gchar* editing_tools_crop_tool_value_constraint_description_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 607 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (collect_values[0].v_pointer) {
-#line 12299 "EditingTools.c"
+#line 12322 "EditingTools.c"
 		EditingToolsCropToolConstraintDescription* object;
 		object = collect_values[0].v_pointer;
 #line 607 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 607 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 12306 "EditingTools.c"
+#line 12329 "EditingTools.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 607 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 12310 "EditingTools.c"
+#line 12333 "EditingTools.c"
 		}
 #line 607 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		value->data[0].v_pointer = editing_tools_crop_tool_constraint_description_ref (object);
-#line 12314 "EditingTools.c"
+#line 12337 "EditingTools.c"
 	} else {
 #line 607 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		value->data[0].v_pointer = NULL;
-#line 12318 "EditingTools.c"
+#line 12341 "EditingTools.c"
 	}
 #line 607 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return NULL;
-#line 12322 "EditingTools.c"
+#line 12345 "EditingTools.c"
 }
 
 
@@ -12329,25 +12352,25 @@ static gchar* editing_tools_crop_tool_value_constraint_description_lcopy_value (
 	if (!object_p) {
 #line 607 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 12333 "EditingTools.c"
+#line 12356 "EditingTools.c"
 	}
 #line 607 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (!value->data[0].v_pointer) {
 #line 607 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*object_p = NULL;
-#line 12339 "EditingTools.c"
+#line 12362 "EditingTools.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 607 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*object_p = value->data[0].v_pointer;
-#line 12343 "EditingTools.c"
+#line 12366 "EditingTools.c"
 	} else {
 #line 607 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*object_p = editing_tools_crop_tool_constraint_description_ref (value->data[0].v_pointer);
-#line 12347 "EditingTools.c"
+#line 12370 "EditingTools.c"
 	}
 #line 607 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return NULL;
-#line 12351 "EditingTools.c"
+#line 12374 "EditingTools.c"
 }
 
 
@@ -12361,7 +12384,7 @@ static GParamSpec* editing_tools_crop_tool_param_spec_constraint_description (co
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 607 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return G_PARAM_SPEC (spec);
-#line 12365 "EditingTools.c"
+#line 12388 "EditingTools.c"
 }
 
 
@@ -12370,7 +12393,7 @@ static gpointer editing_tools_crop_tool_value_get_constraint_description (const
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, EDITING_TOOLS_CROP_TOOL_TYPE_CONSTRAINT_DESCRIPTION), NULL);
 #line 607 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return value->data[0].v_pointer;
-#line 12374 "EditingTools.c"
+#line 12397 "EditingTools.c"
 }
 
 
@@ -12390,17 +12413,17 @@ static void editing_tools_crop_tool_value_set_constraint_description (GValue* va
 		value->data[0].v_pointer = v_object;
 #line 607 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_crop_tool_constraint_description_ref (value->data[0].v_pointer);
-#line 12394 "EditingTools.c"
+#line 12417 "EditingTools.c"
 	} else {
 #line 607 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		value->data[0].v_pointer = NULL;
-#line 12398 "EditingTools.c"
+#line 12421 "EditingTools.c"
 	}
 #line 607 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (old) {
 #line 607 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_crop_tool_constraint_description_unref (old);
-#line 12404 "EditingTools.c"
+#line 12427 "EditingTools.c"
 	}
 }
 
@@ -12419,17 +12442,17 @@ static void editing_tools_crop_tool_value_take_constraint_description (GValue* v
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 607 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		value->data[0].v_pointer = v_object;
-#line 12423 "EditingTools.c"
+#line 12446 "EditingTools.c"
 	} else {
 #line 607 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		value->data[0].v_pointer = NULL;
-#line 12427 "EditingTools.c"
+#line 12450 "EditingTools.c"
 	}
 #line 607 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (old) {
 #line 607 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_crop_tool_constraint_description_unref (old);
-#line 12433 "EditingTools.c"
+#line 12456 "EditingTools.c"
 	}
 }
 
@@ -12439,14 +12462,14 @@ static void editing_tools_crop_tool_constraint_description_class_init (EditingTo
 	editing_tools_crop_tool_constraint_description_parent_class = g_type_class_peek_parent (klass);
 #line 607 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	((EditingToolsCropToolConstraintDescriptionClass *) klass)->finalize = editing_tools_crop_tool_constraint_description_finalize;
-#line 12443 "EditingTools.c"
+#line 12466 "EditingTools.c"
 }
 
 
 static void editing_tools_crop_tool_constraint_description_instance_init (EditingToolsCropToolConstraintDescription * self) {
 #line 607 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->ref_count = 1;
-#line 12450 "EditingTools.c"
+#line 12473 "EditingTools.c"
 }
 
 
@@ -12458,7 +12481,7 @@ static void editing_tools_crop_tool_constraint_description_finalize (EditingTool
 	g_signal_handlers_destroy (self);
 #line 608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_free0 (self->name);
-#line 12462 "EditingTools.c"
+#line 12485 "EditingTools.c"
 }
 
 
@@ -12483,7 +12506,7 @@ static gpointer editing_tools_crop_tool_constraint_description_ref (gpointer ins
 	g_atomic_int_inc (&self->ref_count);
 #line 607 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return instance;
-#line 12487 "EditingTools.c"
+#line 12510 "EditingTools.c"
 }
 
 
@@ -12496,7 +12519,7 @@ static void editing_tools_crop_tool_constraint_description_unref (gpointer insta
 		EDITING_TOOLS_CROP_TOOL_CONSTRAINT_DESCRIPTION_GET_CLASS (self)->finalize (self);
 #line 607 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 12500 "EditingTools.c"
+#line 12523 "EditingTools.c"
 	}
 }
 
@@ -12506,7 +12529,7 @@ static gboolean _editing_tools_crop_tool_crop_tool_window_constraint_combo_separ
 	result = editing_tools_crop_tool_crop_tool_window_constraint_combo_separator_func (model, iter);
 #line 675 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 12510 "EditingTools.c"
+#line 12533 "EditingTools.c"
 }
 
 
@@ -12697,14 +12720,14 @@ static EditingToolsCropToolCropToolWindow* editing_tools_crop_tool_crop_tool_win
 	_g_object_unref0 (combo_text_renderer);
 #line 662 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return self;
-#line 12701 "EditingTools.c"
+#line 12724 "EditingTools.c"
 }
 
 
 static EditingToolsCropToolCropToolWindow* editing_tools_crop_tool_crop_tool_window_new (GtkWindow* container) {
 #line 662 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return editing_tools_crop_tool_crop_tool_window_construct (EDITING_TOOLS_CROP_TOOL_TYPE_CROP_TOOL_WINDOW, container);
-#line 12708 "EditingTools.c"
+#line 12731 "EditingTools.c"
 }
 
 
@@ -12745,7 +12768,7 @@ static gboolean editing_tools_crop_tool_crop_tool_window_constraint_combo_separa
 	G_IS_VALUE (&val) ? (g_value_unset (&val), NULL) : NULL;
 #line 704 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 12749 "EditingTools.c"
+#line 12772 "EditingTools.c"
 }
 
 
@@ -12754,7 +12777,7 @@ static void editing_tools_crop_tool_crop_tool_window_class_init (EditingToolsCro
 	editing_tools_crop_tool_crop_tool_window_parent_class = g_type_class_peek_parent (klass);
 #line 646 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	G_OBJECT_CLASS (klass)->finalize = editing_tools_crop_tool_crop_tool_window_finalize;
-#line 12758 "EditingTools.c"
+#line 12781 "EditingTools.c"
 }
 
 
@@ -12811,7 +12834,7 @@ static void editing_tools_crop_tool_crop_tool_window_instance_init (EditingTools
 	self->normal_width = -1;
 #line 660 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->normal_height = -1;
-#line 12815 "EditingTools.c"
+#line 12838 "EditingTools.c"
 }
 
 
@@ -12841,7 +12864,7 @@ static void editing_tools_crop_tool_crop_tool_window_finalize (GObject* obj) {
 	_g_object_unref0 (self->layout);
 #line 646 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	G_OBJECT_CLASS (editing_tools_crop_tool_crop_tool_window_parent_class)->finalize (obj);
-#line 12845 "EditingTools.c"
+#line 12868 "EditingTools.c"
 }
 
 
@@ -12882,7 +12905,7 @@ static void editing_tools_crop_tool_class_init (EditingToolsCropToolClass * klas
 	((EditingToolsEditingToolClass *) klass)->on_motion = editing_tools_crop_tool_real_on_motion;
 #line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	((EditingToolsEditingToolClass *) klass)->paint = editing_tools_crop_tool_real_paint;
-#line 12886 "EditingTools.c"
+#line 12909 "EditingTools.c"
 }
 
 
@@ -12954,7 +12977,7 @@ static void editing_tools_crop_tool_instance_init (EditingToolsCropTool * self)
 	self->priv->custom_init_height = -1;
 #line 734 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->pre_aspect_ratio = EDITING_TOOLS_CROP_TOOL_ANY_ASPECT_RATIO;
-#line 12958 "EditingTools.c"
+#line 12981 "EditingTools.c"
 }
 
 
@@ -12980,7 +13003,7 @@ static void editing_tools_crop_tool_finalize (EditingToolsEditingTool* obj) {
 	_g_object_unref0 (self->priv->constraint_list);
 #line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	EDITING_TOOLS_EDITING_TOOL_CLASS (editing_tools_crop_tool_parent_class)->finalize (obj);
-#line 12984 "EditingTools.c"
+#line 13007 "EditingTools.c"
 }
 
 
@@ -13009,7 +13032,7 @@ static void editing_tools_redeye_instance_init (EditingToolsRedeyeInstance *self
 	(*self).center = _tmp0_;
 #line 1843 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*self).radius = EDITING_TOOLS_REDEYE_INSTANCE_DEFAULT_RADIUS;
-#line 13013 "EditingTools.c"
+#line 13036 "EditingTools.c"
 }
 
 
@@ -13073,7 +13096,7 @@ void editing_tools_redeye_instance_to_bounds_rect (EditingToolsRedeyeInstance* i
 	*result = _result_;
 #line 1853 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return;
-#line 13077 "EditingTools.c"
+#line 13100 "EditingTools.c"
 }
 
 
@@ -13135,7 +13158,7 @@ void editing_tools_redeye_instance_from_bounds_rect (GdkRectangle* rect, Editing
 	*result = _result_;
 #line 1864 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return;
-#line 13139 "EditingTools.c"
+#line 13162 "EditingTools.c"
 }
 
 
@@ -13147,14 +13170,14 @@ EditingToolsRedeyeInstance* editing_tools_redeye_instance_dup (const EditingTool
 	memcpy (dup, self, sizeof (EditingToolsRedeyeInstance));
 #line 1832 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return dup;
-#line 13151 "EditingTools.c"
+#line 13174 "EditingTools.c"
 }
 
 
 void editing_tools_redeye_instance_free (EditingToolsRedeyeInstance* self) {
 #line 1832 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_free (self);
-#line 13158 "EditingTools.c"
+#line 13181 "EditingTools.c"
 }
 
 
@@ -13175,14 +13198,14 @@ static EditingToolsRedeyeTool* editing_tools_redeye_tool_construct (GType object
 	self = (EditingToolsRedeyeTool*) editing_tools_editing_tool_construct (object_type, "RedeyeTool");
 #line 1915 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return self;
-#line 13179 "EditingTools.c"
+#line 13202 "EditingTools.c"
 }
 
 
 static EditingToolsRedeyeTool* editing_tools_redeye_tool_new (void) {
 #line 1915 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return editing_tools_redeye_tool_construct (EDITING_TOOLS_TYPE_REDEYE_TOOL);
-#line 13186 "EditingTools.c"
+#line 13209 "EditingTools.c"
 }
 
 
@@ -13195,7 +13218,7 @@ EditingToolsRedeyeTool* editing_tools_redeye_tool_factory (void) {
 	result = _tmp0_;
 #line 1920 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 13199 "EditingTools.c"
+#line 13222 "EditingTools.c"
 }
 
 
@@ -13226,7 +13249,7 @@ gboolean editing_tools_redeye_tool_is_available (Photo* photo, Scaling* scaling)
 	_tmp5_ = _tmp4_.width;
 #line 1926 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp5_ >= (EDITING_TOOLS_REDEYE_INSTANCE_MAX_RADIUS * 2)) {
-#line 13230 "EditingTools.c"
+#line 13253 "EditingTools.c"
 		Dimensions _tmp6_ = {0};
 		gint _tmp7_ = 0;
 #line 1927 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -13235,17 +13258,17 @@ gboolean editing_tools_redeye_tool_is_available (Photo* photo, Scaling* scaling)
 		_tmp7_ = _tmp6_.height;
 #line 1927 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp3_ = _tmp7_ >= (EDITING_TOOLS_REDEYE_INSTANCE_MAX_RADIUS * 2);
-#line 13239 "EditingTools.c"
+#line 13262 "EditingTools.c"
 	} else {
 #line 1926 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp3_ = FALSE;
-#line 13243 "EditingTools.c"
+#line 13266 "EditingTools.c"
 	}
 #line 1926 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	result = _tmp3_;
 #line 1926 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 13249 "EditingTools.c"
+#line 13272 "EditingTools.c"
 }
 
 
@@ -13322,7 +13345,7 @@ static void editing_tools_redeye_tool_new_interaction_instance (EditingToolsRede
 	*result = _result_;
 #line 1941 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return;
-#line 13326 "EditingTools.c"
+#line 13349 "EditingTools.c"
 }
 
 
@@ -13379,7 +13402,7 @@ static void editing_tools_redeye_tool_prepare_ctx (EditingToolsRedeyeTool* self,
 	_tmp9_ = self->priv->thin_white_ctx;
 #line 1951 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_set_line_width (_tmp9_, (gdouble) 1);
-#line 13383 "EditingTools.c"
+#line 13406 "EditingTools.c"
 }
 
 
@@ -13452,7 +13475,7 @@ static void editing_tools_redeye_tool_draw_redeye_instance (EditingToolsRedeyeTo
 	_tmp19_ = _tmp18_.radius;
 #line 1957 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_photo_canvas_draw_circle (_tmp10_, _tmp11_, _tmp14_, _tmp17_, _tmp19_);
-#line 13456 "EditingTools.c"
+#line 13479 "EditingTools.c"
 }
 
 
@@ -13480,7 +13503,7 @@ static gboolean editing_tools_redeye_tool_on_size_slider_adjust (EditingToolsRed
 	result = FALSE;
 #line 1967 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 13484 "EditingTools.c"
+#line 13507 "EditingTools.c"
 }
 
 
@@ -13641,7 +13664,7 @@ static void editing_tools_redeye_tool_on_apply (EditingToolsRedeyeTool* self) {
 	_command_manager_unref0 (_tmp37_);
 #line 1970 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (command);
-#line 13645 "EditingTools.c"
+#line 13668 "EditingTools.c"
 }
 
 
@@ -13676,7 +13699,7 @@ static void editing_tools_redeye_tool_on_photos_altered (EditingToolsRedeyeTool*
 	if (_tmp5_) {
 #line 2003 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return;
-#line 13680 "EditingTools.c"
+#line 13703 "EditingTools.c"
 	}
 	{
 		GdkPixbuf* _tmp6_ = NULL;
@@ -13708,7 +13731,7 @@ static void editing_tools_redeye_tool_on_photos_altered (EditingToolsRedeyeTool*
 		_tmp6_ = _tmp13_;
 #line 2006 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 13712 "EditingTools.c"
+#line 13735 "EditingTools.c"
 			goto __catch20_g_error;
 		}
 #line 2006 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -13721,7 +13744,7 @@ static void editing_tools_redeye_tool_on_photos_altered (EditingToolsRedeyeTool*
 		self->priv->current_pixbuf = _tmp14_;
 #line 2005 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_object_unref0 (_tmp6_);
-#line 13725 "EditingTools.c"
+#line 13748 "EditingTools.c"
 	}
 	goto __finally20;
 	__catch20_g_error:
@@ -13745,7 +13768,7 @@ static void editing_tools_redeye_tool_on_photos_altered (EditingToolsRedeyeTool*
 		_g_error_free0 (err);
 #line 2011 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return;
-#line 13749 "EditingTools.c"
+#line 13772 "EditingTools.c"
 	}
 	__finally20:
 #line 2005 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -13756,13 +13779,13 @@ static void editing_tools_redeye_tool_on_photos_altered (EditingToolsRedeyeTool*
 		g_clear_error (&_inner_error_);
 #line 2005 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return;
-#line 13760 "EditingTools.c"
+#line 13783 "EditingTools.c"
 	}
 #line 2014 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp17_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
 #line 2014 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_photo_canvas_repaint (_tmp17_);
-#line 13766 "EditingTools.c"
+#line 13789 "EditingTools.c"
 }
 
 
@@ -13788,7 +13811,7 @@ static void editing_tools_redeye_tool_on_close (EditingToolsRedeyeTool* self) {
 	g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool), "applied", NULL, _tmp0_, &_tmp4_, FALSE);
 #line 2018 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (_tmp3_);
-#line 13792 "EditingTools.c"
+#line 13815 "EditingTools.c"
 }
 
 
@@ -13894,14 +13917,14 @@ static void editing_tools_redeye_tool_on_canvas_resize (EditingToolsRedeyeTool*
 	_g_object_unref0 (self->priv->current_pixbuf);
 #line 2043 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->current_pixbuf = NULL;
-#line 13898 "EditingTools.c"
+#line 13921 "EditingTools.c"
 }
 
 
 static void _editing_tools_redeye_tool_on_photos_altered_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self) {
 #line 2066 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_redeye_tool_on_photos_altered ((EditingToolsRedeyeTool*) self, items);
-#line 13905 "EditingTools.c"
+#line 13928 "EditingTools.c"
 }
 
 
@@ -14037,13 +14060,13 @@ static void editing_tools_redeye_tool_real_activate (EditingToolsEditingTool* ba
 	_tmp27_ = owner;
 #line 2065 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp27_ != NULL) {
-#line 14041 "EditingTools.c"
+#line 14064 "EditingTools.c"
 		DataCollection* _tmp28_ = NULL;
 #line 2066 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp28_ = owner;
 #line 2066 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		g_signal_connect (_tmp28_, "items-altered", (GCallback) _editing_tools_redeye_tool_on_photos_altered_data_collection_items_altered, self);
-#line 14047 "EditingTools.c"
+#line 14070 "EditingTools.c"
 	}
 #line 2068 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp29_ = canvas;
@@ -14051,7 +14074,7 @@ static void editing_tools_redeye_tool_real_activate (EditingToolsEditingTool* ba
 	EDITING_TOOLS_EDITING_TOOL_CLASS (editing_tools_redeye_tool_parent_class)->activate (G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool), _tmp29_);
 #line 2046 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_data_collection_unref0 (owner);
-#line 14055 "EditingTools.c"
+#line 14078 "EditingTools.c"
 }
 
 
@@ -14065,7 +14088,7 @@ static void editing_tools_redeye_tool_real_deactivate (EditingToolsEditingTool*
 	_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
 #line 2072 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp0_ != NULL) {
-#line 14069 "EditingTools.c"
+#line 14092 "EditingTools.c"
 		DataCollection* owner = NULL;
 		EditingToolsPhotoCanvas* _tmp1_ = NULL;
 		Photo* _tmp2_ = NULL;
@@ -14092,7 +14115,7 @@ static void editing_tools_redeye_tool_real_deactivate (EditingToolsEditingTool*
 		_tmp6_ = owner;
 #line 2074 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		if (_tmp6_ != NULL) {
-#line 14096 "EditingTools.c"
+#line 14119 "EditingTools.c"
 			DataCollection* _tmp7_ = NULL;
 			guint _tmp8_ = 0U;
 #line 2075 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -14101,7 +14124,7 @@ static void editing_tools_redeye_tool_real_deactivate (EditingToolsEditingTool*
 			g_signal_parse_name ("items-altered", TYPE_DATA_COLLECTION, &_tmp8_, NULL, FALSE);
 #line 2075 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			g_signal_handlers_disconnect_matched (_tmp7_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp8_, 0, NULL, (GCallback) _editing_tools_redeye_tool_on_photos_altered_data_collection_items_altered, self);
-#line 14105 "EditingTools.c"
+#line 14128 "EditingTools.c"
 		}
 #line 2077 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp9_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
@@ -14109,13 +14132,13 @@ static void editing_tools_redeye_tool_real_deactivate (EditingToolsEditingTool*
 		editing_tools_redeye_tool_unbind_canvas_handlers (self, _tmp9_);
 #line 2072 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_data_collection_unref0 (owner);
-#line 14113 "EditingTools.c"
+#line 14136 "EditingTools.c"
 	}
 #line 2080 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp10_ = self->priv->redeye_tool_window;
 #line 2080 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp10_ != NULL) {
-#line 14119 "EditingTools.c"
+#line 14142 "EditingTools.c"
 		EditingToolsRedeyeToolRedeyeToolWindow* _tmp11_ = NULL;
 		EditingToolsRedeyeToolRedeyeToolWindow* _tmp12_ = NULL;
 #line 2081 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -14132,25 +14155,25 @@ static void editing_tools_redeye_tool_real_deactivate (EditingToolsEditingTool*
 		_g_object_unref0 (self->priv->redeye_tool_window);
 #line 2084 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		self->priv->redeye_tool_window = NULL;
-#line 14136 "EditingTools.c"
+#line 14159 "EditingTools.c"
 	}
 #line 2087 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	EDITING_TOOLS_EDITING_TOOL_CLASS (editing_tools_redeye_tool_parent_class)->deactivate (G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool));
-#line 14140 "EditingTools.c"
+#line 14163 "EditingTools.c"
 }
 
 
 static void _editing_tools_redeye_tool_prepare_ctx_editing_tools_photo_canvas_new_surface (EditingToolsPhotoCanvas* _sender, cairo_t* ctx, Dimensions* dim, gpointer self) {
 #line 2091 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_redeye_tool_prepare_ctx ((EditingToolsRedeyeTool*) self, ctx, dim);
-#line 14147 "EditingTools.c"
+#line 14170 "EditingTools.c"
 }
 
 
 static void _editing_tools_redeye_tool_on_canvas_resize_editing_tools_photo_canvas_resized_scaled_pixbuf (EditingToolsPhotoCanvas* _sender, Dimensions* old_dim, GdkPixbuf* scaled, GdkRectangle* scaled_position, gpointer self) {
 #line 2092 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_redeye_tool_on_canvas_resize ((EditingToolsRedeyeTool*) self);
-#line 14154 "EditingTools.c"
+#line 14177 "EditingTools.c"
 }
 
 
@@ -14169,7 +14192,7 @@ static void editing_tools_redeye_tool_bind_canvas_handlers (EditingToolsRedeyeTo
 	_tmp1_ = canvas;
 #line 2092 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_connect (_tmp1_, "resized-scaled-pixbuf", (GCallback) _editing_tools_redeye_tool_on_canvas_resize_editing_tools_photo_canvas_resized_scaled_pixbuf, self);
-#line 14173 "EditingTools.c"
+#line 14196 "EditingTools.c"
 }
 
 
@@ -14194,21 +14217,21 @@ static void editing_tools_redeye_tool_unbind_canvas_handlers (EditingToolsRedeye
 	g_signal_parse_name ("resized-scaled-pixbuf", EDITING_TOOLS_TYPE_PHOTO_CANVAS, &_tmp3_, NULL, FALSE);
 #line 2097 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _editing_tools_redeye_tool_on_canvas_resize_editing_tools_photo_canvas_resized_scaled_pixbuf, self);
-#line 14198 "EditingTools.c"
+#line 14221 "EditingTools.c"
 }
 
 
 static void _editing_tools_redeye_tool_on_apply_gtk_button_clicked (GtkButton* _sender, gpointer self) {
 #line 2101 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_redeye_tool_on_apply ((EditingToolsRedeyeTool*) self);
-#line 14205 "EditingTools.c"
+#line 14228 "EditingTools.c"
 }
 
 
 static void _editing_tools_redeye_tool_on_close_gtk_button_clicked (GtkButton* _sender, gpointer self) {
 #line 2102 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_redeye_tool_on_close ((EditingToolsRedeyeTool*) self);
-#line 14212 "EditingTools.c"
+#line 14235 "EditingTools.c"
 }
 
 
@@ -14217,7 +14240,7 @@ static gboolean _editing_tools_redeye_tool_on_size_slider_adjust_gtk_range_chang
 	result = editing_tools_redeye_tool_on_size_slider_adjust ((EditingToolsRedeyeTool*) self, scroll);
 #line 2103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 14221 "EditingTools.c"
+#line 14244 "EditingTools.c"
 }
 
 
@@ -14248,7 +14271,7 @@ static void editing_tools_redeye_tool_bind_window_handlers (EditingToolsRedeyeTo
 	_tmp5_ = _tmp4_->slider;
 #line 2103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_range_get_type (), GtkRange), "change-value", (GCallback) _editing_tools_redeye_tool_on_size_slider_adjust_gtk_range_change_value, self);
-#line 14252 "EditingTools.c"
+#line 14275 "EditingTools.c"
 }
 
 
@@ -14288,7 +14311,7 @@ static void editing_tools_redeye_tool_unbind_window_handlers (EditingToolsRedeye
 	g_signal_parse_name ("change-value", gtk_range_get_type (), &_tmp8_, NULL, FALSE);
 #line 2109 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_range_get_type (), GtkRange), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp8_, 0, NULL, (GCallback) _editing_tools_redeye_tool_on_size_slider_adjust_gtk_range_change_value, self);
-#line 14292 "EditingTools.c"
+#line 14315 "EditingTools.c"
 }
 
 
@@ -14307,7 +14330,7 @@ static EditingToolsEditingToolWindow* editing_tools_redeye_tool_real_get_tool_wi
 	result = _tmp1_;
 #line 2113 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 14311 "EditingTools.c"
+#line 14334 "EditingTools.c"
 }
 
 
@@ -14331,7 +14354,7 @@ static void editing_tools_redeye_tool_real_paint (EditingToolsEditingTool* base,
 	_tmp1_ = self->priv->current_pixbuf;
 #line 2117 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp1_ != NULL) {
-#line 14335 "EditingTools.c"
+#line 14358 "EditingTools.c"
 		GdkPixbuf* _tmp2_ = NULL;
 		GdkPixbuf* _tmp3_ = NULL;
 #line 2117 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -14342,7 +14365,7 @@ static void editing_tools_redeye_tool_real_paint (EditingToolsEditingTool* base,
 		_g_object_unref0 (_tmp0_);
 #line 2117 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp0_ = _tmp3_;
-#line 14346 "EditingTools.c"
+#line 14369 "EditingTools.c"
 	} else {
 		EditingToolsPhotoCanvas* _tmp4_ = NULL;
 		GdkPixbuf* _tmp5_ = NULL;
@@ -14354,7 +14377,7 @@ static void editing_tools_redeye_tool_real_paint (EditingToolsEditingTool* base,
 		_g_object_unref0 (_tmp0_);
 #line 2117 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp0_ = _tmp5_;
-#line 14358 "EditingTools.c"
+#line 14381 "EditingTools.c"
 	}
 #line 2117 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
@@ -14380,7 +14403,7 @@ static void editing_tools_redeye_tool_real_paint (EditingToolsEditingTool* base,
 	editing_tools_redeye_tool_draw_redeye_instance (self, &_tmp12_);
 #line 2116 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (_tmp0_);
-#line 14384 "EditingTools.c"
+#line 14407 "EditingTools.c"
 }
 
 
@@ -14411,7 +14434,7 @@ static void editing_tools_redeye_tool_real_on_left_click (EditingToolsEditingToo
 	_tmp5_ = coord_in_rectangle (_tmp2_, _tmp3_, &_tmp4_);
 #line 2131 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp5_) {
-#line 14415 "EditingTools.c"
+#line 14438 "EditingTools.c"
 		gint _tmp6_ = 0;
 		gint _tmp7_ = 0;
 		EditingToolsRedeyeInstance _tmp8_ = {0};
@@ -14432,7 +14455,7 @@ static void editing_tools_redeye_tool_real_on_left_click (EditingToolsEditingToo
 		_tmp9_ = _tmp8_.center;
 #line 2135 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		self->priv->reticle_move_anchor = _tmp9_;
-#line 14436 "EditingTools.c"
+#line 14459 "EditingTools.c"
 	}
 }
 
@@ -14443,7 +14466,7 @@ static void editing_tools_redeye_tool_real_on_left_released (EditingToolsEditing
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_REDEYE_TOOL, EditingToolsRedeyeTool);
 #line 2140 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->is_reticle_move_in_progress = FALSE;
-#line 14447 "EditingTools.c"
+#line 14470 "EditingTools.c"
 }
 
 
@@ -14456,7 +14479,7 @@ static void editing_tools_redeye_tool_real_on_motion (EditingToolsEditingTool* b
 	_tmp0_ = self->priv->is_reticle_move_in_progress;
 #line 2144 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp0_) {
-#line 14460 "EditingTools.c"
+#line 14483 "EditingTools.c"
 		GdkRectangle active_region_rect = {0};
 		EditingToolsPhotoCanvas* _tmp1_ = NULL;
 		GdkRectangle _tmp2_ = {0};
@@ -14629,7 +14652,7 @@ static void editing_tools_redeye_tool_real_on_motion (EditingToolsEditingTool* b
 		_tmp47_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
 #line 2175 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_photo_canvas_repaint (_tmp47_);
-#line 14633 "EditingTools.c"
+#line 14656 "EditingTools.c"
 	} else {
 		GdkRectangle bounds = {0};
 		EditingToolsRedeyeInstance _tmp48_ = {0};
@@ -14654,7 +14677,7 @@ static void editing_tools_redeye_tool_real_on_motion (EditingToolsEditingTool* b
 		_tmp53_ = coord_in_rectangle (_tmp50_, _tmp51_, &_tmp52_);
 #line 2180 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		if (_tmp53_) {
-#line 14658 "EditingTools.c"
+#line 14681 "EditingTools.c"
 			EditingToolsPhotoCanvas* _tmp54_ = NULL;
 			GdkWindow* _tmp55_ = NULL;
 			GdkWindow* _tmp56_ = NULL;
@@ -14671,7 +14694,7 @@ static void editing_tools_redeye_tool_real_on_motion (EditingToolsEditingTool* b
 			gdk_window_set_cursor (_tmp56_, _tmp57_);
 #line 2181 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_g_object_unref0 (_tmp56_);
-#line 14675 "EditingTools.c"
+#line 14698 "EditingTools.c"
 		} else {
 			EditingToolsPhotoCanvas* _tmp58_ = NULL;
 			GdkWindow* _tmp59_ = NULL;
@@ -14689,7 +14712,7 @@ static void editing_tools_redeye_tool_real_on_motion (EditingToolsEditingTool* b
 			gdk_window_set_cursor (_tmp60_, _tmp61_);
 #line 2183 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_g_object_unref0 (_tmp60_);
-#line 14693 "EditingTools.c"
+#line 14716 "EditingTools.c"
 		}
 	}
 }
@@ -14719,7 +14742,7 @@ static gboolean editing_tools_redeye_tool_real_on_keypress (EditingToolsEditingT
 	if (g_strcmp0 (_tmp4_, "KP_Enter") == 0) {
 #line 2189 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp1_ = TRUE;
-#line 14723 "EditingTools.c"
+#line 14746 "EditingTools.c"
 	} else {
 		GdkEventKey* _tmp5_ = NULL;
 		guint _tmp6_ = 0U;
@@ -14732,13 +14755,13 @@ static gboolean editing_tools_redeye_tool_real_on_keypress (EditingToolsEditingT
 		_tmp7_ = gdk_keyval_name (_tmp6_);
 #line 2190 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp1_ = g_strcmp0 (_tmp7_, "Enter") == 0;
-#line 14736 "EditingTools.c"
+#line 14759 "EditingTools.c"
 	}
 #line 2189 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp1_) {
 #line 2189 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp0_ = TRUE;
-#line 14742 "EditingTools.c"
+#line 14765 "EditingTools.c"
 	} else {
 		GdkEventKey* _tmp8_ = NULL;
 		guint _tmp9_ = 0U;
@@ -14751,7 +14774,7 @@ static gboolean editing_tools_redeye_tool_real_on_keypress (EditingToolsEditingT
 		_tmp10_ = gdk_keyval_name (_tmp9_);
 #line 2191 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp0_ = g_strcmp0 (_tmp10_, "Return") == 0;
-#line 14755 "EditingTools.c"
+#line 14778 "EditingTools.c"
 	}
 #line 2189 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp0_) {
@@ -14761,7 +14784,7 @@ static gboolean editing_tools_redeye_tool_real_on_keypress (EditingToolsEditingT
 		result = TRUE;
 #line 2193 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return result;
-#line 14765 "EditingTools.c"
+#line 14788 "EditingTools.c"
 	}
 #line 2196 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp11_ = event;
@@ -14771,7 +14794,7 @@ static gboolean editing_tools_redeye_tool_real_on_keypress (EditingToolsEditingT
 	result = _tmp12_;
 #line 2196 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 14775 "EditingTools.c"
+#line 14798 "EditingTools.c"
 }
 
 
@@ -14854,14 +14877,14 @@ static EditingToolsRedeyeToolRedeyeToolWindow* editing_tools_redeye_tool_redeye_
 	_g_object_unref0 (layout);
 #line 1881 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return self;
-#line 14858 "EditingTools.c"
+#line 14881 "EditingTools.c"
 }
 
 
 static EditingToolsRedeyeToolRedeyeToolWindow* editing_tools_redeye_tool_redeye_tool_window_new (GtkWindow* container) {
 #line 1881 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return editing_tools_redeye_tool_redeye_tool_window_construct (EDITING_TOOLS_REDEYE_TOOL_TYPE_REDEYE_TOOL_WINDOW, container);
-#line 14865 "EditingTools.c"
+#line 14888 "EditingTools.c"
 }
 
 
@@ -14872,7 +14895,7 @@ static void editing_tools_redeye_tool_redeye_tool_window_class_init (EditingTool
 	g_type_class_add_private (klass, sizeof (EditingToolsRedeyeToolRedeyeToolWindowPrivate));
 #line 1869 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	G_OBJECT_CLASS (klass)->finalize = editing_tools_redeye_tool_redeye_tool_window_finalize;
-#line 14876 "EditingTools.c"
+#line 14899 "EditingTools.c"
 }
 
 
@@ -14910,7 +14933,7 @@ static void editing_tools_redeye_tool_redeye_tool_window_instance_init (EditingT
 	g_object_ref_sink (_tmp4_);
 #line 1878 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->slider = _tmp4_;
-#line 14914 "EditingTools.c"
+#line 14937 "EditingTools.c"
 }
 
 
@@ -14928,7 +14951,7 @@ static void editing_tools_redeye_tool_redeye_tool_window_finalize (GObject* obj)
 	_g_object_unref0 (self->slider);
 #line 1869 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	G_OBJECT_CLASS (editing_tools_redeye_tool_redeye_tool_window_parent_class)->finalize (obj);
-#line 14932 "EditingTools.c"
+#line 14955 "EditingTools.c"
 }
 
 
@@ -14967,7 +14990,7 @@ static void editing_tools_redeye_tool_class_init (EditingToolsRedeyeToolClass *
 	((EditingToolsEditingToolClass *) klass)->on_motion = editing_tools_redeye_tool_real_on_motion;
 #line 1868 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	((EditingToolsEditingToolClass *) klass)->on_keypress = editing_tools_redeye_tool_real_on_keypress;
-#line 14971 "EditingTools.c"
+#line 14994 "EditingTools.c"
 }
 
 
@@ -14984,7 +15007,7 @@ static void editing_tools_redeye_tool_instance_init (EditingToolsRedeyeTool * se
 	self->priv->is_reticle_move_in_progress = FALSE;
 #line 1913 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->current_pixbuf = NULL;
-#line 14988 "EditingTools.c"
+#line 15011 "EditingTools.c"
 }
 
 
@@ -15006,7 +15029,7 @@ static void editing_tools_redeye_tool_finalize (EditingToolsEditingTool* obj) {
 	_g_object_unref0 (self->priv->current_pixbuf);
 #line 1868 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	EDITING_TOOLS_EDITING_TOOL_CLASS (editing_tools_redeye_tool_parent_class)->finalize (obj);
-#line 15010 "EditingTools.c"
+#line 15033 "EditingTools.c"
 }
 
 
@@ -15024,52 +15047,52 @@ GType editing_tools_redeye_tool_get_type (void) {
 
 static EditingToolsAdjustTool* editing_tools_adjust_tool_construct (GType object_type) {
 	EditingToolsAdjustTool* self = NULL;
-#line 2491 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2503 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = (EditingToolsAdjustTool*) editing_tools_editing_tool_construct (object_type, "AdjustTool");
-#line 2490 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2502 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return self;
-#line 15032 "EditingTools.c"
+#line 15055 "EditingTools.c"
 }
 
 
 static EditingToolsAdjustTool* editing_tools_adjust_tool_new (void) {
-#line 2490 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2502 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return editing_tools_adjust_tool_construct (EDITING_TOOLS_TYPE_ADJUST_TOOL);
-#line 15039 "EditingTools.c"
+#line 15062 "EditingTools.c"
 }
 
 
 EditingToolsAdjustTool* editing_tools_adjust_tool_factory (void) {
 	EditingToolsAdjustTool* result = NULL;
 	EditingToolsAdjustTool* _tmp0_ = NULL;
-#line 2495 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2507 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = editing_tools_adjust_tool_new ();
-#line 2495 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2507 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	result = _tmp0_;
-#line 2495 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2507 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 15052 "EditingTools.c"
+#line 15075 "EditingTools.c"
 }
 
 
 gboolean editing_tools_adjust_tool_is_available (Photo* photo, Scaling* scaling) {
 	gboolean result = FALSE;
-#line 2498 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2510 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (IS_PHOTO (photo), FALSE);
-#line 2498 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2510 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (scaling != NULL, FALSE);
-#line 2499 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2511 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	result = TRUE;
-#line 2499 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2511 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 15066 "EditingTools.c"
+#line 15089 "EditingTools.c"
 }
 
 
 static void _editing_tools_adjust_tool_on_photos_altered_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self) {
-#line 2582 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2600 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_on_photos_altered ((EditingToolsAdjustTool*) self, items);
-#line 15073 "EditingTools.c"
+#line 15096 "EditingTools.c"
 }
 
 
@@ -15152,458 +15175,491 @@ static void editing_tools_adjust_tool_real_activate (EditingToolsEditingTool* ba
 	GtkScale* _tmp66_ = NULL;
 	ExposureTransformation* _tmp67_ = NULL;
 	gfloat _tmp68_ = 0.0F;
-	EditingToolsPhotoCanvas* _tmp69_ = NULL;
-	EditingToolsPhotoCanvas* _tmp70_ = NULL;
-	GdkPixbuf* _tmp71_ = NULL;
-	GdkPixbuf* _tmp72_ = NULL;
-	GdkPixbuf* _tmp73_ = NULL;
-	EditingToolsPhotoCanvas* _tmp74_ = NULL;
-	GdkPixbuf* _tmp75_ = NULL;
-	GdkPixbuf* _tmp76_ = NULL;
-	gboolean _tmp77_ = FALSE;
-	GdkPixbuf* _tmp78_ = NULL;
-	gint _tmp79_ = 0;
-	gint _tmp80_ = 0;
-	gboolean _tmp84_ = FALSE;
+	ContrastTransformation* contrast_trans = NULL;
+	PixelTransformationBundle* _tmp69_ = NULL;
+	PixelTransformation* _tmp70_ = NULL;
+	PixelTransformer* _tmp71_ = NULL;
+	ContrastTransformation* _tmp72_ = NULL;
+	EditingToolsAdjustToolAdjustToolWindow* _tmp73_ = NULL;
+	GtkHScale* _tmp74_ = NULL;
+	ContrastTransformation* _tmp75_ = NULL;
+	gfloat _tmp76_ = 0.0F;
+	EditingToolsPhotoCanvas* _tmp77_ = NULL;
+	EditingToolsPhotoCanvas* _tmp78_ = NULL;
+	GdkPixbuf* _tmp79_ = NULL;
+	GdkPixbuf* _tmp80_ = NULL;
+	GdkPixbuf* _tmp81_ = NULL;
+	EditingToolsPhotoCanvas* _tmp82_ = NULL;
+	GdkPixbuf* _tmp83_ = NULL;
+	GdkPixbuf* _tmp84_ = NULL;
 	gboolean _tmp85_ = FALSE;
 	GdkPixbuf* _tmp86_ = NULL;
 	gint _tmp87_ = 0;
 	gint _tmp88_ = 0;
-	GdkPixbuf* _tmp89_ = NULL;
-	gint _tmp90_ = 0;
-	gint _tmp91_ = 0;
-	GdkPixbuf* _tmp108_ = NULL;
-	GdkPixbuf* _tmp109_ = NULL;
+	gboolean _tmp92_ = FALSE;
+	gboolean _tmp93_ = FALSE;
+	GdkPixbuf* _tmp94_ = NULL;
+	gint _tmp95_ = 0;
+	gint _tmp96_ = 0;
+	GdkPixbuf* _tmp97_ = NULL;
+	gint _tmp98_ = 0;
+	gint _tmp99_ = 0;
+	GdkPixbuf* _tmp116_ = NULL;
+	GdkPixbuf* _tmp117_ = NULL;
 	DataCollection* owner = NULL;
-	EditingToolsPhotoCanvas* _tmp110_ = NULL;
-	Photo* _tmp111_ = NULL;
-	Photo* _tmp112_ = NULL;
-	DataCollection* _tmp113_ = NULL;
-	DataCollection* _tmp114_ = NULL;
-	DataCollection* _tmp115_ = NULL;
-	EditingToolsPhotoCanvas* _tmp117_ = NULL;
-#line 2502 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	EditingToolsPhotoCanvas* _tmp118_ = NULL;
+	Photo* _tmp119_ = NULL;
+	Photo* _tmp120_ = NULL;
+	DataCollection* _tmp121_ = NULL;
+	DataCollection* _tmp122_ = NULL;
+	DataCollection* _tmp123_ = NULL;
+	EditingToolsPhotoCanvas* _tmp125_ = NULL;
+#line 2514 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_ADJUST_TOOL, EditingToolsAdjustTool);
-#line 2502 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2514 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (canvas));
-#line 2503 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2515 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = canvas;
-#line 2503 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2515 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = editing_tools_photo_canvas_get_container (_tmp0_);
-#line 2503 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2515 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = _tmp1_;
-#line 2503 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2515 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = editing_tools_adjust_tool_adjust_tool_window_new (_tmp2_);
-#line 2503 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2515 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_object_ref_sink (_tmp3_);
-#line 2503 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2515 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->priv->adjust_tool_window);
-#line 2503 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2515 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->adjust_tool_window = _tmp3_;
-#line 2503 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2515 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (_tmp2_);
-#line 2505 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2517 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = canvas;
-#line 2505 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2517 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = editing_tools_photo_canvas_get_photo (_tmp4_);
-#line 2505 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2517 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	photo = _tmp5_;
-#line 2506 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2518 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = photo;
-#line 2506 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2518 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7_ = photo_get_color_adjustments (_tmp6_);
-#line 2506 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2518 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_pixel_transformation_bundle_unref0 (self->priv->transformations);
-#line 2506 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2518 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->transformations = _tmp7_;
-#line 2507 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2519 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp8_ = self->priv->transformations;
-#line 2507 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2519 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp9_ = pixel_transformation_bundle_generate_transformer (_tmp8_);
-#line 2507 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2519 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_pixel_transformer_unref0 (self->priv->transformer);
-#line 2507 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2519 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->transformer = _tmp9_;
-#line 2510 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2522 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp10_ = pixel_transformer_new ();
-#line 2510 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2522 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_pixel_transformer_unref0 (self->priv->histogram_transformer);
-#line 2510 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2522 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->histogram_transformer = _tmp10_;
-#line 2513 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2525 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp11_ = self->priv->transformations;
-#line 2513 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2525 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp12_ = pixel_transformation_bundle_get_transformation (_tmp11_, PIXEL_TRANSFORMATION_TYPE_TONE_EXPANSION);
-#line 2513 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2525 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	expansion_trans = G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_EXPANSION_TRANSFORMATION, ExpansionTransformation);
-#line 2515 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2527 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp13_ = self->priv->adjust_tool_window;
-#line 2515 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2527 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp14_ = _tmp13_->histogram_manipulator;
-#line 2515 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2527 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp15_ = expansion_trans;
-#line 2515 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2527 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp16_ = expansion_transformation_get_black_point (_tmp15_);
-#line 2515 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2527 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	rgb_histogram_manipulator_set_left_nub_position (_tmp14_, _tmp16_);
-#line 2517 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2529 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp17_ = self->priv->adjust_tool_window;
-#line 2517 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2529 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp18_ = _tmp17_->histogram_manipulator;
-#line 2517 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2529 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp19_ = expansion_trans;
-#line 2517 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2529 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp20_ = expansion_transformation_get_white_point (_tmp19_);
-#line 2517 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2529 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	rgb_histogram_manipulator_set_right_nub_position (_tmp18_, _tmp20_);
-#line 2521 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2533 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp21_ = self->priv->transformations;
-#line 2521 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2533 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp22_ = pixel_transformation_bundle_get_transformation (_tmp21_, PIXEL_TRANSFORMATION_TYPE_SHADOWS);
-#line 2521 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2533 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	shadows_trans = G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, TYPE_SHADOW_DETAIL_TRANSFORMATION, ShadowDetailTransformation);
-#line 2523 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2535 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp23_ = self->priv->histogram_transformer;
-#line 2523 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2535 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp24_ = shadows_trans;
-#line 2523 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2535 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	pixel_transformer_attach_transformation (_tmp23_, G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, TYPE_PIXEL_TRANSFORMATION, PixelTransformation));
-#line 2524 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2536 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp25_ = self->priv->adjust_tool_window;
-#line 2524 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2536 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp26_ = _tmp25_->shadows_slider;
-#line 2524 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2536 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp27_ = shadows_trans;
-#line 2524 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2536 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp28_ = shadow_detail_transformation_get_parameter (_tmp27_);
-#line 2524 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2536 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, gtk_range_get_type (), GtkRange), (gdouble) _tmp28_);
-#line 2527 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2539 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp29_ = self->priv->transformations;
-#line 2527 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2539 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp30_ = pixel_transformation_bundle_get_transformation (_tmp29_, PIXEL_TRANSFORMATION_TYPE_HIGHLIGHTS);
-#line 2527 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2539 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	highlights_trans = G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, TYPE_HIGHLIGHT_DETAIL_TRANSFORMATION, HighlightDetailTransformation);
-#line 2529 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2541 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp31_ = self->priv->histogram_transformer;
-#line 2529 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2541 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp32_ = highlights_trans;
-#line 2529 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2541 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	pixel_transformer_attach_transformation (_tmp31_, G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, TYPE_PIXEL_TRANSFORMATION, PixelTransformation));
-#line 2530 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2542 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp33_ = self->priv->adjust_tool_window;
-#line 2530 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2542 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp34_ = _tmp33_->highlights_slider;
-#line 2530 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2542 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp35_ = highlights_trans;
-#line 2530 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2542 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp36_ = highlight_detail_transformation_get_parameter (_tmp35_);
-#line 2530 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2542 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, gtk_range_get_type (), GtkRange), (gdouble) _tmp36_);
-#line 2533 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2545 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp37_ = self->priv->transformations;
-#line 2533 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2545 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp38_ = pixel_transformation_bundle_get_transformation (_tmp37_, PIXEL_TRANSFORMATION_TYPE_TEMPERATURE);
-#line 2533 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2545 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	temp_trans = G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, TYPE_TEMPERATURE_TRANSFORMATION, TemperatureTransformation);
-#line 2535 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2547 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp39_ = self->priv->histogram_transformer;
-#line 2535 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2547 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp40_ = temp_trans;
-#line 2535 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2547 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	pixel_transformer_attach_transformation (_tmp39_, G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, TYPE_PIXEL_TRANSFORMATION, PixelTransformation));
-#line 2536 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2548 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp41_ = self->priv->adjust_tool_window;
-#line 2536 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2548 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp42_ = _tmp41_->temperature_slider;
-#line 2536 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2548 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp43_ = temp_trans;
-#line 2536 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2548 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp44_ = temperature_transformation_get_parameter (_tmp43_);
-#line 2536 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2548 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, gtk_range_get_type (), GtkRange), (gdouble) _tmp44_);
-#line 2538 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2550 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp45_ = self->priv->transformations;
-#line 2538 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2550 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp46_ = pixel_transformation_bundle_get_transformation (_tmp45_, PIXEL_TRANSFORMATION_TYPE_TINT);
-#line 2538 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2550 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	tint_trans = G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, TYPE_TINT_TRANSFORMATION, TintTransformation);
-#line 2540 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2552 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp47_ = self->priv->histogram_transformer;
-#line 2540 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2552 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp48_ = tint_trans;
-#line 2540 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2552 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	pixel_transformer_attach_transformation (_tmp47_, G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, TYPE_PIXEL_TRANSFORMATION, PixelTransformation));
-#line 2541 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2553 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp49_ = self->priv->adjust_tool_window;
-#line 2541 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2553 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp50_ = _tmp49_->tint_slider;
-#line 2541 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2553 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp51_ = tint_trans;
-#line 2541 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2553 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp52_ = tint_transformation_get_parameter (_tmp51_);
-#line 2541 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2553 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, gtk_range_get_type (), GtkRange), (gdouble) _tmp52_);
-#line 2544 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2556 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp53_ = self->priv->transformations;
-#line 2544 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2556 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp54_ = pixel_transformation_bundle_get_transformation (_tmp53_, PIXEL_TRANSFORMATION_TYPE_SATURATION);
-#line 2544 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2556 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	sat_trans = G_TYPE_CHECK_INSTANCE_CAST (_tmp54_, TYPE_SATURATION_TRANSFORMATION, SaturationTransformation);
-#line 2546 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2558 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp55_ = self->priv->histogram_transformer;
-#line 2546 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2558 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp56_ = sat_trans;
-#line 2546 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2558 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	pixel_transformer_attach_transformation (_tmp55_, G_TYPE_CHECK_INSTANCE_CAST (_tmp56_, TYPE_PIXEL_TRANSFORMATION, PixelTransformation));
-#line 2547 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2559 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp57_ = self->priv->adjust_tool_window;
-#line 2547 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2559 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp58_ = _tmp57_->saturation_slider;
-#line 2547 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2559 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp59_ = sat_trans;
-#line 2547 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2559 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp60_ = saturation_transformation_get_parameter (_tmp59_);
-#line 2547 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2559 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp58_, gtk_range_get_type (), GtkRange), (gdouble) _tmp60_);
-#line 2550 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2562 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp61_ = self->priv->transformations;
-#line 2550 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2562 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp62_ = pixel_transformation_bundle_get_transformation (_tmp61_, PIXEL_TRANSFORMATION_TYPE_EXPOSURE);
-#line 2550 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2562 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	exposure_trans = G_TYPE_CHECK_INSTANCE_CAST (_tmp62_, TYPE_EXPOSURE_TRANSFORMATION, ExposureTransformation);
-#line 2552 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2564 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp63_ = self->priv->histogram_transformer;
-#line 2552 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2564 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp64_ = exposure_trans;
-#line 2552 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2564 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	pixel_transformer_attach_transformation (_tmp63_, G_TYPE_CHECK_INSTANCE_CAST (_tmp64_, TYPE_PIXEL_TRANSFORMATION, PixelTransformation));
-#line 2553 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp65_ = self->priv->adjust_tool_window;
-#line 2553 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp66_ = _tmp65_->exposure_slider;
-#line 2553 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp67_ = exposure_trans;
-#line 2553 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp68_ = exposure_transformation_get_parameter (_tmp67_);
-#line 2553 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp66_, gtk_range_get_type (), GtkRange), (gdouble) _tmp68_);
-#line 2555 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp69_ = canvas;
-#line 2555 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	editing_tools_adjust_tool_bind_canvas_handlers (self, _tmp69_);
-#line 2556 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	editing_tools_adjust_tool_bind_window_handlers (self);
-#line 2558 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp70_ = canvas;
-#line 2558 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp71_ = editing_tools_photo_canvas_get_scaled_pixbuf (_tmp70_);
-#line 2558 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp72_ = _tmp71_;
-#line 2558 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp73_ = gdk_pixbuf_copy (_tmp72_);
-#line 2558 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_g_object_unref0 (self->priv->draw_to_pixbuf);
-#line 2558 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	self->priv->draw_to_pixbuf = _tmp73_;
-#line 2558 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_g_object_unref0 (_tmp72_);
-#line 2559 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp74_ = canvas;
-#line 2559 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp75_ = editing_tools_photo_canvas_get_scaled_pixbuf (_tmp74_);
-#line 2559 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp76_ = _tmp75_;
-#line 2559 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	editing_tools_adjust_tool_init_fp_pixel_cache (self, _tmp76_);
-#line 2559 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_g_object_unref0 (_tmp76_);
-#line 2565 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp78_ = self->priv->draw_to_pixbuf;
-#line 2565 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp79_ = gdk_pixbuf_get_width (_tmp78_);
-#line 2565 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp80_ = _tmp79_;
-#line 2565 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	if (_tmp80_ == 1) {
-#line 15430 "EditingTools.c"
-		GdkPixbuf* _tmp81_ = NULL;
-		gint _tmp82_ = 0;
-		gint _tmp83_ = 0;
-#line 2565 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp81_ = self->priv->draw_to_pixbuf;
 #line 2565 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp82_ = gdk_pixbuf_get_height (_tmp81_);
+	_tmp65_ = self->priv->adjust_tool_window;
 #line 2565 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp83_ = _tmp82_;
+	_tmp66_ = _tmp65_->exposure_slider;
 #line 2565 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp77_ = _tmp83_ == 1;
-#line 15442 "EditingTools.c"
-	} else {
+	_tmp67_ = exposure_trans;
 #line 2565 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp77_ = FALSE;
-#line 15446 "EditingTools.c"
-	}
+	_tmp68_ = exposure_transformation_get_parameter (_tmp67_);
 #line 2565 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	if (_tmp77_) {
-#line 2566 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		self->priv->disable_histogram_refresh = TRUE;
-#line 15452 "EditingTools.c"
-	}
-#line 2571 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp86_ = self->priv->draw_to_pixbuf;
-#line 2571 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp87_ = gdk_pixbuf_get_width (_tmp86_);
-#line 2571 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp88_ = _tmp87_;
-#line 2571 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp89_ = self->priv->draw_to_pixbuf;
-#line 2571 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp90_ = gdk_pixbuf_get_height (_tmp89_);
-#line 2571 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp91_ = _tmp90_;
+	gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp66_, gtk_range_get_type (), GtkRange), (gdouble) _tmp68_);
+#line 2568 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	_tmp69_ = self->priv->transformations;
+#line 2568 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	_tmp70_ = pixel_transformation_bundle_get_transformation (_tmp69_, PIXEL_TRANSFORMATION_TYPE_CONTRAST);
+#line 2568 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	contrast_trans = G_TYPE_CHECK_INSTANCE_CAST (_tmp70_, TYPE_CONTRAST_TRANSFORMATION, ContrastTransformation);
+#line 2570 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	_tmp71_ = self->priv->histogram_transformer;
+#line 2570 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	_tmp72_ = contrast_trans;
+#line 2570 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	pixel_transformer_attach_transformation (_tmp71_, G_TYPE_CHECK_INSTANCE_CAST (_tmp72_, TYPE_PIXEL_TRANSFORMATION, PixelTransformation));
 #line 2571 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	if ((_tmp88_ * _tmp91_) > 8192) {
-#line 15468 "EditingTools.c"
-		GdkPixbuf* _tmp92_ = NULL;
-		gint _tmp93_ = 0;
-		gint _tmp94_ = 0;
+	_tmp73_ = self->priv->adjust_tool_window;
 #line 2571 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp92_ = self->priv->draw_to_pixbuf;
+	_tmp74_ = _tmp73_->contrast_slider;
 #line 2571 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp93_ = gdk_pixbuf_get_width (_tmp92_);
+	_tmp75_ = contrast_trans;
 #line 2571 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp94_ = _tmp93_;
+	_tmp76_ = contrast_transformation_get_parameter (_tmp75_);
 #line 2571 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp85_ = _tmp94_ > 1;
-#line 15480 "EditingTools.c"
+	gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp74_, gtk_range_get_type (), GtkRange), (gdouble) _tmp76_);
+#line 2573 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	_tmp77_ = canvas;
+#line 2573 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	editing_tools_adjust_tool_bind_canvas_handlers (self, _tmp77_);
+#line 2574 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	editing_tools_adjust_tool_bind_window_handlers (self);
+#line 2576 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	_tmp78_ = canvas;
+#line 2576 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	_tmp79_ = editing_tools_photo_canvas_get_scaled_pixbuf (_tmp78_);
+#line 2576 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	_tmp80_ = _tmp79_;
+#line 2576 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	_tmp81_ = gdk_pixbuf_copy (_tmp80_);
+#line 2576 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	_g_object_unref0 (self->priv->draw_to_pixbuf);
+#line 2576 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	self->priv->draw_to_pixbuf = _tmp81_;
+#line 2576 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	_g_object_unref0 (_tmp80_);
+#line 2577 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	_tmp82_ = canvas;
+#line 2577 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	_tmp83_ = editing_tools_photo_canvas_get_scaled_pixbuf (_tmp82_);
+#line 2577 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	_tmp84_ = _tmp83_;
+#line 2577 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	editing_tools_adjust_tool_init_fp_pixel_cache (self, _tmp84_);
+#line 2577 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	_g_object_unref0 (_tmp84_);
+#line 2583 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	_tmp86_ = self->priv->draw_to_pixbuf;
+#line 2583 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	_tmp87_ = gdk_pixbuf_get_width (_tmp86_);
+#line 2583 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	_tmp88_ = _tmp87_;
+#line 2583 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	if (_tmp88_ == 1) {
+#line 15484 "EditingTools.c"
+		GdkPixbuf* _tmp89_ = NULL;
+		gint _tmp90_ = 0;
+		gint _tmp91_ = 0;
+#line 2583 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+		_tmp89_ = self->priv->draw_to_pixbuf;
+#line 2583 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+		_tmp90_ = gdk_pixbuf_get_height (_tmp89_);
+#line 2583 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+		_tmp91_ = _tmp90_;
+#line 2583 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+		_tmp85_ = _tmp91_ == 1;
+#line 15496 "EditingTools.c"
 	} else {
-#line 2571 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2583 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp85_ = FALSE;
-#line 15484 "EditingTools.c"
+#line 15500 "EditingTools.c"
 	}
-#line 2571 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2583 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp85_) {
-#line 15488 "EditingTools.c"
-		GdkPixbuf* _tmp95_ = NULL;
-		gint _tmp96_ = 0;
-		gint _tmp97_ = 0;
-#line 2572 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp95_ = self->priv->draw_to_pixbuf;
-#line 2572 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp96_ = gdk_pixbuf_get_height (_tmp95_);
-#line 2572 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp97_ = _tmp96_;
-#line 2572 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp84_ = _tmp97_ > 1;
-#line 15500 "EditingTools.c"
-	} else {
-#line 2571 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp84_ = FALSE;
-#line 15504 "EditingTools.c"
+#line 2584 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+		self->priv->disable_histogram_refresh = TRUE;
+#line 15506 "EditingTools.c"
 	}
-#line 2571 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	if (_tmp84_) {
-#line 15508 "EditingTools.c"
-		GdkPixbuf* _tmp98_ = NULL;
-		GdkPixbuf* _tmp99_ = NULL;
-		gint _tmp100_ = 0;
+#line 2589 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	_tmp94_ = self->priv->draw_to_pixbuf;
+#line 2589 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	_tmp95_ = gdk_pixbuf_get_width (_tmp94_);
+#line 2589 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	_tmp96_ = _tmp95_;
+#line 2589 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	_tmp97_ = self->priv->draw_to_pixbuf;
+#line 2589 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	_tmp98_ = gdk_pixbuf_get_height (_tmp97_);
+#line 2589 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	_tmp99_ = _tmp98_;
+#line 2589 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	if ((_tmp96_ * _tmp99_) > 8192) {
+#line 15522 "EditingTools.c"
+		GdkPixbuf* _tmp100_ = NULL;
 		gint _tmp101_ = 0;
-		GdkPixbuf* _tmp102_ = NULL;
-		gint _tmp103_ = 0;
+		gint _tmp102_ = 0;
+#line 2589 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+		_tmp100_ = self->priv->draw_to_pixbuf;
+#line 2589 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+		_tmp101_ = gdk_pixbuf_get_width (_tmp100_);
+#line 2589 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+		_tmp102_ = _tmp101_;
+#line 2589 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+		_tmp93_ = _tmp102_ > 1;
+#line 15534 "EditingTools.c"
+	} else {
+#line 2589 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+		_tmp93_ = FALSE;
+#line 15538 "EditingTools.c"
+	}
+#line 2589 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	if (_tmp93_) {
+#line 15542 "EditingTools.c"
+		GdkPixbuf* _tmp103_ = NULL;
 		gint _tmp104_ = 0;
-		GdkPixbuf* _tmp105_ = NULL;
-#line 2573 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp98_ = self->priv->draw_to_pixbuf;
-#line 2573 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp99_ = self->priv->draw_to_pixbuf;
-#line 2573 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp100_ = gdk_pixbuf_get_width (_tmp99_);
-#line 2573 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp101_ = _tmp100_;
-#line 2573 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp102_ = self->priv->draw_to_pixbuf;
-#line 2573 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp103_ = gdk_pixbuf_get_height (_tmp102_);
-#line 2573 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp104_ = _tmp103_;
-#line 2573 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp105_ = gdk_pixbuf_scale_simple (_tmp98_, _tmp101_ / 2, _tmp104_ / 2, GDK_INTERP_HYPER);
-#line 2573 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_g_object_unref0 (self->priv->histogram_pixbuf);
-#line 2573 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		self->priv->histogram_pixbuf = _tmp105_;
-#line 15537 "EditingTools.c"
+		gint _tmp105_ = 0;
+#line 2590 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+		_tmp103_ = self->priv->draw_to_pixbuf;
+#line 2590 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+		_tmp104_ = gdk_pixbuf_get_height (_tmp103_);
+#line 2590 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+		_tmp105_ = _tmp104_;
+#line 2590 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+		_tmp92_ = _tmp105_ > 1;
+#line 15554 "EditingTools.c"
 	} else {
+#line 2589 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+		_tmp92_ = FALSE;
+#line 15558 "EditingTools.c"
+	}
+#line 2589 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	if (_tmp92_) {
+#line 15562 "EditingTools.c"
 		GdkPixbuf* _tmp106_ = NULL;
 		GdkPixbuf* _tmp107_ = NULL;
-#line 2576 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+		gint _tmp108_ = 0;
+		gint _tmp109_ = 0;
+		GdkPixbuf* _tmp110_ = NULL;
+		gint _tmp111_ = 0;
+		gint _tmp112_ = 0;
+		GdkPixbuf* _tmp113_ = NULL;
+#line 2591 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp106_ = self->priv->draw_to_pixbuf;
-#line 2576 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp107_ = gdk_pixbuf_copy (_tmp106_);
-#line 2576 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2591 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+		_tmp107_ = self->priv->draw_to_pixbuf;
+#line 2591 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+		_tmp108_ = gdk_pixbuf_get_width (_tmp107_);
+#line 2591 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+		_tmp109_ = _tmp108_;
+#line 2591 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+		_tmp110_ = self->priv->draw_to_pixbuf;
+#line 2591 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+		_tmp111_ = gdk_pixbuf_get_height (_tmp110_);
+#line 2591 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+		_tmp112_ = _tmp111_;
+#line 2591 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+		_tmp113_ = gdk_pixbuf_scale_simple (_tmp106_, _tmp109_ / 2, _tmp112_ / 2, GDK_INTERP_HYPER);
+#line 2591 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_object_unref0 (self->priv->histogram_pixbuf);
-#line 2576 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		self->priv->histogram_pixbuf = _tmp107_;
-#line 15549 "EditingTools.c"
+#line 2591 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+		self->priv->histogram_pixbuf = _tmp113_;
+#line 15591 "EditingTools.c"
+	} else {
+		GdkPixbuf* _tmp114_ = NULL;
+		GdkPixbuf* _tmp115_ = NULL;
+#line 2594 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+		_tmp114_ = self->priv->draw_to_pixbuf;
+#line 2594 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+		_tmp115_ = gdk_pixbuf_copy (_tmp114_);
+#line 2594 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+		_g_object_unref0 (self->priv->histogram_pixbuf);
+#line 2594 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+		self->priv->histogram_pixbuf = _tmp115_;
+#line 15603 "EditingTools.c"
 	}
-#line 2578 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp108_ = self->priv->histogram_pixbuf;
-#line 2578 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp109_ = gdk_pixbuf_copy (_tmp108_);
-#line 2578 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2596 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	_tmp116_ = self->priv->histogram_pixbuf;
+#line 2596 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	_tmp117_ = gdk_pixbuf_copy (_tmp116_);
+#line 2596 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->priv->virgin_histogram_pixbuf);
-#line 2578 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	self->priv->virgin_histogram_pixbuf = _tmp109_;
-#line 2580 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp110_ = canvas;
-#line 2580 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp111_ = editing_tools_photo_canvas_get_photo (_tmp110_);
-#line 2580 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp112_ = _tmp111_;
-#line 2580 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp113_ = data_object_get_membership (G_TYPE_CHECK_INSTANCE_CAST (_tmp112_, TYPE_DATA_OBJECT, DataObject));
-#line 2580 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp114_ = _tmp113_;
-#line 2580 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_g_object_unref0 (_tmp112_);
-#line 2580 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	owner = _tmp114_;
-#line 2581 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp115_ = owner;
-#line 2581 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	if (_tmp115_ != NULL) {
-#line 15577 "EditingTools.c"
-		DataCollection* _tmp116_ = NULL;
-#line 2582 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp116_ = owner;
-#line 2582 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		g_signal_connect (_tmp116_, "items-altered", (GCallback) _editing_tools_adjust_tool_on_photos_altered_data_collection_items_altered, self);
-#line 15583 "EditingTools.c"
+#line 2596 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	self->priv->virgin_histogram_pixbuf = _tmp117_;
+#line 2598 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	_tmp118_ = canvas;
+#line 2598 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	_tmp119_ = editing_tools_photo_canvas_get_photo (_tmp118_);
+#line 2598 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	_tmp120_ = _tmp119_;
+#line 2598 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	_tmp121_ = data_object_get_membership (G_TYPE_CHECK_INSTANCE_CAST (_tmp120_, TYPE_DATA_OBJECT, DataObject));
+#line 2598 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	_tmp122_ = _tmp121_;
+#line 2598 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	_g_object_unref0 (_tmp120_);
+#line 2598 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	owner = _tmp122_;
+#line 2599 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	_tmp123_ = owner;
+#line 2599 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	if (_tmp123_ != NULL) {
+#line 15631 "EditingTools.c"
+		DataCollection* _tmp124_ = NULL;
+#line 2600 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+		_tmp124_ = owner;
+#line 2600 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+		g_signal_connect (_tmp124_, "items-altered", (GCallback) _editing_tools_adjust_tool_on_photos_altered_data_collection_items_altered, self);
+#line 15637 "EditingTools.c"
 	}
-#line 2584 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp117_ = canvas;
-#line 2584 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	EDITING_TOOLS_EDITING_TOOL_CLASS (editing_tools_adjust_tool_parent_class)->activate (G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool), _tmp117_);
-#line 2502 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2602 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	_tmp125_ = canvas;
+#line 2602 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	EDITING_TOOLS_EDITING_TOOL_CLASS (editing_tools_adjust_tool_parent_class)->activate (G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool), _tmp125_);
+#line 2514 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_data_collection_unref0 (owner);
-#line 2502 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2514 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	_pixel_transformation_unref0 (contrast_trans);
+#line 2514 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_pixel_transformation_unref0 (exposure_trans);
-#line 2502 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2514 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_pixel_transformation_unref0 (sat_trans);
-#line 2502 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2514 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_pixel_transformation_unref0 (tint_trans);
-#line 2502 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2514 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_pixel_transformation_unref0 (temp_trans);
-#line 2502 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2514 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_pixel_transformation_unref0 (highlights_trans);
-#line 2502 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2514 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_pixel_transformation_unref0 (shadows_trans);
-#line 2502 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2514 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_pixel_transformation_unref0 (expansion_trans);
-#line 2502 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2514 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (photo);
-#line 15607 "EditingTools.c"
+#line 15663 "EditingTools.c"
 }
 
 
@@ -15612,17 +15668,17 @@ static EditingToolsEditingToolWindow* editing_tools_adjust_tool_real_get_tool_wi
 	EditingToolsEditingToolWindow* result = NULL;
 	EditingToolsAdjustToolAdjustToolWindow* _tmp0_ = NULL;
 	EditingToolsEditingToolWindow* _tmp1_ = NULL;
-#line 2587 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2605 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_ADJUST_TOOL, EditingToolsAdjustTool);
-#line 2588 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2606 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->adjust_tool_window;
-#line 2588 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2606 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, EDITING_TOOLS_TYPE_EDITING_TOOL_WINDOW, EditingToolsEditingToolWindow));
-#line 2588 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2606 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	result = _tmp1_;
-#line 2588 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2606 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 15626 "EditingTools.c"
+#line 15682 "EditingTools.c"
 }
 
 
@@ -15630,13 +15686,13 @@ static void editing_tools_adjust_tool_real_deactivate (EditingToolsEditingTool*
 	EditingToolsAdjustTool * self;
 	EditingToolsPhotoCanvas* _tmp0_ = NULL;
 	EditingToolsAdjustToolAdjustToolWindow* _tmp10_ = NULL;
-#line 2591 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2609 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_ADJUST_TOOL, EditingToolsAdjustTool);
-#line 2592 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2610 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 2592 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2610 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp0_ != NULL) {
-#line 15640 "EditingTools.c"
+#line 15696 "EditingTools.c"
 		DataCollection* owner = NULL;
 		EditingToolsPhotoCanvas* _tmp1_ = NULL;
 		Photo* _tmp2_ = NULL;
@@ -15645,81 +15701,81 @@ static void editing_tools_adjust_tool_real_deactivate (EditingToolsEditingTool*
 		DataCollection* _tmp5_ = NULL;
 		DataCollection* _tmp6_ = NULL;
 		EditingToolsPhotoCanvas* _tmp9_ = NULL;
-#line 2593 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2611 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp1_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 2593 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2611 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp2_ = editing_tools_photo_canvas_get_photo (_tmp1_);
-#line 2593 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2611 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp3_ = _tmp2_;
-#line 2593 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2611 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp4_ = data_object_get_membership (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_DATA_OBJECT, DataObject));
-#line 2593 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2611 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp5_ = _tmp4_;
-#line 2593 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2611 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_object_unref0 (_tmp3_);
-#line 2593 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2611 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		owner = _tmp5_;
-#line 2594 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2612 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp6_ = owner;
-#line 2594 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2612 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		if (_tmp6_ != NULL) {
-#line 15667 "EditingTools.c"
+#line 15723 "EditingTools.c"
 			DataCollection* _tmp7_ = NULL;
 			guint _tmp8_ = 0U;
-#line 2595 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2613 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp7_ = owner;
-#line 2595 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2613 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			g_signal_parse_name ("items-altered", TYPE_DATA_COLLECTION, &_tmp8_, NULL, FALSE);
-#line 2595 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2613 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			g_signal_handlers_disconnect_matched (_tmp7_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp8_, 0, NULL, (GCallback) _editing_tools_adjust_tool_on_photos_altered_data_collection_items_altered, self);
-#line 15676 "EditingTools.c"
+#line 15732 "EditingTools.c"
 		}
-#line 2597 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2615 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp9_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 2597 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2615 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_adjust_tool_unbind_canvas_handlers (self, _tmp9_);
-#line 2592 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2610 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_data_collection_unref0 (owner);
-#line 15684 "EditingTools.c"
+#line 15740 "EditingTools.c"
 	}
-#line 2600 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2618 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp10_ = self->priv->adjust_tool_window;
-#line 2600 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2618 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp10_ != NULL) {
-#line 15690 "EditingTools.c"
+#line 15746 "EditingTools.c"
 		EditingToolsAdjustToolAdjustToolWindow* _tmp11_ = NULL;
 		EditingToolsAdjustToolAdjustToolWindow* _tmp12_ = NULL;
-#line 2601 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2619 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_adjust_tool_unbind_window_handlers (self);
-#line 2602 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2620 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp11_ = self->priv->adjust_tool_window;
-#line 2602 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2620 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_widget_get_type (), GtkWidget));
-#line 2603 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2621 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp12_ = self->priv->adjust_tool_window;
-#line 2603 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2621 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_widget_get_type (), GtkWidget));
-#line 2604 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2622 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_object_unref0 (self->priv->adjust_tool_window);
-#line 2604 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2622 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		self->priv->adjust_tool_window = NULL;
-#line 15707 "EditingTools.c"
+#line 15763 "EditingTools.c"
 	}
-#line 2607 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2625 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->priv->draw_to_pixbuf);
-#line 2607 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2625 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->draw_to_pixbuf = NULL;
-#line 2608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2626 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->fp_pixel_cache = (g_free (self->priv->fp_pixel_cache), NULL);
-#line 2608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2626 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->fp_pixel_cache = NULL;
-#line 2608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2626 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->fp_pixel_cache_length1 = 0;
-#line 2608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2626 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->_fp_pixel_cache_size_ = self->priv->fp_pixel_cache_length1;
-#line 2610 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2628 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	EDITING_TOOLS_EDITING_TOOL_CLASS (editing_tools_adjust_tool_parent_class)->deactivate (G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool));
-#line 15723 "EditingTools.c"
+#line 15779 "EditingTools.c"
 }
 
 
@@ -15728,61 +15784,61 @@ static void editing_tools_adjust_tool_real_paint (EditingToolsEditingTool* base,
 	gboolean _tmp0_ = FALSE;
 	EditingToolsPhotoCanvas* _tmp10_ = NULL;
 	GdkPixbuf* _tmp11_ = NULL;
-#line 2613 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2631 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_ADJUST_TOOL, EditingToolsAdjustTool);
-#line 2613 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2631 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (ctx != NULL);
-#line 2614 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2632 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->suppress_effect_redraw;
-#line 2614 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2632 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (!_tmp0_) {
-#line 15740 "EditingTools.c"
+#line 15796 "EditingTools.c"
 		PixelTransformer* _tmp1_ = NULL;
 		GdkPixbuf* _tmp2_ = NULL;
 		PixelTransformer* _tmp3_ = NULL;
 		GdkPixbuf* _tmp4_ = NULL;
 		GdkPixbuf* _tmp5_ = NULL;
 		gboolean _tmp6_ = FALSE;
-#line 2615 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2633 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp1_ = self->priv->transformer;
-#line 2615 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2633 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp2_ = self->priv->draw_to_pixbuf;
-#line 2615 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2633 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		pixel_transformer_transform_from_fp (_tmp1_, &self->priv->fp_pixel_cache, &self->priv->fp_pixel_cache_length1, _tmp2_);
-#line 2616 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2634 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp3_ = self->priv->histogram_transformer;
-#line 2616 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2634 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp4_ = self->priv->virgin_histogram_pixbuf;
-#line 2616 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2634 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp5_ = self->priv->histogram_pixbuf;
-#line 2616 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2634 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		pixel_transformer_transform_to_other_pixbuf (_tmp3_, _tmp4_, _tmp5_, NULL);
-#line 2618 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2636 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp6_ = self->priv->disable_histogram_refresh;
-#line 2618 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2636 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		if (!_tmp6_) {
-#line 15765 "EditingTools.c"
+#line 15821 "EditingTools.c"
 			EditingToolsAdjustToolAdjustToolWindow* _tmp7_ = NULL;
 			RGBHistogramManipulator* _tmp8_ = NULL;
 			GdkPixbuf* _tmp9_ = NULL;
-#line 2619 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2637 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp7_ = self->priv->adjust_tool_window;
-#line 2619 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2637 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp8_ = _tmp7_->histogram_manipulator;
-#line 2619 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2637 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp9_ = self->priv->histogram_pixbuf;
-#line 2619 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2637 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			rgb_histogram_manipulator_update_histogram (_tmp8_, _tmp9_);
-#line 15777 "EditingTools.c"
+#line 15833 "EditingTools.c"
 		}
 	}
-#line 2622 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2640 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp10_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 2622 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2640 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp11_ = self->priv->draw_to_pixbuf;
-#line 2622 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2640 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_photo_canvas_paint_pixbuf (_tmp10_, _tmp11_);
-#line 15786 "EditingTools.c"
+#line 15842 "EditingTools.c"
 }
 
 
@@ -15800,71 +15856,71 @@ static GdkPixbuf* editing_tools_adjust_tool_real_get_display_pixbuf (EditingTool
 	GdkPixbuf* _tmp7_ = NULL;
 	GdkPixbuf* _tmp8_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 2625 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2643 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_ADJUST_TOOL, EditingToolsAdjustTool);
-#line 2625 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2643 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (scaling != NULL, NULL);
-#line 2625 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2643 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (IS_PHOTO (photo), NULL);
-#line 2627 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2645 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = photo;
-#line 2627 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2645 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = photo_has_color_adjustments (_tmp0_);
-#line 2627 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2645 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (!_tmp1_) {
-#line 2628 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2646 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		dimensions_init (&_vala_max_dim, 0, 0);
-#line 2630 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2648 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		result = NULL;
-#line 2630 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2648 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		if (max_dim) {
-#line 2630 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2648 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			*max_dim = _vala_max_dim;
-#line 15824 "EditingTools.c"
+#line 15880 "EditingTools.c"
 		}
-#line 2630 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2648 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return result;
-#line 15828 "EditingTools.c"
+#line 15884 "EditingTools.c"
 	}
-#line 2633 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2651 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = photo;
-#line 2633 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2651 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_NONE, &_tmp3_);
-#line 2633 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2651 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_vala_max_dim = _tmp3_;
-#line 2635 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2653 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = photo;
-#line 2635 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2653 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = *scaling;
-#line 2635 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2653 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7_ = photo_get_pixbuf_with_options (_tmp5_, &_tmp6_, PHOTO_EXCEPTION_ADJUST, BACKING_FETCH_MODE_BASELINE, &_inner_error_);
-#line 2635 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2653 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = _tmp7_;
-#line 2635 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2653 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2635 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2653 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		g_propagate_error (error, _inner_error_);
-#line 2635 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2653 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return NULL;
-#line 15850 "EditingTools.c"
+#line 15906 "EditingTools.c"
 	}
-#line 2635 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2653 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp8_ = _tmp4_;
-#line 2635 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2653 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = NULL;
-#line 2635 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2653 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	result = _tmp8_;
-#line 2635 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2653 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (_tmp4_);
-#line 2635 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2653 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (max_dim) {
-#line 2635 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2653 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*max_dim = _vala_max_dim;
-#line 15864 "EditingTools.c"
+#line 15920 "EditingTools.c"
 	}
-#line 2635 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2653 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 15868 "EditingTools.c"
+#line 15924 "EditingTools.c"
 }
 
 
@@ -15874,25 +15930,25 @@ static void editing_tools_adjust_tool_on_reset (EditingToolsAdjustTool* self) {
 	EditingToolsAdjustToolAdjustResetCommand* _tmp1_ = NULL;
 	CommandManager* _tmp2_ = NULL;
 	CommandManager* _tmp3_ = NULL;
-#line 2638 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2656 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
-#line 2639 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2657 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->transformations;
-#line 2639 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2657 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = editing_tools_adjust_tool_adjust_reset_command_new (self, _tmp0_);
-#line 2639 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2657 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	command = _tmp1_;
-#line 2640 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2658 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = app_window_get_command_manager ();
-#line 2640 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2658 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = _tmp2_;
-#line 2640 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2658 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	command_manager_execute (_tmp3_, G_TYPE_CHECK_INSTANCE_CAST (command, TYPE_COMMAND, Command));
-#line 2640 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2658 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_command_manager_unref0 (_tmp3_);
-#line 2638 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2656 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (command);
-#line 15896 "EditingTools.c"
+#line 15952 "EditingTools.c"
 }
 
 
@@ -15910,58 +15966,58 @@ static void editing_tools_adjust_tool_on_ok (EditingToolsAdjustTool* self) {
 	Photo* _tmp10_ = NULL;
 	Photo* _tmp11_ = NULL;
 	Dimensions _tmp12_ = {0};
-#line 2643 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2661 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
-#line 2644 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2662 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->suppress_effect_redraw = TRUE;
-#line 2646 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2664 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = editing_tools_editing_tool_get_tool_window (G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool));
-#line 2646 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2664 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = _tmp0_;
-#line 2646 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2664 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_widget_get_type (), GtkWidget));
-#line 2646 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2664 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (_tmp1_);
-#line 2648 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2666 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 2648 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2666 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = editing_tools_photo_canvas_get_photo (_tmp2_);
-#line 2648 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2666 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = _tmp3_;
-#line 2648 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2666 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = self->priv->transformations;
-#line 2648 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2666 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = adjust_colors_single_command_new (_tmp4_, _tmp5_, RESOURCES_ADJUST_LABEL, RESOURCES_ADJUST_TOOLTIP);
-#line 2648 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2666 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7_ = _tmp6_;
-#line 2648 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2666 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp8_ = self->priv->draw_to_pixbuf;
-#line 2648 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2666 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp9_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 2648 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2666 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp10_ = editing_tools_photo_canvas_get_photo (_tmp9_);
-#line 2648 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2666 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp11_ = _tmp10_;
-#line 2648 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2666 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_NONE, &_tmp12_);
-#line 2648 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2666 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool), "applied", G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_COMMAND, Command), _tmp8_, &_tmp12_, FALSE);
-#line 2648 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2666 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (_tmp11_);
-#line 2648 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2666 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (_tmp7_);
-#line 2648 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2666 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (_tmp4_);
-#line 15956 "EditingTools.c"
+#line 16012 "EditingTools.c"
 }
 
 
 static void editing_tools_adjust_tool_update_transformations (EditingToolsAdjustTool* self, PixelTransformationBundle* new_transformations) {
-#line 2653 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2671 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
-#line 2653 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2671 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (IS_PIXEL_TRANSFORMATION_BUNDLE (new_transformations));
-#line 15965 "EditingTools.c"
+#line 16021 "EditingTools.c"
 	{
 		GeeIterator* _transformation_it = NULL;
 		PixelTransformationBundle* _tmp0_ = NULL;
@@ -15969,56 +16025,56 @@ static void editing_tools_adjust_tool_update_transformations (EditingToolsAdjust
 		GeeIterable* _tmp2_ = NULL;
 		GeeIterator* _tmp3_ = NULL;
 		GeeIterator* _tmp4_ = NULL;
-#line 2654 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2672 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp0_ = new_transformations;
-#line 2654 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2672 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp1_ = pixel_transformation_bundle_get_transformations (_tmp0_);
-#line 2654 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2672 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp2_ = _tmp1_;
-#line 2654 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2672 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp3_ = gee_iterable_iterator (_tmp2_);
-#line 2654 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2672 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp4_ = _tmp3_;
-#line 2654 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2672 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_object_unref0 (_tmp2_);
-#line 2654 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2672 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_transformation_it = _tmp4_;
-#line 2654 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2672 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		while (TRUE) {
-#line 15989 "EditingTools.c"
+#line 16045 "EditingTools.c"
 			GeeIterator* _tmp5_ = NULL;
 			gboolean _tmp6_ = FALSE;
 			PixelTransformation* transformation = NULL;
 			GeeIterator* _tmp7_ = NULL;
 			gpointer _tmp8_ = NULL;
 			PixelTransformation* _tmp9_ = NULL;
-#line 2654 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2672 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp5_ = _transformation_it;
-#line 2654 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2672 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp6_ = gee_iterator_next (_tmp5_);
-#line 2654 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2672 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			if (!_tmp6_) {
-#line 2654 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2672 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				break;
-#line 16004 "EditingTools.c"
+#line 16060 "EditingTools.c"
 			}
-#line 2654 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2672 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp7_ = _transformation_it;
-#line 2654 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2672 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp8_ = gee_iterator_get (_tmp7_);
-#line 2654 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2672 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			transformation = (PixelTransformation*) _tmp8_;
-#line 2655 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2673 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp9_ = transformation;
-#line 2655 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2673 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			editing_tools_adjust_tool_update_transformation (self, _tmp9_);
-#line 2654 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2672 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_pixel_transformation_unref0 (transformation);
-#line 16018 "EditingTools.c"
+#line 16074 "EditingTools.c"
 		}
-#line 2654 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2672 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_object_unref0 (_transformation_it);
-#line 16022 "EditingTools.c"
+#line 16078 "EditingTools.c"
 	}
 }
 
@@ -16036,57 +16092,57 @@ static void editing_tools_adjust_tool_update_transformation (EditingToolsAdjustT
 	PixelTransformationType _tmp8_ = 0;
 	PixelTransformationBundle* _tmp12_ = NULL;
 	PixelTransformation* _tmp13_ = NULL;
-#line 2658 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2676 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
-#line 2658 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2676 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (IS_PIXEL_TRANSFORMATION (new_transformation));
-#line 2659 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2677 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->transformations;
-#line 2659 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2677 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = new_transformation;
-#line 2659 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2677 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = pixel_transformation_get_transformation_type (_tmp1_);
-#line 2659 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2677 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = pixel_transformation_bundle_get_transformation (_tmp0_, _tmp2_);
-#line 2659 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2677 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	old_transformation = _tmp3_;
-#line 2662 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2680 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = self->priv->transformer;
-#line 2662 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2680 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = old_transformation;
-#line 2662 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2680 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = new_transformation;
-#line 2662 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2680 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	pixel_transformer_replace_transformation (_tmp4_, _tmp5_, _tmp6_);
-#line 2663 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2681 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7_ = new_transformation;
-#line 2663 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2681 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp8_ = pixel_transformation_get_transformation_type (_tmp7_);
-#line 2663 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2681 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp8_ != PIXEL_TRANSFORMATION_TYPE_TONE_EXPANSION) {
-#line 16068 "EditingTools.c"
+#line 16124 "EditingTools.c"
 		PixelTransformer* _tmp9_ = NULL;
 		PixelTransformation* _tmp10_ = NULL;
 		PixelTransformation* _tmp11_ = NULL;
-#line 2664 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2682 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp9_ = self->priv->histogram_transformer;
-#line 2664 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2682 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp10_ = old_transformation;
-#line 2664 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2682 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp11_ = new_transformation;
-#line 2664 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2682 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		pixel_transformer_replace_transformation (_tmp9_, _tmp10_, _tmp11_);
-#line 16080 "EditingTools.c"
+#line 16136 "EditingTools.c"
 	}
-#line 2666 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2684 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp12_ = self->priv->transformations;
-#line 2666 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2684 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp13_ = new_transformation;
-#line 2666 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2684 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	pixel_transformation_bundle_set (_tmp12_, _tmp13_);
-#line 2658 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2676 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_pixel_transformation_unref0 (old_transformation);
-#line 16090 "EditingTools.c"
+#line 16146 "EditingTools.c"
 }
 
 
@@ -16102,77 +16158,77 @@ static void editing_tools_adjust_tool_slider_updated (EditingToolsAdjustTool* se
 	EditingToolsAdjustToolSliderAdjustmentCommand* _tmp6_ = NULL;
 	CommandManager* _tmp7_ = NULL;
 	CommandManager* _tmp8_ = NULL;
-#line 2669 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2687 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
-#line 2669 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2687 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (IS_PIXEL_TRANSFORMATION (new_transformation));
-#line 2669 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2687 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (name != NULL);
-#line 2670 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2688 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->transformations;
-#line 2670 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2688 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = new_transformation;
-#line 2670 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2688 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = pixel_transformation_get_transformation_type (_tmp1_);
-#line 2670 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2688 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = pixel_transformation_bundle_get_transformation (_tmp0_, _tmp2_);
-#line 2670 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2688 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	old_transformation = _tmp3_;
-#line 2672 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2690 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = new_transformation;
-#line 2672 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2690 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = name;
-#line 2672 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2690 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = editing_tools_adjust_tool_slider_adjustment_command_new (self, old_transformation, _tmp4_, _tmp5_);
-#line 2672 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2690 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	command = _tmp6_;
-#line 2674 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2692 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7_ = app_window_get_command_manager ();
-#line 2674 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2692 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp8_ = _tmp7_;
-#line 2674 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2692 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	command_manager_execute (_tmp8_, G_TYPE_CHECK_INSTANCE_CAST (command, TYPE_COMMAND, Command));
-#line 2674 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2692 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_command_manager_unref0 (_tmp8_);
-#line 2669 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2687 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (command);
-#line 2669 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2687 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_pixel_transformation_unref0 (old_transformation);
-#line 16142 "EditingTools.c"
+#line 16198 "EditingTools.c"
 }
 
 
 static void _editing_tools_adjust_tool_on_delayed_temperature_adjustment_one_shot_callback (gpointer self) {
-#line 2679 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2697 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_on_delayed_temperature_adjustment ((EditingToolsAdjustTool*) self);
-#line 16149 "EditingTools.c"
+#line 16205 "EditingTools.c"
 }
 
 
 static void editing_tools_adjust_tool_on_temperature_adjustment (EditingToolsAdjustTool* self) {
 	OneShotScheduler* _tmp0_ = NULL;
 	OneShotScheduler* _tmp2_ = NULL;
-#line 2677 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2695 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
-#line 2678 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2696 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->temperature_scheduler;
-#line 2678 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2696 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp0_ == NULL) {
-#line 16162 "EditingTools.c"
+#line 16218 "EditingTools.c"
 		OneShotScheduler* _tmp1_ = NULL;
-#line 2679 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2697 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp1_ = one_shot_scheduler_new ("temperature", _editing_tools_adjust_tool_on_delayed_temperature_adjustment_one_shot_callback, self);
-#line 2679 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2697 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_one_shot_scheduler_unref0 (self->priv->temperature_scheduler);
-#line 2679 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2697 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		self->priv->temperature_scheduler = _tmp1_;
-#line 16170 "EditingTools.c"
+#line 16226 "EditingTools.c"
 	}
-#line 2681 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2699 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = self->priv->temperature_scheduler;
-#line 2681 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2699 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	one_shot_scheduler_after_timeout (_tmp2_, EDITING_TOOLS_ADJUST_TOOL_SLIDER_DELAY_MSEC, TRUE);
-#line 16176 "EditingTools.c"
+#line 16232 "EditingTools.c"
 }
 
 
@@ -16183,59 +16239,59 @@ static void editing_tools_adjust_tool_on_delayed_temperature_adjustment (Editing
 	gdouble _tmp2_ = 0.0;
 	TemperatureTransformation* _tmp3_ = NULL;
 	const gchar* _tmp4_ = NULL;
-#line 2684 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2702 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
-#line 2685 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2703 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->adjust_tool_window;
-#line 2685 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2703 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = _tmp0_->temperature_slider;
-#line 2685 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2703 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = gtk_range_get_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_range_get_type (), GtkRange));
-#line 2685 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2703 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = temperature_transformation_new ((gfloat) _tmp2_);
-#line 2685 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2703 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	new_temp_trans = _tmp3_;
-#line 2687 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2705 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = _ ("Temperature");
-#line 2687 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2705 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_slider_updated (self, G_TYPE_CHECK_INSTANCE_CAST (new_temp_trans, TYPE_PIXEL_TRANSFORMATION, PixelTransformation), _tmp4_);
-#line 2684 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2702 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_pixel_transformation_unref0 (new_temp_trans);
-#line 16205 "EditingTools.c"
+#line 16261 "EditingTools.c"
 }
 
 
 static void _editing_tools_adjust_tool_on_delayed_tint_adjustment_one_shot_callback (gpointer self) {
-#line 2692 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2710 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_on_delayed_tint_adjustment ((EditingToolsAdjustTool*) self);
-#line 16212 "EditingTools.c"
+#line 16268 "EditingTools.c"
 }
 
 
 static void editing_tools_adjust_tool_on_tint_adjustment (EditingToolsAdjustTool* self) {
 	OneShotScheduler* _tmp0_ = NULL;
 	OneShotScheduler* _tmp2_ = NULL;
-#line 2690 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2708 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
-#line 2691 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2709 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->tint_scheduler;
-#line 2691 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2709 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp0_ == NULL) {
-#line 16225 "EditingTools.c"
+#line 16281 "EditingTools.c"
 		OneShotScheduler* _tmp1_ = NULL;
-#line 2692 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2710 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp1_ = one_shot_scheduler_new ("tint", _editing_tools_adjust_tool_on_delayed_tint_adjustment_one_shot_callback, self);
-#line 2692 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2710 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_one_shot_scheduler_unref0 (self->priv->tint_scheduler);
-#line 2692 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2710 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		self->priv->tint_scheduler = _tmp1_;
-#line 16233 "EditingTools.c"
+#line 16289 "EditingTools.c"
 	}
-#line 2694 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2711 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = self->priv->tint_scheduler;
-#line 2694 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2711 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	one_shot_scheduler_after_timeout (_tmp2_, EDITING_TOOLS_ADJUST_TOOL_SLIDER_DELAY_MSEC, TRUE);
-#line 16239 "EditingTools.c"
+#line 16295 "EditingTools.c"
 }
 
 
@@ -16246,59 +16302,122 @@ static void editing_tools_adjust_tool_on_delayed_tint_adjustment (EditingToolsAd
 	gdouble _tmp2_ = 0.0;
 	TintTransformation* _tmp3_ = NULL;
 	const gchar* _tmp4_ = NULL;
-#line 2697 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2714 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
-#line 2698 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2715 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->adjust_tool_window;
-#line 2698 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2715 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = _tmp0_->tint_slider;
-#line 2698 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2715 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = gtk_range_get_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_range_get_type (), GtkRange));
-#line 2698 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2715 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = tint_transformation_new ((gfloat) _tmp2_);
-#line 2698 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2715 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	new_tint_trans = _tmp3_;
-#line 2700 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2717 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = _ ("Tint");
-#line 2700 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2717 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_slider_updated (self, G_TYPE_CHECK_INSTANCE_CAST (new_tint_trans, TYPE_PIXEL_TRANSFORMATION, PixelTransformation), _tmp4_);
-#line 2697 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2714 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_pixel_transformation_unref0 (new_tint_trans);
-#line 16268 "EditingTools.c"
+#line 16324 "EditingTools.c"
+}
+
+
+static void _editing_tools_adjust_tool_on_delayed_contrast_adjustment_one_shot_callback (gpointer self) {
+#line 2722 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	editing_tools_adjust_tool_on_delayed_contrast_adjustment ((EditingToolsAdjustTool*) self);
+#line 16331 "EditingTools.c"
+}
+
+
+static void editing_tools_adjust_tool_on_contrast_adjustment (EditingToolsAdjustTool* self) {
+	OneShotScheduler* _tmp0_ = NULL;
+	OneShotScheduler* _tmp2_ = NULL;
+#line 2720 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
+#line 2721 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	_tmp0_ = self->priv->contrast_scheduler;
+#line 2721 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	if (_tmp0_ == NULL) {
+#line 16344 "EditingTools.c"
+		OneShotScheduler* _tmp1_ = NULL;
+#line 2722 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+		_tmp1_ = one_shot_scheduler_new ("contrast", _editing_tools_adjust_tool_on_delayed_contrast_adjustment_one_shot_callback, self);
+#line 2722 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+		_one_shot_scheduler_unref0 (self->priv->contrast_scheduler);
+#line 2722 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+		self->priv->contrast_scheduler = _tmp1_;
+#line 16352 "EditingTools.c"
+	}
+#line 2723 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	_tmp2_ = self->priv->contrast_scheduler;
+#line 2723 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	one_shot_scheduler_after_timeout (_tmp2_, EDITING_TOOLS_ADJUST_TOOL_SLIDER_DELAY_MSEC, TRUE);
+#line 16358 "EditingTools.c"
+}
+
+
+static void editing_tools_adjust_tool_on_delayed_contrast_adjustment (EditingToolsAdjustTool* self) {
+	ContrastTransformation* new_exp_trans = NULL;
+	EditingToolsAdjustToolAdjustToolWindow* _tmp0_ = NULL;
+	GtkHScale* _tmp1_ = NULL;
+	gdouble _tmp2_ = 0.0;
+	ContrastTransformation* _tmp3_ = NULL;
+	const gchar* _tmp4_ = NULL;
+#line 2726 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
+#line 2727 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	_tmp0_ = self->priv->adjust_tool_window;
+#line 2727 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	_tmp1_ = _tmp0_->contrast_slider;
+#line 2727 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	_tmp2_ = gtk_range_get_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_range_get_type (), GtkRange));
+#line 2727 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	_tmp3_ = contrast_transformation_new ((gfloat) _tmp2_);
+#line 2727 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	new_exp_trans = _tmp3_;
+#line 2729 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	_tmp4_ = _ ("Contrast");
+#line 2729 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	editing_tools_adjust_tool_slider_updated (self, G_TYPE_CHECK_INSTANCE_CAST (new_exp_trans, TYPE_PIXEL_TRANSFORMATION, PixelTransformation), _tmp4_);
+#line 2726 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	_pixel_transformation_unref0 (new_exp_trans);
+#line 16387 "EditingTools.c"
 }
 
 
 static void _editing_tools_adjust_tool_on_delayed_saturation_adjustment_one_shot_callback (gpointer self) {
-#line 2705 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2735 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_on_delayed_saturation_adjustment ((EditingToolsAdjustTool*) self);
-#line 16275 "EditingTools.c"
+#line 16394 "EditingTools.c"
 }
 
 
 static void editing_tools_adjust_tool_on_saturation_adjustment (EditingToolsAdjustTool* self) {
 	OneShotScheduler* _tmp0_ = NULL;
 	OneShotScheduler* _tmp2_ = NULL;
-#line 2703 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2733 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
-#line 2704 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2734 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->saturation_scheduler;
-#line 2704 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2734 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp0_ == NULL) {
-#line 16288 "EditingTools.c"
+#line 16407 "EditingTools.c"
 		OneShotScheduler* _tmp1_ = NULL;
-#line 2705 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2735 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp1_ = one_shot_scheduler_new ("saturation", _editing_tools_adjust_tool_on_delayed_saturation_adjustment_one_shot_callback, self);
-#line 2705 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2735 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_one_shot_scheduler_unref0 (self->priv->saturation_scheduler);
-#line 2705 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2735 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		self->priv->saturation_scheduler = _tmp1_;
-#line 16296 "EditingTools.c"
+#line 16415 "EditingTools.c"
 	}
-#line 2707 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2737 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = self->priv->saturation_scheduler;
-#line 2707 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2737 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	one_shot_scheduler_after_timeout (_tmp2_, EDITING_TOOLS_ADJUST_TOOL_SLIDER_DELAY_MSEC, TRUE);
-#line 16302 "EditingTools.c"
+#line 16421 "EditingTools.c"
 }
 
 
@@ -16309,59 +16428,59 @@ static void editing_tools_adjust_tool_on_delayed_saturation_adjustment (EditingT
 	gdouble _tmp2_ = 0.0;
 	SaturationTransformation* _tmp3_ = NULL;
 	const gchar* _tmp4_ = NULL;
-#line 2710 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2740 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
-#line 2711 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2741 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->adjust_tool_window;
-#line 2711 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2741 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = _tmp0_->saturation_slider;
-#line 2711 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2741 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = gtk_range_get_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_range_get_type (), GtkRange));
-#line 2711 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2741 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = saturation_transformation_new ((gfloat) _tmp2_);
-#line 2711 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2741 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	new_sat_trans = _tmp3_;
-#line 2713 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2743 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = _ ("Saturation");
-#line 2713 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2743 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_slider_updated (self, G_TYPE_CHECK_INSTANCE_CAST (new_sat_trans, TYPE_PIXEL_TRANSFORMATION, PixelTransformation), _tmp4_);
-#line 2710 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2740 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_pixel_transformation_unref0 (new_sat_trans);
-#line 16331 "EditingTools.c"
+#line 16450 "EditingTools.c"
 }
 
 
 static void _editing_tools_adjust_tool_on_delayed_exposure_adjustment_one_shot_callback (gpointer self) {
-#line 2718 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2748 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_on_delayed_exposure_adjustment ((EditingToolsAdjustTool*) self);
-#line 16338 "EditingTools.c"
+#line 16457 "EditingTools.c"
 }
 
 
 static void editing_tools_adjust_tool_on_exposure_adjustment (EditingToolsAdjustTool* self) {
 	OneShotScheduler* _tmp0_ = NULL;
 	OneShotScheduler* _tmp2_ = NULL;
-#line 2716 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2746 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
-#line 2717 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2747 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->exposure_scheduler;
-#line 2717 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2747 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp0_ == NULL) {
-#line 16351 "EditingTools.c"
+#line 16470 "EditingTools.c"
 		OneShotScheduler* _tmp1_ = NULL;
-#line 2718 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2748 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp1_ = one_shot_scheduler_new ("exposure", _editing_tools_adjust_tool_on_delayed_exposure_adjustment_one_shot_callback, self);
-#line 2718 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2748 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_one_shot_scheduler_unref0 (self->priv->exposure_scheduler);
-#line 2718 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2748 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		self->priv->exposure_scheduler = _tmp1_;
-#line 16359 "EditingTools.c"
+#line 16478 "EditingTools.c"
 	}
-#line 2720 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2750 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = self->priv->exposure_scheduler;
-#line 2720 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2750 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	one_shot_scheduler_after_timeout (_tmp2_, EDITING_TOOLS_ADJUST_TOOL_SLIDER_DELAY_MSEC, TRUE);
-#line 16365 "EditingTools.c"
+#line 16484 "EditingTools.c"
 }
 
 
@@ -16372,59 +16491,59 @@ static void editing_tools_adjust_tool_on_delayed_exposure_adjustment (EditingToo
 	gdouble _tmp2_ = 0.0;
 	ExposureTransformation* _tmp3_ = NULL;
 	const gchar* _tmp4_ = NULL;
-#line 2723 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2753 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
-#line 2724 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2754 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->adjust_tool_window;
-#line 2724 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2754 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = _tmp0_->exposure_slider;
-#line 2724 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2754 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = gtk_range_get_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_range_get_type (), GtkRange));
-#line 2724 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2754 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = exposure_transformation_new ((gfloat) _tmp2_);
-#line 2724 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2754 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	new_exp_trans = _tmp3_;
-#line 2726 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2756 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = _ ("Exposure");
-#line 2726 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2756 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_slider_updated (self, G_TYPE_CHECK_INSTANCE_CAST (new_exp_trans, TYPE_PIXEL_TRANSFORMATION, PixelTransformation), _tmp4_);
-#line 2723 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2753 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_pixel_transformation_unref0 (new_exp_trans);
-#line 16394 "EditingTools.c"
+#line 16513 "EditingTools.c"
 }
 
 
 static void _editing_tools_adjust_tool_on_delayed_shadows_adjustment_one_shot_callback (gpointer self) {
-#line 2731 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2761 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_on_delayed_shadows_adjustment ((EditingToolsAdjustTool*) self);
-#line 16401 "EditingTools.c"
+#line 16520 "EditingTools.c"
 }
 
 
 static void editing_tools_adjust_tool_on_shadows_adjustment (EditingToolsAdjustTool* self) {
 	OneShotScheduler* _tmp0_ = NULL;
 	OneShotScheduler* _tmp2_ = NULL;
-#line 2729 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2759 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
-#line 2730 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2760 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->shadows_scheduler;
-#line 2730 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2760 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp0_ == NULL) {
-#line 16414 "EditingTools.c"
+#line 16533 "EditingTools.c"
 		OneShotScheduler* _tmp1_ = NULL;
-#line 2731 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2761 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp1_ = one_shot_scheduler_new ("shadows", _editing_tools_adjust_tool_on_delayed_shadows_adjustment_one_shot_callback, self);
-#line 2731 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2761 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_one_shot_scheduler_unref0 (self->priv->shadows_scheduler);
-#line 2731 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2761 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		self->priv->shadows_scheduler = _tmp1_;
-#line 16422 "EditingTools.c"
+#line 16541 "EditingTools.c"
 	}
-#line 2733 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2763 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = self->priv->shadows_scheduler;
-#line 2733 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2763 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	one_shot_scheduler_after_timeout (_tmp2_, EDITING_TOOLS_ADJUST_TOOL_SLIDER_DELAY_MSEC, TRUE);
-#line 16428 "EditingTools.c"
+#line 16547 "EditingTools.c"
 }
 
 
@@ -16435,59 +16554,59 @@ static void editing_tools_adjust_tool_on_delayed_shadows_adjustment (EditingTool
 	gdouble _tmp2_ = 0.0;
 	ShadowDetailTransformation* _tmp3_ = NULL;
 	const gchar* _tmp4_ = NULL;
-#line 2736 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2766 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
-#line 2737 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2767 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->adjust_tool_window;
-#line 2737 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2767 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = _tmp0_->shadows_slider;
-#line 2737 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2767 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = gtk_range_get_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_range_get_type (), GtkRange));
-#line 2737 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2767 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = shadow_detail_transformation_new ((gfloat) _tmp2_);
-#line 2737 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2767 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	new_shadows_trans = _tmp3_;
-#line 2739 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2769 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = _ ("Shadows");
-#line 2739 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2769 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_slider_updated (self, G_TYPE_CHECK_INSTANCE_CAST (new_shadows_trans, TYPE_PIXEL_TRANSFORMATION, PixelTransformation), _tmp4_);
-#line 2736 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2766 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_pixel_transformation_unref0 (new_shadows_trans);
-#line 16457 "EditingTools.c"
+#line 16576 "EditingTools.c"
 }
 
 
 static void _editing_tools_adjust_tool_on_delayed_highlights_adjustment_one_shot_callback (gpointer self) {
-#line 2744 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2774 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_on_delayed_highlights_adjustment ((EditingToolsAdjustTool*) self);
-#line 16464 "EditingTools.c"
+#line 16583 "EditingTools.c"
 }
 
 
 static void editing_tools_adjust_tool_on_highlights_adjustment (EditingToolsAdjustTool* self) {
 	OneShotScheduler* _tmp0_ = NULL;
 	OneShotScheduler* _tmp2_ = NULL;
-#line 2742 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2772 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
-#line 2743 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2773 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->highlights_scheduler;
-#line 2743 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2773 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp0_ == NULL) {
-#line 16477 "EditingTools.c"
+#line 16596 "EditingTools.c"
 		OneShotScheduler* _tmp1_ = NULL;
-#line 2744 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2774 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp1_ = one_shot_scheduler_new ("highlights", _editing_tools_adjust_tool_on_delayed_highlights_adjustment_one_shot_callback, self);
-#line 2744 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2774 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_one_shot_scheduler_unref0 (self->priv->highlights_scheduler);
-#line 2744 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2774 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		self->priv->highlights_scheduler = _tmp1_;
-#line 16485 "EditingTools.c"
+#line 16604 "EditingTools.c"
 	}
-#line 2746 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2776 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = self->priv->highlights_scheduler;
-#line 2746 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2776 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	one_shot_scheduler_after_timeout (_tmp2_, EDITING_TOOLS_ADJUST_TOOL_SLIDER_DELAY_MSEC, TRUE);
-#line 16491 "EditingTools.c"
+#line 16610 "EditingTools.c"
 }
 
 
@@ -16498,25 +16617,25 @@ static void editing_tools_adjust_tool_on_delayed_highlights_adjustment (EditingT
 	gdouble _tmp2_ = 0.0;
 	HighlightDetailTransformation* _tmp3_ = NULL;
 	const gchar* _tmp4_ = NULL;
-#line 2749 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2779 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
-#line 2750 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2780 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->adjust_tool_window;
-#line 2750 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2780 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = _tmp0_->highlights_slider;
-#line 2750 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2780 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = gtk_range_get_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_range_get_type (), GtkRange));
-#line 2750 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2780 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = highlight_detail_transformation_new ((gfloat) _tmp2_);
-#line 2750 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2780 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	new_highlights_trans = _tmp3_;
-#line 2752 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2782 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = _ ("Highlights");
-#line 2752 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2782 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_slider_updated (self, G_TYPE_CHECK_INSTANCE_CAST (new_highlights_trans, TYPE_PIXEL_TRANSFORMATION, PixelTransformation), _tmp4_);
-#line 2749 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2779 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_pixel_transformation_unref0 (new_highlights_trans);
-#line 16520 "EditingTools.c"
+#line 16639 "EditingTools.c"
 }
 
 
@@ -16532,35 +16651,35 @@ static void editing_tools_adjust_tool_on_histogram_constraint (EditingToolsAdjus
 	ExpansionTransformation* new_exp_trans = NULL;
 	ExpansionTransformation* _tmp6_ = NULL;
 	const gchar* _tmp7_ = NULL;
-#line 2755 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2785 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
-#line 2756 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2786 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->adjust_tool_window;
-#line 2756 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2786 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = _tmp0_->histogram_manipulator;
-#line 2756 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2786 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = rgb_histogram_manipulator_get_left_nub_position (_tmp1_);
-#line 2756 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2786 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	expansion_black_point = _tmp2_;
-#line 2758 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2788 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = self->priv->adjust_tool_window;
-#line 2758 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2788 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = _tmp3_->histogram_manipulator;
-#line 2758 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2788 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = rgb_histogram_manipulator_get_right_nub_position (_tmp4_);
-#line 2758 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2788 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	expansion_white_point = _tmp5_;
-#line 2760 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2790 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = expansion_transformation_new_from_extrema (expansion_black_point, expansion_white_point);
-#line 2760 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2790 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	new_exp_trans = _tmp6_;
-#line 2762 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2792 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7_ = _ ("Contrast Expansion");
-#line 2762 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2792 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_slider_updated (self, G_TYPE_CHECK_INSTANCE_CAST (new_exp_trans, TYPE_PIXEL_TRANSFORMATION, PixelTransformation), _tmp7_);
-#line 2755 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2785 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_pixel_transformation_unref0 (new_exp_trans);
-#line 16564 "EditingTools.c"
+#line 16683 "EditingTools.c"
 }
 
 
@@ -16572,33 +16691,33 @@ static void editing_tools_adjust_tool_on_canvas_resize (EditingToolsAdjustTool*
 	EditingToolsPhotoCanvas* _tmp4_ = NULL;
 	GdkPixbuf* _tmp5_ = NULL;
 	GdkPixbuf* _tmp6_ = NULL;
-#line 2765 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2795 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
-#line 2766 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2796 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 2766 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2796 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = editing_tools_photo_canvas_get_scaled_pixbuf (_tmp0_);
-#line 2766 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2796 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = _tmp1_;
-#line 2766 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2796 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = gdk_pixbuf_copy (_tmp2_);
-#line 2766 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2796 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->priv->draw_to_pixbuf);
-#line 2766 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2796 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->draw_to_pixbuf = _tmp3_;
-#line 2766 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2796 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (_tmp2_);
-#line 2767 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2797 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 2767 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2797 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = editing_tools_photo_canvas_get_scaled_pixbuf (_tmp4_);
-#line 2767 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2797 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = _tmp5_;
-#line 2767 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2797 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_init_fp_pixel_cache (self, _tmp6_);
-#line 2767 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2797 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (_tmp6_);
-#line 16602 "EditingTools.c"
+#line 16721 "EditingTools.c"
 }
 
 
@@ -16611,192 +16730,199 @@ static gboolean editing_tools_adjust_tool_on_hscale_reset (EditingToolsAdjustToo
 	gboolean _tmp3_ = FALSE;
 	GdkEventButton* _tmp4_ = NULL;
 	guint _tmp5_ = 0U;
-#line 2770 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2800 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self), FALSE);
-#line 2770 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2800 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (GTK_IS_WIDGET (widget), FALSE);
-#line 2770 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2800 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 2771 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2801 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = widget;
-#line 2771 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2801 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_scale_get_type (), GtkScale));
-#line 2771 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2801 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	source = _tmp1_;
-#line 2773 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2803 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = event;
-#line 2773 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2803 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = _tmp4_->button;
-#line 2773 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2803 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp5_ == ((guint) 1)) {
-#line 16633 "EditingTools.c"
+#line 16752 "EditingTools.c"
 		GdkEventButton* _tmp6_ = NULL;
 		GdkEventType _tmp7_ = 0;
-#line 2773 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2803 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp6_ = event;
-#line 2773 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2803 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp7_ = _tmp6_->type;
-#line 2773 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2803 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp3_ = _tmp7_ == GDK_BUTTON_PRESS;
-#line 16642 "EditingTools.c"
+#line 16761 "EditingTools.c"
 	} else {
-#line 2773 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2803 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp3_ = FALSE;
-#line 16646 "EditingTools.c"
+#line 16765 "EditingTools.c"
 	}
-#line 2773 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2803 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp3_) {
-#line 16650 "EditingTools.c"
+#line 16769 "EditingTools.c"
 		GdkEventButton* _tmp8_ = NULL;
 		GdkModifierType _tmp9_ = 0;
 		gboolean _tmp10_ = FALSE;
-#line 2774 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2804 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp8_ = event;
-#line 2774 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2804 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp9_ = _tmp8_->state;
-#line 2774 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2804 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp10_ = has_only_key_modifier (_tmp9_, GDK_CONTROL_MASK);
-#line 2774 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2804 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp2_ = _tmp10_;
-#line 16662 "EditingTools.c"
+#line 16781 "EditingTools.c"
 	} else {
-#line 2773 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2803 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp2_ = FALSE;
-#line 16666 "EditingTools.c"
+#line 16785 "EditingTools.c"
 	}
-#line 2773 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2803 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp2_) {
-#line 16670 "EditingTools.c"
+#line 16789 "EditingTools.c"
 		GtkScale* _tmp11_ = NULL;
-#line 2776 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2806 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp11_ = source;
-#line 2776 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2806 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_range_get_type (), GtkRange), (gdouble) 0);
-#line 2778 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2808 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		result = TRUE;
-#line 2778 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2808 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_object_unref0 (source);
-#line 2778 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2808 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return result;
-#line 16682 "EditingTools.c"
+#line 16801 "EditingTools.c"
 	}
-#line 2781 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2811 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	result = FALSE;
-#line 2781 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2811 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (source);
-#line 2781 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2811 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 16690 "EditingTools.c"
+#line 16809 "EditingTools.c"
 }
 
 
 static void _editing_tools_adjust_tool_on_canvas_resize_editing_tools_photo_canvas_resized_scaled_pixbuf (EditingToolsPhotoCanvas* _sender, Dimensions* old_dim, GdkPixbuf* scaled, GdkRectangle* scaled_position, gpointer self) {
-#line 2785 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2815 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_on_canvas_resize ((EditingToolsAdjustTool*) self);
-#line 16697 "EditingTools.c"
+#line 16816 "EditingTools.c"
 }
 
 
 static void editing_tools_adjust_tool_bind_canvas_handlers (EditingToolsAdjustTool* self, EditingToolsPhotoCanvas* canvas) {
 	EditingToolsPhotoCanvas* _tmp0_ = NULL;
-#line 2784 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2814 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
-#line 2784 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2814 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (canvas));
-#line 2785 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2815 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = canvas;
-#line 2785 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2815 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_connect (_tmp0_, "resized-scaled-pixbuf", (GCallback) _editing_tools_adjust_tool_on_canvas_resize_editing_tools_photo_canvas_resized_scaled_pixbuf, self);
-#line 16711 "EditingTools.c"
+#line 16830 "EditingTools.c"
 }
 
 
 static void editing_tools_adjust_tool_unbind_canvas_handlers (EditingToolsAdjustTool* self, EditingToolsPhotoCanvas* canvas) {
 	EditingToolsPhotoCanvas* _tmp0_ = NULL;
 	guint _tmp1_ = 0U;
-#line 2788 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2818 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
-#line 2788 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2818 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (canvas));
-#line 2789 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2819 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = canvas;
-#line 2789 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2819 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_parse_name ("resized-scaled-pixbuf", EDITING_TOOLS_TYPE_PHOTO_CANVAS, &_tmp1_, NULL, FALSE);
-#line 2789 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2819 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _editing_tools_adjust_tool_on_canvas_resize_editing_tools_photo_canvas_resized_scaled_pixbuf, self);
-#line 16728 "EditingTools.c"
+#line 16847 "EditingTools.c"
 }
 
 
 static void _editing_tools_adjust_tool_on_ok_gtk_button_clicked (GtkButton* _sender, gpointer self) {
-#line 2793 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2823 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_on_ok ((EditingToolsAdjustTool*) self);
-#line 16735 "EditingTools.c"
+#line 16854 "EditingTools.c"
 }
 
 
 static void _editing_tools_adjust_tool_on_reset_gtk_button_clicked (GtkButton* _sender, gpointer self) {
-#line 2794 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2824 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_on_reset ((EditingToolsAdjustTool*) self);
-#line 16742 "EditingTools.c"
+#line 16861 "EditingTools.c"
 }
 
 
 static void _editing_tools_adjust_tool_on_exposure_adjustment_gtk_range_value_changed (GtkRange* _sender, gpointer self) {
-#line 2796 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2826 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_on_exposure_adjustment ((EditingToolsAdjustTool*) self);
-#line 16749 "EditingTools.c"
+#line 16868 "EditingTools.c"
+}
+
+
+static void _editing_tools_adjust_tool_on_contrast_adjustment_gtk_range_value_changed (GtkRange* _sender, gpointer self) {
+#line 2827 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	editing_tools_adjust_tool_on_contrast_adjustment ((EditingToolsAdjustTool*) self);
+#line 16875 "EditingTools.c"
 }
 
 
 static void _editing_tools_adjust_tool_on_saturation_adjustment_gtk_range_value_changed (GtkRange* _sender, gpointer self) {
-#line 2797 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2828 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_on_saturation_adjustment ((EditingToolsAdjustTool*) self);
-#line 16756 "EditingTools.c"
+#line 16882 "EditingTools.c"
 }
 
 
 static void _editing_tools_adjust_tool_on_tint_adjustment_gtk_range_value_changed (GtkRange* _sender, gpointer self) {
-#line 2798 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2829 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_on_tint_adjustment ((EditingToolsAdjustTool*) self);
-#line 16763 "EditingTools.c"
+#line 16889 "EditingTools.c"
 }
 
 
 static void _editing_tools_adjust_tool_on_temperature_adjustment_gtk_range_value_changed (GtkRange* _sender, gpointer self) {
-#line 2799 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2830 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_on_temperature_adjustment ((EditingToolsAdjustTool*) self);
-#line 16770 "EditingTools.c"
+#line 16896 "EditingTools.c"
 }
 
 
 static void _editing_tools_adjust_tool_on_shadows_adjustment_gtk_range_value_changed (GtkRange* _sender, gpointer self) {
-#line 2800 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2831 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_on_shadows_adjustment ((EditingToolsAdjustTool*) self);
-#line 16777 "EditingTools.c"
+#line 16903 "EditingTools.c"
 }
 
 
 static void _editing_tools_adjust_tool_on_highlights_adjustment_gtk_range_value_changed (GtkRange* _sender, gpointer self) {
-#line 2801 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2832 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_on_highlights_adjustment ((EditingToolsAdjustTool*) self);
-#line 16784 "EditingTools.c"
+#line 16910 "EditingTools.c"
 }
 
 
 static void _editing_tools_adjust_tool_on_histogram_constraint_rgb_histogram_manipulator_nub_position_changed (RGBHistogramManipulator* _sender, gpointer self) {
-#line 2802 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2833 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_on_histogram_constraint ((EditingToolsAdjustTool*) self);
-#line 16791 "EditingTools.c"
+#line 16917 "EditingTools.c"
 }
 
 
 static gboolean _editing_tools_adjust_tool_on_hscale_reset_gtk_widget_button_press_event (GtkWidget* _sender, GdkEventButton* event, gpointer self) {
 	gboolean result;
 	result = editing_tools_adjust_tool_on_hscale_reset ((EditingToolsAdjustTool*) self, _sender, event);
-#line 2804 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2835 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 16800 "EditingTools.c"
+#line 16926 "EditingTools.c"
 }
 
 
@@ -16810,7 +16936,7 @@ static void editing_tools_adjust_tool_bind_window_handlers (EditingToolsAdjustTo
 	EditingToolsAdjustToolAdjustToolWindow* _tmp6_ = NULL;
 	GtkScale* _tmp7_ = NULL;
 	EditingToolsAdjustToolAdjustToolWindow* _tmp8_ = NULL;
-	GtkScale* _tmp9_ = NULL;
+	GtkHScale* _tmp9_ = NULL;
 	EditingToolsAdjustToolAdjustToolWindow* _tmp10_ = NULL;
 	GtkScale* _tmp11_ = NULL;
 	EditingToolsAdjustToolAdjustToolWindow* _tmp12_ = NULL;
@@ -16820,118 +16946,134 @@ static void editing_tools_adjust_tool_bind_window_handlers (EditingToolsAdjustTo
 	EditingToolsAdjustToolAdjustToolWindow* _tmp16_ = NULL;
 	GtkScale* _tmp17_ = NULL;
 	EditingToolsAdjustToolAdjustToolWindow* _tmp18_ = NULL;
-	RGBHistogramManipulator* _tmp19_ = NULL;
+	GtkScale* _tmp19_ = NULL;
 	EditingToolsAdjustToolAdjustToolWindow* _tmp20_ = NULL;
-	GtkScale* _tmp21_ = NULL;
+	RGBHistogramManipulator* _tmp21_ = NULL;
 	EditingToolsAdjustToolAdjustToolWindow* _tmp22_ = NULL;
 	GtkScale* _tmp23_ = NULL;
 	EditingToolsAdjustToolAdjustToolWindow* _tmp24_ = NULL;
 	GtkScale* _tmp25_ = NULL;
 	EditingToolsAdjustToolAdjustToolWindow* _tmp26_ = NULL;
-	GtkScale* _tmp27_ = NULL;
+	GtkHScale* _tmp27_ = NULL;
 	EditingToolsAdjustToolAdjustToolWindow* _tmp28_ = NULL;
 	GtkScale* _tmp29_ = NULL;
 	EditingToolsAdjustToolAdjustToolWindow* _tmp30_ = NULL;
 	GtkScale* _tmp31_ = NULL;
-#line 2792 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	EditingToolsAdjustToolAdjustToolWindow* _tmp32_ = NULL;
+	GtkScale* _tmp33_ = NULL;
+	EditingToolsAdjustToolAdjustToolWindow* _tmp34_ = NULL;
+	GtkScale* _tmp35_ = NULL;
+#line 2822 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
-#line 2793 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2823 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->adjust_tool_window;
-#line 2793 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2823 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = _tmp0_->ok_button;
-#line 2793 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2823 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_connect (_tmp1_, "clicked", (GCallback) _editing_tools_adjust_tool_on_ok_gtk_button_clicked, self);
-#line 2794 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2824 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = self->priv->adjust_tool_window;
-#line 2794 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2824 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = _tmp2_->reset_button;
-#line 2794 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2824 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_connect (_tmp3_, "clicked", (GCallback) _editing_tools_adjust_tool_on_reset_gtk_button_clicked, self);
-#line 2795 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2825 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = self->priv->adjust_tool_window;
-#line 2795 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2825 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = _tmp4_->cancel_button;
-#line 2795 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2825 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_connect (_tmp5_, "clicked", (GCallback) _editing_tools_editing_tool_notify_cancel_gtk_button_clicked, G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool));
-#line 2796 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2826 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = self->priv->adjust_tool_window;
-#line 2796 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2826 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7_ = _tmp6_->exposure_slider;
-#line 2796 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2826 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_range_get_type (), GtkRange), "value-changed", (GCallback) _editing_tools_adjust_tool_on_exposure_adjustment_gtk_range_value_changed, self);
-#line 2797 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2827 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp8_ = self->priv->adjust_tool_window;
-#line 2797 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp9_ = _tmp8_->saturation_slider;
-#line 2797 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_range_get_type (), GtkRange), "value-changed", (GCallback) _editing_tools_adjust_tool_on_saturation_adjustment_gtk_range_value_changed, self);
-#line 2798 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2827 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	_tmp9_ = _tmp8_->contrast_slider;
+#line 2827 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_range_get_type (), GtkRange), "value-changed", (GCallback) _editing_tools_adjust_tool_on_contrast_adjustment_gtk_range_value_changed, self);
+#line 2828 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp10_ = self->priv->adjust_tool_window;
-#line 2798 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp11_ = _tmp10_->tint_slider;
-#line 2798 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_range_get_type (), GtkRange), "value-changed", (GCallback) _editing_tools_adjust_tool_on_tint_adjustment_gtk_range_value_changed, self);
-#line 2799 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2828 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	_tmp11_ = _tmp10_->saturation_slider;
+#line 2828 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_range_get_type (), GtkRange), "value-changed", (GCallback) _editing_tools_adjust_tool_on_saturation_adjustment_gtk_range_value_changed, self);
+#line 2829 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp12_ = self->priv->adjust_tool_window;
-#line 2799 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp13_ = _tmp12_->temperature_slider;
-#line 2799 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, gtk_range_get_type (), GtkRange), "value-changed", (GCallback) _editing_tools_adjust_tool_on_temperature_adjustment_gtk_range_value_changed, self);
-#line 2800 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2829 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	_tmp13_ = _tmp12_->tint_slider;
+#line 2829 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, gtk_range_get_type (), GtkRange), "value-changed", (GCallback) _editing_tools_adjust_tool_on_tint_adjustment_gtk_range_value_changed, self);
+#line 2830 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp14_ = self->priv->adjust_tool_window;
-#line 2800 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp15_ = _tmp14_->shadows_slider;
-#line 2800 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, gtk_range_get_type (), GtkRange), "value-changed", (GCallback) _editing_tools_adjust_tool_on_shadows_adjustment_gtk_range_value_changed, self);
-#line 2801 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2830 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	_tmp15_ = _tmp14_->temperature_slider;
+#line 2830 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, gtk_range_get_type (), GtkRange), "value-changed", (GCallback) _editing_tools_adjust_tool_on_temperature_adjustment_gtk_range_value_changed, self);
+#line 2831 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp16_ = self->priv->adjust_tool_window;
-#line 2801 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp17_ = _tmp16_->highlights_slider;
-#line 2801 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_range_get_type (), GtkRange), "value-changed", (GCallback) _editing_tools_adjust_tool_on_highlights_adjustment_gtk_range_value_changed, self);
-#line 2802 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2831 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	_tmp17_ = _tmp16_->shadows_slider;
+#line 2831 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_range_get_type (), GtkRange), "value-changed", (GCallback) _editing_tools_adjust_tool_on_shadows_adjustment_gtk_range_value_changed, self);
+#line 2832 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp18_ = self->priv->adjust_tool_window;
-#line 2802 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp19_ = _tmp18_->histogram_manipulator;
-#line 2802 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	g_signal_connect (_tmp19_, "nub-position-changed", (GCallback) _editing_tools_adjust_tool_on_histogram_constraint_rgb_histogram_manipulator_nub_position_changed, self);
-#line 2804 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2832 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	_tmp19_ = _tmp18_->highlights_slider;
+#line 2832 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, gtk_range_get_type (), GtkRange), "value-changed", (GCallback) _editing_tools_adjust_tool_on_highlights_adjustment_gtk_range_value_changed, self);
+#line 2833 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp20_ = self->priv->adjust_tool_window;
-#line 2804 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp21_ = _tmp20_->saturation_slider;
-#line 2804 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, gtk_widget_get_type (), GtkWidget), "button-press-event", (GCallback) _editing_tools_adjust_tool_on_hscale_reset_gtk_widget_button_press_event, self);
-#line 2805 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2833 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	_tmp21_ = _tmp20_->histogram_manipulator;
+#line 2833 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	g_signal_connect (_tmp21_, "nub-position-changed", (GCallback) _editing_tools_adjust_tool_on_histogram_constraint_rgb_histogram_manipulator_nub_position_changed, self);
+#line 2835 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp22_ = self->priv->adjust_tool_window;
-#line 2805 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp23_ = _tmp22_->exposure_slider;
-#line 2805 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2835 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	_tmp23_ = _tmp22_->saturation_slider;
+#line 2835 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, gtk_widget_get_type (), GtkWidget), "button-press-event", (GCallback) _editing_tools_adjust_tool_on_hscale_reset_gtk_widget_button_press_event, self);
-#line 2806 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2836 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp24_ = self->priv->adjust_tool_window;
-#line 2806 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp25_ = _tmp24_->tint_slider;
-#line 2806 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2836 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	_tmp25_ = _tmp24_->exposure_slider;
+#line 2836 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, gtk_widget_get_type (), GtkWidget), "button-press-event", (GCallback) _editing_tools_adjust_tool_on_hscale_reset_gtk_widget_button_press_event, self);
-#line 2807 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2837 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp26_ = self->priv->adjust_tool_window;
-#line 2807 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp27_ = _tmp26_->temperature_slider;
-#line 2807 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2837 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	_tmp27_ = _tmp26_->contrast_slider;
+#line 2837 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, gtk_widget_get_type (), GtkWidget), "button-press-event", (GCallback) _editing_tools_adjust_tool_on_hscale_reset_gtk_widget_button_press_event, self);
-#line 2808 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2838 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp28_ = self->priv->adjust_tool_window;
-#line 2808 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp29_ = _tmp28_->shadows_slider;
-#line 2808 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2838 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	_tmp29_ = _tmp28_->tint_slider;
+#line 2838 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, gtk_widget_get_type (), GtkWidget), "button-press-event", (GCallback) _editing_tools_adjust_tool_on_hscale_reset_gtk_widget_button_press_event, self);
-#line 2809 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2839 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp30_ = self->priv->adjust_tool_window;
-#line 2809 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp31_ = _tmp30_->highlights_slider;
-#line 2809 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2839 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	_tmp31_ = _tmp30_->temperature_slider;
+#line 2839 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, gtk_widget_get_type (), GtkWidget), "button-press-event", (GCallback) _editing_tools_adjust_tool_on_hscale_reset_gtk_widget_button_press_event, self);
-#line 16935 "EditingTools.c"
+#line 2840 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	_tmp32_ = self->priv->adjust_tool_window;
+#line 2840 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	_tmp33_ = _tmp32_->shadows_slider;
+#line 2840 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, gtk_widget_get_type (), GtkWidget), "button-press-event", (GCallback) _editing_tools_adjust_tool_on_hscale_reset_gtk_widget_button_press_event, self);
+#line 2841 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	_tmp34_ = self->priv->adjust_tool_window;
+#line 2841 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	_tmp35_ = _tmp34_->highlights_slider;
+#line 2841 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, gtk_widget_get_type (), GtkWidget), "button-press-event", (GCallback) _editing_tools_adjust_tool_on_hscale_reset_gtk_widget_button_press_event, self);
+#line 17077 "EditingTools.c"
 }
 
 
@@ -16949,7 +17091,7 @@ static void editing_tools_adjust_tool_unbind_window_handlers (EditingToolsAdjust
 	GtkScale* _tmp10_ = NULL;
 	guint _tmp11_ = 0U;
 	EditingToolsAdjustToolAdjustToolWindow* _tmp12_ = NULL;
-	GtkScale* _tmp13_ = NULL;
+	GtkHScale* _tmp13_ = NULL;
 	guint _tmp14_ = 0U;
 	EditingToolsAdjustToolAdjustToolWindow* _tmp15_ = NULL;
 	GtkScale* _tmp16_ = NULL;
@@ -16964,10 +17106,10 @@ static void editing_tools_adjust_tool_unbind_window_handlers (EditingToolsAdjust
 	GtkScale* _tmp25_ = NULL;
 	guint _tmp26_ = 0U;
 	EditingToolsAdjustToolAdjustToolWindow* _tmp27_ = NULL;
-	RGBHistogramManipulator* _tmp28_ = NULL;
+	GtkScale* _tmp28_ = NULL;
 	guint _tmp29_ = 0U;
 	EditingToolsAdjustToolAdjustToolWindow* _tmp30_ = NULL;
-	GtkScale* _tmp31_ = NULL;
+	RGBHistogramManipulator* _tmp31_ = NULL;
 	guint _tmp32_ = 0U;
 	EditingToolsAdjustToolAdjustToolWindow* _tmp33_ = NULL;
 	GtkScale* _tmp34_ = NULL;
@@ -16976,7 +17118,7 @@ static void editing_tools_adjust_tool_unbind_window_handlers (EditingToolsAdjust
 	GtkScale* _tmp37_ = NULL;
 	guint _tmp38_ = 0U;
 	EditingToolsAdjustToolAdjustToolWindow* _tmp39_ = NULL;
-	GtkScale* _tmp40_ = NULL;
+	GtkHScale* _tmp40_ = NULL;
 	guint _tmp41_ = 0U;
 	EditingToolsAdjustToolAdjustToolWindow* _tmp42_ = NULL;
 	GtkScale* _tmp43_ = NULL;
@@ -16984,137 +17126,159 @@ static void editing_tools_adjust_tool_unbind_window_handlers (EditingToolsAdjust
 	EditingToolsAdjustToolAdjustToolWindow* _tmp45_ = NULL;
 	GtkScale* _tmp46_ = NULL;
 	guint _tmp47_ = 0U;
-#line 2812 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	EditingToolsAdjustToolAdjustToolWindow* _tmp48_ = NULL;
+	GtkScale* _tmp49_ = NULL;
+	guint _tmp50_ = 0U;
+	EditingToolsAdjustToolAdjustToolWindow* _tmp51_ = NULL;
+	GtkScale* _tmp52_ = NULL;
+	guint _tmp53_ = 0U;
+#line 2844 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
-#line 2813 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2845 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->adjust_tool_window;
-#line 2813 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2845 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = _tmp0_->ok_button;
-#line 2813 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2845 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_parse_name ("clicked", gtk_button_get_type (), &_tmp2_, NULL, FALSE);
-#line 2813 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2845 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_handlers_disconnect_matched (_tmp1_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp2_, 0, NULL, (GCallback) _editing_tools_adjust_tool_on_ok_gtk_button_clicked, self);
-#line 2814 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2846 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = self->priv->adjust_tool_window;
-#line 2814 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2846 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = _tmp3_->reset_button;
-#line 2814 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2846 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_parse_name ("clicked", gtk_button_get_type (), &_tmp5_, NULL, FALSE);
-#line 2814 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2846 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_handlers_disconnect_matched (_tmp4_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp5_, 0, NULL, (GCallback) _editing_tools_adjust_tool_on_reset_gtk_button_clicked, self);
-#line 2815 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2847 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = self->priv->adjust_tool_window;
-#line 2815 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2847 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7_ = _tmp6_->cancel_button;
-#line 2815 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2847 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_parse_name ("clicked", gtk_button_get_type (), &_tmp8_, NULL, FALSE);
-#line 2815 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2847 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_handlers_disconnect_matched (_tmp7_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp8_, 0, NULL, (GCallback) _editing_tools_editing_tool_notify_cancel_gtk_button_clicked, G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool));
-#line 2816 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2848 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp9_ = self->priv->adjust_tool_window;
-#line 2816 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2848 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp10_ = _tmp9_->exposure_slider;
-#line 2816 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2848 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_parse_name ("value-changed", gtk_range_get_type (), &_tmp11_, NULL, FALSE);
-#line 2816 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2848 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_range_get_type (), GtkRange), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp11_, 0, NULL, (GCallback) _editing_tools_adjust_tool_on_exposure_adjustment_gtk_range_value_changed, self);
-#line 2817 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2849 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp12_ = self->priv->adjust_tool_window;
-#line 2817 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp13_ = _tmp12_->saturation_slider;
-#line 2817 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2849 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	_tmp13_ = _tmp12_->contrast_slider;
+#line 2849 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_parse_name ("value-changed", gtk_range_get_type (), &_tmp14_, NULL, FALSE);
-#line 2817 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, gtk_range_get_type (), GtkRange), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp14_, 0, NULL, (GCallback) _editing_tools_adjust_tool_on_saturation_adjustment_gtk_range_value_changed, self);
-#line 2818 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2849 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, gtk_range_get_type (), GtkRange), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp14_, 0, NULL, (GCallback) _editing_tools_adjust_tool_on_contrast_adjustment_gtk_range_value_changed, self);
+#line 2850 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp15_ = self->priv->adjust_tool_window;
-#line 2818 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp16_ = _tmp15_->tint_slider;
-#line 2818 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2850 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	_tmp16_ = _tmp15_->saturation_slider;
+#line 2850 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_parse_name ("value-changed", gtk_range_get_type (), &_tmp17_, NULL, FALSE);
-#line 2818 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, gtk_range_get_type (), GtkRange), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp17_, 0, NULL, (GCallback) _editing_tools_adjust_tool_on_tint_adjustment_gtk_range_value_changed, self);
-#line 2819 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2850 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, gtk_range_get_type (), GtkRange), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp17_, 0, NULL, (GCallback) _editing_tools_adjust_tool_on_saturation_adjustment_gtk_range_value_changed, self);
+#line 2851 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp18_ = self->priv->adjust_tool_window;
-#line 2819 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp19_ = _tmp18_->temperature_slider;
-#line 2819 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2851 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	_tmp19_ = _tmp18_->tint_slider;
+#line 2851 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_parse_name ("value-changed", gtk_range_get_type (), &_tmp20_, NULL, FALSE);
-#line 2819 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, gtk_range_get_type (), GtkRange), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp20_, 0, NULL, (GCallback) _editing_tools_adjust_tool_on_temperature_adjustment_gtk_range_value_changed, self);
-#line 2820 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2851 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, gtk_range_get_type (), GtkRange), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp20_, 0, NULL, (GCallback) _editing_tools_adjust_tool_on_tint_adjustment_gtk_range_value_changed, self);
+#line 2852 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp21_ = self->priv->adjust_tool_window;
-#line 2820 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp22_ = _tmp21_->shadows_slider;
-#line 2820 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2852 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	_tmp22_ = _tmp21_->temperature_slider;
+#line 2852 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_parse_name ("value-changed", gtk_range_get_type (), &_tmp23_, NULL, FALSE);
-#line 2820 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, gtk_range_get_type (), GtkRange), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp23_, 0, NULL, (GCallback) _editing_tools_adjust_tool_on_shadows_adjustment_gtk_range_value_changed, self);
-#line 2821 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2852 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, gtk_range_get_type (), GtkRange), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp23_, 0, NULL, (GCallback) _editing_tools_adjust_tool_on_temperature_adjustment_gtk_range_value_changed, self);
+#line 2853 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp24_ = self->priv->adjust_tool_window;
-#line 2821 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp25_ = _tmp24_->highlights_slider;
-#line 2821 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2853 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	_tmp25_ = _tmp24_->shadows_slider;
+#line 2853 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_parse_name ("value-changed", gtk_range_get_type (), &_tmp26_, NULL, FALSE);
-#line 2821 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, gtk_range_get_type (), GtkRange), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp26_, 0, NULL, (GCallback) _editing_tools_adjust_tool_on_highlights_adjustment_gtk_range_value_changed, self);
-#line 2822 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2853 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, gtk_range_get_type (), GtkRange), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp26_, 0, NULL, (GCallback) _editing_tools_adjust_tool_on_shadows_adjustment_gtk_range_value_changed, self);
+#line 2854 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp27_ = self->priv->adjust_tool_window;
-#line 2822 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp28_ = _tmp27_->histogram_manipulator;
-#line 2822 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	g_signal_parse_name ("nub-position-changed", TYPE_RGB_HISTOGRAM_MANIPULATOR, &_tmp29_, NULL, FALSE);
-#line 2822 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	g_signal_handlers_disconnect_matched (_tmp28_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp29_, 0, NULL, (GCallback) _editing_tools_adjust_tool_on_histogram_constraint_rgb_histogram_manipulator_nub_position_changed, self);
-#line 2824 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2854 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	_tmp28_ = _tmp27_->highlights_slider;
+#line 2854 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	g_signal_parse_name ("value-changed", gtk_range_get_type (), &_tmp29_, NULL, FALSE);
+#line 2854 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, gtk_range_get_type (), GtkRange), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp29_, 0, NULL, (GCallback) _editing_tools_adjust_tool_on_highlights_adjustment_gtk_range_value_changed, self);
+#line 2855 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp30_ = self->priv->adjust_tool_window;
-#line 2824 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp31_ = _tmp30_->saturation_slider;
-#line 2824 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	g_signal_parse_name ("button-press-event", gtk_widget_get_type (), &_tmp32_, NULL, FALSE);
-#line 2824 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, gtk_widget_get_type (), GtkWidget), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp32_, 0, NULL, (GCallback) _editing_tools_adjust_tool_on_hscale_reset_gtk_widget_button_press_event, self);
-#line 2825 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2855 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	_tmp31_ = _tmp30_->histogram_manipulator;
+#line 2855 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	g_signal_parse_name ("nub-position-changed", TYPE_RGB_HISTOGRAM_MANIPULATOR, &_tmp32_, NULL, FALSE);
+#line 2855 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	g_signal_handlers_disconnect_matched (_tmp31_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp32_, 0, NULL, (GCallback) _editing_tools_adjust_tool_on_histogram_constraint_rgb_histogram_manipulator_nub_position_changed, self);
+#line 2857 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp33_ = self->priv->adjust_tool_window;
-#line 2825 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp34_ = _tmp33_->exposure_slider;
-#line 2825 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2857 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	_tmp34_ = _tmp33_->saturation_slider;
+#line 2857 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_parse_name ("button-press-event", gtk_widget_get_type (), &_tmp35_, NULL, FALSE);
-#line 2825 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2857 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, gtk_widget_get_type (), GtkWidget), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp35_, 0, NULL, (GCallback) _editing_tools_adjust_tool_on_hscale_reset_gtk_widget_button_press_event, self);
-#line 2826 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2858 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp36_ = self->priv->adjust_tool_window;
-#line 2826 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp37_ = _tmp36_->tint_slider;
-#line 2826 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2858 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	_tmp37_ = _tmp36_->exposure_slider;
+#line 2858 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_parse_name ("button-press-event", gtk_widget_get_type (), &_tmp38_, NULL, FALSE);
-#line 2826 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2858 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, gtk_widget_get_type (), GtkWidget), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp38_, 0, NULL, (GCallback) _editing_tools_adjust_tool_on_hscale_reset_gtk_widget_button_press_event, self);
-#line 2827 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2859 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp39_ = self->priv->adjust_tool_window;
-#line 2827 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp40_ = _tmp39_->temperature_slider;
-#line 2827 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2859 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	_tmp40_ = _tmp39_->contrast_slider;
+#line 2859 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_parse_name ("button-press-event", gtk_widget_get_type (), &_tmp41_, NULL, FALSE);
-#line 2827 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2859 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, gtk_widget_get_type (), GtkWidget), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp41_, 0, NULL, (GCallback) _editing_tools_adjust_tool_on_hscale_reset_gtk_widget_button_press_event, self);
-#line 2828 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2860 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp42_ = self->priv->adjust_tool_window;
-#line 2828 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp43_ = _tmp42_->shadows_slider;
-#line 2828 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2860 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	_tmp43_ = _tmp42_->tint_slider;
+#line 2860 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_parse_name ("button-press-event", gtk_widget_get_type (), &_tmp44_, NULL, FALSE);
-#line 2828 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2860 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, gtk_widget_get_type (), GtkWidget), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp44_, 0, NULL, (GCallback) _editing_tools_adjust_tool_on_hscale_reset_gtk_widget_button_press_event, self);
-#line 2829 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2861 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp45_ = self->priv->adjust_tool_window;
-#line 2829 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp46_ = _tmp45_->highlights_slider;
-#line 2829 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2861 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	_tmp46_ = _tmp45_->temperature_slider;
+#line 2861 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_parse_name ("button-press-event", gtk_widget_get_type (), &_tmp47_, NULL, FALSE);
-#line 2829 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2861 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, gtk_widget_get_type (), GtkWidget), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp47_, 0, NULL, (GCallback) _editing_tools_adjust_tool_on_hscale_reset_gtk_widget_button_press_event, self);
-#line 17118 "EditingTools.c"
+#line 2862 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	_tmp48_ = self->priv->adjust_tool_window;
+#line 2862 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	_tmp49_ = _tmp48_->shadows_slider;
+#line 2862 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	g_signal_parse_name ("button-press-event", gtk_widget_get_type (), &_tmp50_, NULL, FALSE);
+#line 2862 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, gtk_widget_get_type (), GtkWidget), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp50_, 0, NULL, (GCallback) _editing_tools_adjust_tool_on_hscale_reset_gtk_widget_button_press_event, self);
+#line 2863 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	_tmp51_ = self->priv->adjust_tool_window;
+#line 2863 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	_tmp52_ = _tmp51_->highlights_slider;
+#line 2863 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	g_signal_parse_name ("button-press-event", gtk_widget_get_type (), &_tmp53_, NULL, FALSE);
+#line 2863 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp52_, gtk_widget_get_type (), GtkWidget), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp53_, 0, NULL, (GCallback) _editing_tools_adjust_tool_on_hscale_reset_gtk_widget_button_press_event, self);
+#line 17282 "EditingTools.c"
 }
 
 
@@ -17128,37 +17292,37 @@ gboolean editing_tools_adjust_tool_enhance (EditingToolsAdjustTool* self) {
 	EditingToolsAdjustToolAdjustEnhanceCommand* _tmp4_ = NULL;
 	CommandManager* _tmp5_ = NULL;
 	CommandManager* _tmp6_ = NULL;
-#line 2832 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2866 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self), FALSE);
-#line 2833 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2867 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 2833 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2867 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = editing_tools_photo_canvas_get_photo (_tmp0_);
-#line 2833 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2867 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = _tmp1_;
-#line 2833 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2867 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = editing_tools_adjust_tool_adjust_enhance_command_new (self, _tmp2_);
-#line 2833 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2867 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = _tmp3_;
-#line 2833 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2867 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (_tmp2_);
-#line 2833 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2867 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	command = _tmp4_;
-#line 2834 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2868 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = app_window_get_command_manager ();
-#line 2834 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2868 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = _tmp5_;
-#line 2834 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2868 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	command_manager_execute (_tmp6_, G_TYPE_CHECK_INSTANCE_CAST (command, TYPE_COMMAND, Command));
-#line 2834 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2868 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_command_manager_unref0 (_tmp6_);
-#line 2836 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2870 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	result = TRUE;
-#line 2836 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2870 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (command);
-#line 2836 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2870 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 17162 "EditingTools.c"
+#line 17326 "EditingTools.c"
 }
 
 
@@ -17176,68 +17340,68 @@ static void editing_tools_adjust_tool_on_photos_altered (EditingToolsAdjustTool*
 	PixelTransformationBundle* _tmp9_ = NULL;
 	PixelTransformationBundle* _tmp10_ = NULL;
 	PixelTransformationBundle* _tmp11_ = NULL;
-#line 2839 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2873 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
-#line 2839 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2873 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (GEE_IS_MAP (map));
-#line 2840 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2874 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = map;
-#line 2840 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2874 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 2840 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2874 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = editing_tools_photo_canvas_get_photo (_tmp1_);
-#line 2840 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2874 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = _tmp2_;
-#line 2840 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2874 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = gee_map_has_key (_tmp0_, G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_DATA_OBJECT, DataObject));
-#line 2840 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2874 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = !_tmp4_;
-#line 2840 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2874 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (_tmp3_);
-#line 2840 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2874 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp5_) {
-#line 2841 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2875 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return;
-#line 17202 "EditingTools.c"
+#line 17366 "EditingTools.c"
 	}
-#line 2843 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2877 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 2843 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2877 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7_ = editing_tools_photo_canvas_get_photo (_tmp6_);
-#line 2843 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2877 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp8_ = _tmp7_;
-#line 2843 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2877 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp9_ = photo_get_color_adjustments (_tmp8_);
-#line 2843 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2877 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp10_ = _tmp9_;
-#line 2843 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2877 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (_tmp8_);
-#line 2843 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2877 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	adjustments = _tmp10_;
-#line 2844 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2878 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp11_ = adjustments;
-#line 2844 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2878 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_set_adjustments (self, _tmp11_);
-#line 2839 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2873 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_pixel_transformation_bundle_unref0 (adjustments);
-#line 17224 "EditingTools.c"
+#line 17388 "EditingTools.c"
 }
 
 
 static void editing_tools_adjust_tool_set_adjustments (EditingToolsAdjustTool* self, PixelTransformationBundle* new_adjustments) {
 	PixelTransformationBundle* _tmp0_ = NULL;
 	EditingToolsPhotoCanvas* _tmp11_ = NULL;
-#line 2847 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2881 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
-#line 2847 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2881 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (IS_PIXEL_TRANSFORMATION_BUNDLE (new_adjustments));
-#line 2848 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2882 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_unbind_window_handlers (self);
-#line 2850 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2884 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = new_adjustments;
-#line 2850 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2884 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_update_transformations (self, _tmp0_);
-#line 17241 "EditingTools.c"
+#line 17405 "EditingTools.c"
 	{
 		GeeIterator* _adjustment_it = NULL;
 		PixelTransformationBundle* _tmp1_ = NULL;
@@ -17245,106 +17409,106 @@ static void editing_tools_adjust_tool_set_adjustments (EditingToolsAdjustTool* s
 		GeeIterable* _tmp3_ = NULL;
 		GeeIterator* _tmp4_ = NULL;
 		GeeIterator* _tmp5_ = NULL;
-#line 2852 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2886 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp1_ = new_adjustments;
-#line 2852 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2886 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp2_ = pixel_transformation_bundle_get_transformations (_tmp1_);
-#line 2852 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2886 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp3_ = _tmp2_;
-#line 2852 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2886 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp4_ = gee_iterable_iterator (_tmp3_);
-#line 2852 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2886 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp5_ = _tmp4_;
-#line 2852 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2886 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_object_unref0 (_tmp3_);
-#line 2852 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2886 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_adjustment_it = _tmp5_;
-#line 2852 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2886 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		while (TRUE) {
-#line 17265 "EditingTools.c"
+#line 17429 "EditingTools.c"
 			GeeIterator* _tmp6_ = NULL;
 			gboolean _tmp7_ = FALSE;
 			PixelTransformation* adjustment = NULL;
 			GeeIterator* _tmp8_ = NULL;
 			gpointer _tmp9_ = NULL;
 			PixelTransformation* _tmp10_ = NULL;
-#line 2852 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2886 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp6_ = _adjustment_it;
-#line 2852 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2886 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp7_ = gee_iterator_next (_tmp6_);
-#line 2852 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2886 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			if (!_tmp7_) {
-#line 2852 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2886 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				break;
-#line 17280 "EditingTools.c"
+#line 17444 "EditingTools.c"
 			}
-#line 2852 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2886 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp8_ = _adjustment_it;
-#line 2852 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2886 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp9_ = gee_iterator_get (_tmp8_);
-#line 2852 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2886 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			adjustment = (PixelTransformation*) _tmp9_;
-#line 2853 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2887 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp10_ = adjustment;
-#line 2853 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2887 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			editing_tools_adjust_tool_update_slider (self, _tmp10_);
-#line 2852 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2886 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_pixel_transformation_unref0 (adjustment);
-#line 17294 "EditingTools.c"
+#line 17458 "EditingTools.c"
 		}
-#line 2852 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2886 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_object_unref0 (_adjustment_it);
-#line 17298 "EditingTools.c"
+#line 17462 "EditingTools.c"
 	}
-#line 2855 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2889 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_bind_window_handlers (self);
-#line 2856 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2890 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp11_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 2856 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2890 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_photo_canvas_repaint (_tmp11_);
-#line 17306 "EditingTools.c"
+#line 17470 "EditingTools.c"
 }
 
 
 static gpointer _pixel_transformation_ref0 (gpointer self) {
-#line 2864 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2898 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return self ? pixel_transformation_ref (self) : NULL;
-#line 17313 "EditingTools.c"
+#line 17477 "EditingTools.c"
 }
 
 
 static void editing_tools_adjust_tool_update_slider (EditingToolsAdjustTool* self, PixelTransformation* transformation) {
 	PixelTransformation* _tmp0_ = NULL;
 	PixelTransformationType _tmp1_ = 0;
-#line 2861 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2895 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
-#line 2861 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2895 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (IS_PIXEL_TRANSFORMATION (transformation));
-#line 2862 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2896 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = transformation;
-#line 2862 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2896 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = pixel_transformation_get_transformation_type (_tmp0_);
-#line 2862 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2896 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	switch (_tmp1_) {
-#line 2862 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2896 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		case PIXEL_TRANSFORMATION_TYPE_TONE_EXPANSION:
-#line 17332 "EditingTools.c"
+#line 17496 "EditingTools.c"
 		{
 			ExpansionTransformation* expansion = NULL;
 			PixelTransformation* _tmp2_ = NULL;
 			ExpansionTransformation* _tmp3_ = NULL;
 			gboolean _tmp4_ = FALSE;
-#line 2864 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2898 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp2_ = transformation;
-#line 2864 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2898 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp3_ = _pixel_transformation_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_EXPANSION_TRANSFORMATION, ExpansionTransformation));
-#line 2864 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2898 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			expansion = _tmp3_;
-#line 2866 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2900 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp4_ = self->priv->disable_histogram_refresh;
-#line 2866 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2900 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			if (!_tmp4_) {
-#line 17348 "EditingTools.c"
+#line 17512 "EditingTools.c"
 				EditingToolsAdjustToolAdjustToolWindow* _tmp5_ = NULL;
 				RGBHistogramManipulator* _tmp6_ = NULL;
 				ExpansionTransformation* _tmp7_ = NULL;
@@ -17353,177 +17517,199 @@ static void editing_tools_adjust_tool_update_slider (EditingToolsAdjustTool* sel
 				RGBHistogramManipulator* _tmp10_ = NULL;
 				ExpansionTransformation* _tmp11_ = NULL;
 				gint _tmp12_ = 0;
-#line 2867 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2901 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp5_ = self->priv->adjust_tool_window;
-#line 2867 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2901 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp6_ = _tmp5_->histogram_manipulator;
-#line 2867 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2901 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp7_ = expansion;
-#line 2867 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2901 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp8_ = expansion_transformation_get_black_point (_tmp7_);
-#line 2867 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2901 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				rgb_histogram_manipulator_set_left_nub_position (_tmp6_, _tmp8_);
-#line 2869 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2903 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp9_ = self->priv->adjust_tool_window;
-#line 2869 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2903 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp10_ = _tmp9_->histogram_manipulator;
-#line 2869 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2903 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp11_ = expansion;
-#line 2869 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2903 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp12_ = expansion_transformation_get_white_point (_tmp11_);
-#line 2869 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2903 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				rgb_histogram_manipulator_set_right_nub_position (_tmp10_, _tmp12_);
-#line 17377 "EditingTools.c"
+#line 17541 "EditingTools.c"
 			}
-#line 2872 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2906 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_pixel_transformation_unref0 (expansion);
-#line 2872 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2906 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			break;
-#line 17383 "EditingTools.c"
+#line 17547 "EditingTools.c"
 		}
-#line 2862 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2896 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		case PIXEL_TRANSFORMATION_TYPE_SHADOWS:
-#line 17387 "EditingTools.c"
+#line 17551 "EditingTools.c"
 		{
 			EditingToolsAdjustToolAdjustToolWindow* _tmp13_ = NULL;
 			GtkScale* _tmp14_ = NULL;
 			PixelTransformation* _tmp15_ = NULL;
 			gfloat _tmp16_ = 0.0F;
-#line 2875 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2909 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp13_ = self->priv->adjust_tool_window;
-#line 2875 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2909 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp14_ = _tmp13_->shadows_slider;
-#line 2875 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2909 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp15_ = transformation;
-#line 2875 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2909 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp16_ = shadow_detail_transformation_get_parameter (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_SHADOW_DETAIL_TRANSFORMATION, ShadowDetailTransformation));
-#line 2875 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2909 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_range_get_type (), GtkRange), (gdouble) _tmp16_);
-#line 2877 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2911 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			break;
-#line 17405 "EditingTools.c"
+#line 17569 "EditingTools.c"
 		}
-#line 2862 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		case PIXEL_TRANSFORMATION_TYPE_HIGHLIGHTS:
-#line 17409 "EditingTools.c"
+#line 2896 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+		case PIXEL_TRANSFORMATION_TYPE_CONTRAST:
+#line 17573 "EditingTools.c"
 		{
 			EditingToolsAdjustToolAdjustToolWindow* _tmp17_ = NULL;
-			GtkScale* _tmp18_ = NULL;
+			GtkHScale* _tmp18_ = NULL;
 			PixelTransformation* _tmp19_ = NULL;
 			gfloat _tmp20_ = 0.0F;
-#line 2880 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2914 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp17_ = self->priv->adjust_tool_window;
-#line 2880 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			_tmp18_ = _tmp17_->highlights_slider;
-#line 2880 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2914 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+			_tmp18_ = _tmp17_->contrast_slider;
+#line 2914 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp19_ = transformation;
-#line 2880 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			_tmp20_ = highlight_detail_transformation_get_parameter (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, TYPE_HIGHLIGHT_DETAIL_TRANSFORMATION, HighlightDetailTransformation));
-#line 2880 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2914 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+			_tmp20_ = contrast_transformation_get_parameter (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, TYPE_CONTRAST_TRANSFORMATION, ContrastTransformation));
+#line 2914 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_range_get_type (), GtkRange), (gdouble) _tmp20_);
-#line 2882 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2916 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			break;
-#line 17427 "EditingTools.c"
+#line 17591 "EditingTools.c"
 		}
-#line 2862 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		case PIXEL_TRANSFORMATION_TYPE_EXPOSURE:
-#line 17431 "EditingTools.c"
+#line 2896 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+		case PIXEL_TRANSFORMATION_TYPE_HIGHLIGHTS:
+#line 17595 "EditingTools.c"
 		{
 			EditingToolsAdjustToolAdjustToolWindow* _tmp21_ = NULL;
 			GtkScale* _tmp22_ = NULL;
 			PixelTransformation* _tmp23_ = NULL;
 			gfloat _tmp24_ = 0.0F;
-#line 2885 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2919 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp21_ = self->priv->adjust_tool_window;
-#line 2885 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			_tmp22_ = _tmp21_->exposure_slider;
-#line 2885 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2919 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+			_tmp22_ = _tmp21_->highlights_slider;
+#line 2919 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp23_ = transformation;
-#line 2885 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			_tmp24_ = exposure_transformation_get_parameter (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, TYPE_EXPOSURE_TRANSFORMATION, ExposureTransformation));
-#line 2885 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2919 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+			_tmp24_ = highlight_detail_transformation_get_parameter (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, TYPE_HIGHLIGHT_DETAIL_TRANSFORMATION, HighlightDetailTransformation));
+#line 2919 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, gtk_range_get_type (), GtkRange), (gdouble) _tmp24_);
-#line 2887 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2921 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			break;
-#line 17449 "EditingTools.c"
+#line 17613 "EditingTools.c"
 		}
-#line 2862 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		case PIXEL_TRANSFORMATION_TYPE_SATURATION:
-#line 17453 "EditingTools.c"
+#line 2896 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+		case PIXEL_TRANSFORMATION_TYPE_EXPOSURE:
+#line 17617 "EditingTools.c"
 		{
 			EditingToolsAdjustToolAdjustToolWindow* _tmp25_ = NULL;
 			GtkScale* _tmp26_ = NULL;
 			PixelTransformation* _tmp27_ = NULL;
 			gfloat _tmp28_ = 0.0F;
-#line 2890 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2924 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp25_ = self->priv->adjust_tool_window;
-#line 2890 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			_tmp26_ = _tmp25_->saturation_slider;
-#line 2890 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2924 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+			_tmp26_ = _tmp25_->exposure_slider;
+#line 2924 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp27_ = transformation;
-#line 2890 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			_tmp28_ = saturation_transformation_get_parameter (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, TYPE_SATURATION_TRANSFORMATION, SaturationTransformation));
-#line 2890 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2924 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+			_tmp28_ = exposure_transformation_get_parameter (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, TYPE_EXPOSURE_TRANSFORMATION, ExposureTransformation));
+#line 2924 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, gtk_range_get_type (), GtkRange), (gdouble) _tmp28_);
-#line 2892 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2926 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			break;
-#line 17471 "EditingTools.c"
+#line 17635 "EditingTools.c"
 		}
-#line 2862 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		case PIXEL_TRANSFORMATION_TYPE_TINT:
-#line 17475 "EditingTools.c"
+#line 2896 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+		case PIXEL_TRANSFORMATION_TYPE_SATURATION:
+#line 17639 "EditingTools.c"
 		{
 			EditingToolsAdjustToolAdjustToolWindow* _tmp29_ = NULL;
 			GtkScale* _tmp30_ = NULL;
 			PixelTransformation* _tmp31_ = NULL;
 			gfloat _tmp32_ = 0.0F;
-#line 2895 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2929 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp29_ = self->priv->adjust_tool_window;
-#line 2895 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			_tmp30_ = _tmp29_->tint_slider;
-#line 2895 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2929 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+			_tmp30_ = _tmp29_->saturation_slider;
+#line 2929 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp31_ = transformation;
-#line 2895 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			_tmp32_ = tint_transformation_get_parameter (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, TYPE_TINT_TRANSFORMATION, TintTransformation));
-#line 2895 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2929 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+			_tmp32_ = saturation_transformation_get_parameter (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, TYPE_SATURATION_TRANSFORMATION, SaturationTransformation));
+#line 2929 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, gtk_range_get_type (), GtkRange), (gdouble) _tmp32_);
-#line 2897 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2931 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			break;
-#line 17493 "EditingTools.c"
+#line 17657 "EditingTools.c"
 		}
-#line 2862 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		case PIXEL_TRANSFORMATION_TYPE_TEMPERATURE:
-#line 17497 "EditingTools.c"
+#line 2896 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+		case PIXEL_TRANSFORMATION_TYPE_TINT:
+#line 17661 "EditingTools.c"
 		{
 			EditingToolsAdjustToolAdjustToolWindow* _tmp33_ = NULL;
 			GtkScale* _tmp34_ = NULL;
 			PixelTransformation* _tmp35_ = NULL;
 			gfloat _tmp36_ = 0.0F;
-#line 2900 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2934 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp33_ = self->priv->adjust_tool_window;
-#line 2900 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			_tmp34_ = _tmp33_->temperature_slider;
-#line 2900 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2934 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+			_tmp34_ = _tmp33_->tint_slider;
+#line 2934 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp35_ = transformation;
-#line 2900 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			_tmp36_ = temperature_transformation_get_parameter (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, TYPE_TEMPERATURE_TRANSFORMATION, TemperatureTransformation));
-#line 2900 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2934 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+			_tmp36_ = tint_transformation_get_parameter (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, TYPE_TINT_TRANSFORMATION, TintTransformation));
+#line 2934 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, gtk_range_get_type (), GtkRange), (gdouble) _tmp36_);
-#line 2902 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2936 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+			break;
+#line 17679 "EditingTools.c"
+		}
+#line 2896 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+		case PIXEL_TRANSFORMATION_TYPE_TEMPERATURE:
+#line 17683 "EditingTools.c"
+		{
+			EditingToolsAdjustToolAdjustToolWindow* _tmp37_ = NULL;
+			GtkScale* _tmp38_ = NULL;
+			PixelTransformation* _tmp39_ = NULL;
+			gfloat _tmp40_ = 0.0F;
+#line 2939 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+			_tmp37_ = self->priv->adjust_tool_window;
+#line 2939 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+			_tmp38_ = _tmp37_->temperature_slider;
+#line 2939 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+			_tmp39_ = transformation;
+#line 2939 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+			_tmp40_ = temperature_transformation_get_parameter (G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, TYPE_TEMPERATURE_TRANSFORMATION, TemperatureTransformation));
+#line 2939 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+			gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, gtk_range_get_type (), GtkRange), (gdouble) _tmp40_);
+#line 2941 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			break;
-#line 17515 "EditingTools.c"
+#line 17701 "EditingTools.c"
 		}
 		default:
 		{
-			PixelTransformation* _tmp37_ = NULL;
-			PixelTransformationType _tmp38_ = 0;
-#line 2905 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			_tmp37_ = transformation;
-#line 2905 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			_tmp38_ = pixel_transformation_get_transformation_type (_tmp37_);
-#line 2905 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			g_error ("EditingTools.vala:2905: Unknown adjustment: %d", (gint) _tmp38_);
-#line 17527 "EditingTools.c"
+			PixelTransformation* _tmp41_ = NULL;
+			PixelTransformationType _tmp42_ = 0;
+#line 2944 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+			_tmp41_ = transformation;
+#line 2944 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+			_tmp42_ = pixel_transformation_get_transformation_type (_tmp41_);
+#line 2944 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+			g_error ("EditingTools.vala:2944: Unknown adjustment: %d", (gint) _tmp42_);
+#line 17713 "EditingTools.c"
 		}
 	}
 }
@@ -17552,75 +17738,75 @@ static void editing_tools_adjust_tool_init_fp_pixel_cache (EditingToolsAdjustToo
 	gfloat* _tmp12_ = NULL;
 	gint cache_pixel_index = 0;
 	gfloat INV_255 = 0.0F;
-#line 2909 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2948 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
-#line 2909 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2948 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (GDK_IS_PIXBUF (source));
-#line 2910 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2949 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = source;
-#line 2910 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2949 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = gdk_pixbuf_get_width (_tmp0_);
-#line 2910 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2949 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	source_width = _tmp1_;
-#line 2911 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2950 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = source;
-#line 2911 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2950 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = gdk_pixbuf_get_height (_tmp2_);
-#line 2911 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2950 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	source_height = _tmp3_;
-#line 2912 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2951 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = source;
-#line 2912 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2951 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = gdk_pixbuf_get_n_channels (_tmp4_);
-#line 2912 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2951 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	source_num_channels = _tmp5_;
-#line 2913 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2952 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = source;
-#line 2913 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2952 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7_ = gdk_pixbuf_get_rowstride (_tmp6_);
-#line 2913 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2952 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	source_rowstride = _tmp7_;
-#line 2914 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2953 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp8_ = source;
-#line 2914 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2953 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp9_ = gdk_pixbuf_get_pixels (_tmp8_);
-#line 2914 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2953 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	source_pixels = _tmp9_;
-#line 2914 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2953 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	source_pixels_length1 = -1;
-#line 2914 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2953 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_source_pixels_size_ = source_pixels_length1;
-#line 2916 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2955 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp10_ = source_width;
-#line 2916 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2955 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp11_ = source_height;
-#line 2916 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2955 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp12_ = g_new0 (gfloat, (3 * _tmp10_) * _tmp11_);
-#line 2916 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2955 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->fp_pixel_cache = (g_free (self->priv->fp_pixel_cache), NULL);
-#line 2916 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2955 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->fp_pixel_cache = _tmp12_;
-#line 2916 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2955 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->fp_pixel_cache_length1 = (3 * _tmp10_) * _tmp11_;
-#line 2916 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2955 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->_fp_pixel_cache_size_ = self->priv->fp_pixel_cache_length1;
-#line 2917 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2956 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cache_pixel_index = 0;
-#line 2918 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2957 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	INV_255 = 1.0f / 255.0f;
-#line 17612 "EditingTools.c"
+#line 17798 "EditingTools.c"
 	{
 		gint j = 0;
-#line 2920 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2959 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		j = 0;
-#line 17617 "EditingTools.c"
+#line 17803 "EditingTools.c"
 		{
 			gboolean _tmp13_ = FALSE;
-#line 2920 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2959 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp13_ = TRUE;
-#line 2920 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2959 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			while (TRUE) {
-#line 17624 "EditingTools.c"
+#line 17810 "EditingTools.c"
 				gint _tmp15_ = 0;
 				gint _tmp16_ = 0;
 				gint row_start_index = 0;
@@ -17630,58 +17816,58 @@ static void editing_tools_adjust_tool_init_fp_pixel_cache (EditingToolsAdjustToo
 				gint _tmp19_ = 0;
 				gint _tmp20_ = 0;
 				gint _tmp21_ = 0;
-#line 2920 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2959 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				if (!_tmp13_) {
-#line 17636 "EditingTools.c"
+#line 17822 "EditingTools.c"
 					gint _tmp14_ = 0;
-#line 2920 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2959 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp14_ = j;
-#line 2920 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2959 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					j = _tmp14_ + 1;
-#line 17642 "EditingTools.c"
+#line 17828 "EditingTools.c"
 				}
-#line 2920 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2959 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp13_ = FALSE;
-#line 2920 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2959 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp15_ = j;
-#line 2920 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2959 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp16_ = source_height;
-#line 2920 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2959 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				if (!(_tmp15_ < _tmp16_)) {
-#line 2920 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2959 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					break;
-#line 17654 "EditingTools.c"
+#line 17840 "EditingTools.c"
 				}
-#line 2921 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2960 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp17_ = j;
-#line 2921 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2960 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp18_ = source_rowstride;
-#line 2921 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2960 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				row_start_index = _tmp17_ * _tmp18_;
-#line 2922 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2961 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp19_ = row_start_index;
-#line 2922 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2961 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp20_ = source_width;
-#line 2922 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2961 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_tmp21_ = source_num_channels;
-#line 2922 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2961 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				row_end_index = _tmp19_ + (_tmp20_ * _tmp21_);
-#line 17670 "EditingTools.c"
+#line 17856 "EditingTools.c"
 				{
 					gint i = 0;
 					gint _tmp22_ = 0;
-#line 2923 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2962 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_tmp22_ = row_start_index;
-#line 2923 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2962 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					i = _tmp22_;
-#line 17678 "EditingTools.c"
+#line 17864 "EditingTools.c"
 					{
 						gboolean _tmp23_ = FALSE;
-#line 2923 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2962 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 						_tmp23_ = TRUE;
-#line 2923 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2962 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 						while (TRUE) {
-#line 17685 "EditingTools.c"
+#line 17871 "EditingTools.c"
 							gint _tmp26_ = 0;
 							gint _tmp27_ = 0;
 							gfloat* _tmp28_ = NULL;
@@ -17711,98 +17897,98 @@ static void editing_tools_adjust_tool_init_fp_pixel_cache (EditingToolsAdjustToo
 							guchar _tmp46_ = '\0';
 							gfloat _tmp47_ = 0.0F;
 							gfloat _tmp48_ = 0.0F;
-#line 2923 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2962 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 							if (!_tmp23_) {
-#line 17717 "EditingTools.c"
+#line 17903 "EditingTools.c"
 								gint _tmp24_ = 0;
 								gint _tmp25_ = 0;
-#line 2923 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2962 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 								_tmp24_ = i;
-#line 2923 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2962 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 								_tmp25_ = source_num_channels;
-#line 2923 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2962 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 								i = _tmp24_ + _tmp25_;
-#line 17726 "EditingTools.c"
+#line 17912 "EditingTools.c"
 							}
-#line 2923 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2962 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 							_tmp23_ = FALSE;
-#line 2923 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2962 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 							_tmp26_ = i;
-#line 2923 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2962 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 							_tmp27_ = row_end_index;
-#line 2923 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2962 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 							if (!(_tmp26_ < _tmp27_)) {
-#line 2923 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2962 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 								break;
-#line 17738 "EditingTools.c"
+#line 17924 "EditingTools.c"
 							}
-#line 2924 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2963 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 							_tmp28_ = self->priv->fp_pixel_cache;
-#line 2924 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2963 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 							_tmp28__length1 = self->priv->fp_pixel_cache_length1;
-#line 2924 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2963 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 							_tmp29_ = cache_pixel_index;
-#line 2924 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2963 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 							cache_pixel_index = _tmp29_ + 1;
-#line 2924 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2963 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 							_tmp30_ = source_pixels;
-#line 2924 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2963 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 							_tmp30__length1 = source_pixels_length1;
-#line 2924 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2963 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 							_tmp31_ = i;
-#line 2924 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2963 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 							_tmp32_ = _tmp30_[_tmp31_];
-#line 2924 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2963 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 							_tmp33_ = INV_255;
-#line 2924 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2963 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 							_tmp28_[_tmp29_] = ((gfloat) _tmp32_) * _tmp33_;
-#line 2924 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2963 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 							_tmp34_ = _tmp28_[_tmp29_];
-#line 2925 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2964 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 							_tmp35_ = self->priv->fp_pixel_cache;
-#line 2925 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2964 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 							_tmp35__length1 = self->priv->fp_pixel_cache_length1;
-#line 2925 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2964 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 							_tmp36_ = cache_pixel_index;
-#line 2925 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2964 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 							cache_pixel_index = _tmp36_ + 1;
-#line 2925 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2964 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 							_tmp37_ = source_pixels;
-#line 2925 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2964 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 							_tmp37__length1 = source_pixels_length1;
-#line 2925 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2964 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 							_tmp38_ = i;
-#line 2925 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2964 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 							_tmp39_ = _tmp37_[_tmp38_ + 1];
-#line 2925 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2964 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 							_tmp40_ = INV_255;
-#line 2925 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2964 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 							_tmp35_[_tmp36_] = ((gfloat) _tmp39_) * _tmp40_;
-#line 2925 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2964 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 							_tmp41_ = _tmp35_[_tmp36_];
-#line 2926 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2965 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 							_tmp42_ = self->priv->fp_pixel_cache;
-#line 2926 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2965 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 							_tmp42__length1 = self->priv->fp_pixel_cache_length1;
-#line 2926 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2965 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 							_tmp43_ = cache_pixel_index;
-#line 2926 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2965 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 							cache_pixel_index = _tmp43_ + 1;
-#line 2926 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2965 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 							_tmp44_ = source_pixels;
-#line 2926 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2965 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 							_tmp44__length1 = source_pixels_length1;
-#line 2926 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2965 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 							_tmp45_ = i;
-#line 2926 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2965 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 							_tmp46_ = _tmp44_[_tmp45_ + 2];
-#line 2926 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2965 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 							_tmp47_ = INV_255;
-#line 2926 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2965 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 							_tmp42_[_tmp43_] = ((gfloat) _tmp46_) * _tmp47_;
-#line 2926 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2965 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 							_tmp48_ = _tmp42_[_tmp43_];
-#line 17806 "EditingTools.c"
+#line 17992 "EditingTools.c"
 						}
 					}
 				}
@@ -17822,73 +18008,73 @@ static gboolean editing_tools_adjust_tool_real_on_keypress (EditingToolsEditingT
 	const gchar* _tmp4_ = NULL;
 	GdkEventKey* _tmp11_ = NULL;
 	gboolean _tmp12_ = FALSE;
-#line 2931 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2970 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_ADJUST_TOOL, EditingToolsAdjustTool);
-#line 2931 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2970 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 2932 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2971 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = event;
-#line 2932 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2971 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = _tmp2_->keyval;
-#line 2932 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2971 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = gdk_keyval_name (_tmp3_);
-#line 2932 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2971 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (g_strcmp0 (_tmp4_, "KP_Enter") == 0) {
-#line 2932 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2971 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp1_ = TRUE;
-#line 17840 "EditingTools.c"
+#line 18026 "EditingTools.c"
 	} else {
 		GdkEventKey* _tmp5_ = NULL;
 		guint _tmp6_ = 0U;
 		const gchar* _tmp7_ = NULL;
-#line 2933 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2972 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp5_ = event;
-#line 2933 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2972 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp6_ = _tmp5_->keyval;
-#line 2933 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2972 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp7_ = gdk_keyval_name (_tmp6_);
-#line 2933 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2972 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp1_ = g_strcmp0 (_tmp7_, "Enter") == 0;
-#line 17853 "EditingTools.c"
+#line 18039 "EditingTools.c"
 	}
-#line 2932 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2971 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp1_) {
-#line 2932 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2971 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp0_ = TRUE;
-#line 17859 "EditingTools.c"
+#line 18045 "EditingTools.c"
 	} else {
 		GdkEventKey* _tmp8_ = NULL;
 		guint _tmp9_ = 0U;
 		const gchar* _tmp10_ = NULL;
-#line 2934 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2973 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp8_ = event;
-#line 2934 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2973 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp9_ = _tmp8_->keyval;
-#line 2934 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2973 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp10_ = gdk_keyval_name (_tmp9_);
-#line 2934 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2973 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp0_ = g_strcmp0 (_tmp10_, "Return") == 0;
-#line 17872 "EditingTools.c"
+#line 18058 "EditingTools.c"
 	}
-#line 2932 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2971 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp0_) {
-#line 2935 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2974 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_adjust_tool_on_ok (self);
-#line 2936 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2975 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		result = TRUE;
-#line 2936 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2975 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return result;
-#line 17882 "EditingTools.c"
+#line 18068 "EditingTools.c"
 	}
-#line 2939 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2978 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp11_ = event;
-#line 2939 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2978 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp12_ = EDITING_TOOLS_EDITING_TOOL_CLASS (editing_tools_adjust_tool_parent_class)->on_keypress (G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool), _tmp11_);
-#line 2939 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2978 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	result = _tmp12_;
-#line 2939 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2978 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 17892 "EditingTools.c"
+#line 18078 "EditingTools.c"
 }
 
 
@@ -17904,314 +18090,351 @@ static EditingToolsAdjustToolAdjustToolWindow* editing_tools_adjust_tool_adjust_
 	GtkScale* _tmp5_ = NULL;
 	GtkScale* _tmp6_ = NULL;
 	GtkScale* _tmp7_ = NULL;
-	GtkLabel* saturation_label = NULL;
+	GtkLabel* contrast_label = NULL;
 	const gchar* _tmp8_ = NULL;
 	GtkLabel* _tmp9_ = NULL;
-	GtkScale* _tmp10_ = NULL;
-	GtkScale* _tmp11_ = NULL;
-	GtkScale* _tmp12_ = NULL;
-	GtkScale* _tmp13_ = NULL;
-	GtkLabel* tint_label = NULL;
+	GtkHScale* _tmp10_ = NULL;
+	GtkHScale* _tmp11_ = NULL;
+	GtkHScale* _tmp12_ = NULL;
+	GtkHScale* _tmp13_ = NULL;
+	GtkLabel* saturation_label = NULL;
 	const gchar* _tmp14_ = NULL;
 	GtkLabel* _tmp15_ = NULL;
 	GtkScale* _tmp16_ = NULL;
 	GtkScale* _tmp17_ = NULL;
 	GtkScale* _tmp18_ = NULL;
 	GtkScale* _tmp19_ = NULL;
-	GtkLabel* temperature_label = NULL;
+	GtkLabel* tint_label = NULL;
 	const gchar* _tmp20_ = NULL;
 	GtkLabel* _tmp21_ = NULL;
 	GtkScale* _tmp22_ = NULL;
 	GtkScale* _tmp23_ = NULL;
 	GtkScale* _tmp24_ = NULL;
 	GtkScale* _tmp25_ = NULL;
-	GtkLabel* shadows_label = NULL;
+	GtkLabel* temperature_label = NULL;
 	const gchar* _tmp26_ = NULL;
 	GtkLabel* _tmp27_ = NULL;
 	GtkScale* _tmp28_ = NULL;
 	GtkScale* _tmp29_ = NULL;
 	GtkScale* _tmp30_ = NULL;
 	GtkScale* _tmp31_ = NULL;
-	GtkLabel* highlights_label = NULL;
+	GtkLabel* shadows_label = NULL;
 	const gchar* _tmp32_ = NULL;
 	GtkLabel* _tmp33_ = NULL;
 	GtkScale* _tmp34_ = NULL;
 	GtkScale* _tmp35_ = NULL;
 	GtkScale* _tmp36_ = NULL;
+	GtkScale* _tmp37_ = NULL;
+	GtkLabel* highlights_label = NULL;
+	const gchar* _tmp38_ = NULL;
+	GtkLabel* _tmp39_ = NULL;
+	GtkScale* _tmp40_ = NULL;
+	GtkScale* _tmp41_ = NULL;
+	GtkScale* _tmp42_ = NULL;
 	GtkBox* button_layouter = NULL;
-	GtkBox* _tmp37_ = NULL;
-	GtkButton* _tmp38_ = NULL;
-	GtkButton* _tmp39_ = NULL;
-	GtkButton* _tmp40_ = NULL;
+	GtkBox* _tmp43_ = NULL;
+	GtkButton* _tmp44_ = NULL;
+	GtkButton* _tmp45_ = NULL;
+	GtkButton* _tmp46_ = NULL;
 	GtkAlignment* histogram_aligner = NULL;
-	GtkAlignment* _tmp41_ = NULL;
-	RGBHistogramManipulator* _tmp42_ = NULL;
+	GtkAlignment* _tmp47_ = NULL;
+	RGBHistogramManipulator* _tmp48_ = NULL;
 	GtkBox* pane_layouter = NULL;
-	GtkBox* _tmp43_ = NULL;
-#line 2230 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	GtkBox* _tmp49_ = NULL;
+#line 2233 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (GTK_IS_WINDOW (container), NULL);
-#line 2231 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2234 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = container;
-#line 2231 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2234 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = (EditingToolsAdjustToolAdjustToolWindow*) editing_tools_editing_tool_window_construct (object_type, _tmp0_);
-#line 2233 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2236 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = (GtkGrid*) gtk_grid_new ();
-#line 2233 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2236 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_object_ref_sink (_tmp1_);
-#line 2233 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2236 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	slider_organizer = _tmp1_;
-#line 2234 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2237 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_grid_set_column_homogeneous (slider_organizer, FALSE);
-#line 2235 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2238 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_grid_set_row_spacing (slider_organizer, (guint) 12);
-#line 2236 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2239 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_grid_set_column_spacing (slider_organizer, (guint) 12);
-#line 2237 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2240 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_widget_set_margin_left (G_TYPE_CHECK_INSTANCE_CAST (slider_organizer, gtk_widget_get_type (), GtkWidget), 12);
-#line 2238 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2241 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_widget_set_margin_bottom (G_TYPE_CHECK_INSTANCE_CAST (slider_organizer, gtk_widget_get_type (), GtkWidget), 12);
-#line 2240 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2243 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = _ ("Exposure:");
-#line 2240 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2243 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = (GtkLabel*) gtk_label_new_with_mnemonic (_tmp2_);
-#line 2240 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2243 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_object_ref_sink (_tmp3_);
-#line 2240 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2243 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	exposure_label = _tmp3_;
-#line 2241 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2244 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_misc_set_alignment (G_TYPE_CHECK_INSTANCE_CAST (exposure_label, gtk_misc_get_type (), GtkMisc), 0.0f, 0.5f);
-#line 2242 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2245 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_grid_attach (slider_organizer, G_TYPE_CHECK_INSTANCE_CAST (exposure_label, gtk_widget_get_type (), GtkWidget), 0, 0, 1, 1);
-#line 2243 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2246 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = self->exposure_slider;
-#line 2243 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2246 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_grid_attach (slider_organizer, G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_widget_get_type (), GtkWidget), 1, 0, 1, 1);
-#line 2244 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2247 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = self->exposure_slider;
-#line 2244 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2247 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_widget_get_type (), GtkWidget), EDITING_TOOLS_ADJUST_TOOL_SLIDER_WIDTH, -1);
-#line 2245 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2248 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = self->exposure_slider;
-#line 2245 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2248 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_scale_set_draw_value (_tmp6_, FALSE);
-#line 2246 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2249 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7_ = self->exposure_slider;
-#line 2246 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2249 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_widget_set_margin_right (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_widget_get_type (), GtkWidget), 0);
-#line 2248 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp8_ = _ ("Saturation:");
-#line 2248 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2251 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	_tmp8_ = _ ("Contrast:");
+#line 2251 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp9_ = (GtkLabel*) gtk_label_new_with_mnemonic (_tmp8_);
-#line 2248 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	g_object_ref_sink (_tmp9_);
-#line 2248 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	saturation_label = _tmp9_;
-#line 2249 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_misc_set_alignment (G_TYPE_CHECK_INSTANCE_CAST (saturation_label, gtk_misc_get_type (), GtkMisc), 0.0f, 0.5f);
-#line 2250 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_grid_attach (slider_organizer, G_TYPE_CHECK_INSTANCE_CAST (saturation_label, gtk_widget_get_type (), GtkWidget), 0, 1, 1, 1);
 #line 2251 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp10_ = self->saturation_slider;
+	g_object_ref_sink (_tmp9_);
 #line 2251 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_grid_attach (slider_organizer, G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_widget_get_type (), GtkWidget), 1, 1, 1, 1);
-#line 2252 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp11_ = self->saturation_slider;
+	contrast_label = _tmp9_;
 #line 2252 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_widget_get_type (), GtkWidget), EDITING_TOOLS_ADJUST_TOOL_SLIDER_WIDTH, -1);
-#line 2253 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp12_ = self->saturation_slider;
+	gtk_misc_set_alignment (G_TYPE_CHECK_INSTANCE_CAST (contrast_label, gtk_misc_get_type (), GtkMisc), 0.0f, 0.5f);
 #line 2253 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_scale_set_draw_value (_tmp12_, FALSE);
+	gtk_grid_attach (slider_organizer, G_TYPE_CHECK_INSTANCE_CAST (contrast_label, gtk_widget_get_type (), GtkWidget), 0, 1, 1, 1);
 #line 2254 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp13_ = self->saturation_slider;
+	_tmp10_ = self->contrast_slider;
 #line 2254 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_widget_set_margin_right (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, gtk_widget_get_type (), GtkWidget), 0);
-#line 2256 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp14_ = _ ("Tint:");
-#line 2256 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp15_ = (GtkLabel*) gtk_label_new_with_mnemonic (_tmp14_);
+	gtk_grid_attach (slider_organizer, G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_widget_get_type (), GtkWidget), 1, 1, 1, 1);
+#line 2255 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	_tmp11_ = self->contrast_slider;
+#line 2255 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_widget_get_type (), GtkWidget), EDITING_TOOLS_ADJUST_TOOL_SLIDER_WIDTH, -1);
 #line 2256 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	g_object_ref_sink (_tmp15_);
+	_tmp12_ = self->contrast_slider;
 #line 2256 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	tint_label = _tmp15_;
+	gtk_scale_set_draw_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_scale_get_type (), GtkScale), FALSE);
 #line 2257 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_misc_set_alignment (G_TYPE_CHECK_INSTANCE_CAST (tint_label, gtk_misc_get_type (), GtkMisc), 0.0f, 0.5f);
-#line 2258 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_grid_attach (slider_organizer, G_TYPE_CHECK_INSTANCE_CAST (tint_label, gtk_widget_get_type (), GtkWidget), 0, 2, 1, 1);
+	_tmp13_ = self->contrast_slider;
+#line 2257 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	gtk_widget_set_margin_right (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, gtk_widget_get_type (), GtkWidget), 0);
 #line 2259 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp16_ = self->tint_slider;
+	_tmp14_ = _ ("Saturation:");
 #line 2259 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_grid_attach (slider_organizer, G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, gtk_widget_get_type (), GtkWidget), 1, 2, 1, 1);
-#line 2260 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp17_ = self->tint_slider;
+	_tmp15_ = (GtkLabel*) gtk_label_new_with_mnemonic (_tmp14_);
+#line 2259 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	g_object_ref_sink (_tmp15_);
+#line 2259 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	saturation_label = _tmp15_;
 #line 2260 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_widget_get_type (), GtkWidget), EDITING_TOOLS_ADJUST_TOOL_SLIDER_WIDTH, -1);
-#line 2261 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp18_ = self->tint_slider;
+	gtk_misc_set_alignment (G_TYPE_CHECK_INSTANCE_CAST (saturation_label, gtk_misc_get_type (), GtkMisc), 0.0f, 0.5f);
 #line 2261 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_scale_set_draw_value (_tmp18_, FALSE);
+	gtk_grid_attach (slider_organizer, G_TYPE_CHECK_INSTANCE_CAST (saturation_label, gtk_widget_get_type (), GtkWidget), 0, 2, 1, 1);
 #line 2262 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp19_ = self->tint_slider;
+	_tmp16_ = self->saturation_slider;
 #line 2262 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_widget_set_margin_right (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, gtk_widget_get_type (), GtkWidget), 0);
+	gtk_grid_attach (slider_organizer, G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, gtk_widget_get_type (), GtkWidget), 1, 2, 1, 1);
+#line 2263 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	_tmp17_ = self->saturation_slider;
+#line 2263 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_widget_get_type (), GtkWidget), EDITING_TOOLS_ADJUST_TOOL_SLIDER_WIDTH, -1);
 #line 2264 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp20_ = _ ("Temperature:");
+	_tmp18_ = self->saturation_slider;
 #line 2264 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	gtk_scale_set_draw_value (_tmp18_, FALSE);
+#line 2265 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	_tmp19_ = self->saturation_slider;
+#line 2265 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	gtk_widget_set_margin_right (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, gtk_widget_get_type (), GtkWidget), 0);
+#line 2267 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	_tmp20_ = _ ("Tint:");
+#line 2267 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp21_ = (GtkLabel*) gtk_label_new_with_mnemonic (_tmp20_);
-#line 2264 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2267 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_object_ref_sink (_tmp21_);
-#line 2264 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	temperature_label = _tmp21_;
-#line 2266 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_misc_set_alignment (G_TYPE_CHECK_INSTANCE_CAST (temperature_label, gtk_misc_get_type (), GtkMisc), 0.0f, 0.5f);
 #line 2267 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_grid_attach (slider_organizer, G_TYPE_CHECK_INSTANCE_CAST (temperature_label, gtk_widget_get_type (), GtkWidget), 0, 3, 1, 1);
+	tint_label = _tmp21_;
 #line 2268 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp22_ = self->temperature_slider;
-#line 2268 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_grid_attach (slider_organizer, G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, gtk_widget_get_type (), GtkWidget), 1, 3, 1, 1);
-#line 2269 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp23_ = self->temperature_slider;
+	gtk_misc_set_alignment (G_TYPE_CHECK_INSTANCE_CAST (tint_label, gtk_misc_get_type (), GtkMisc), 0.0f, 0.5f);
 #line 2269 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, gtk_widget_get_type (), GtkWidget), EDITING_TOOLS_ADJUST_TOOL_SLIDER_WIDTH, -1);
+	gtk_grid_attach (slider_organizer, G_TYPE_CHECK_INSTANCE_CAST (tint_label, gtk_widget_get_type (), GtkWidget), 0, 3, 1, 1);
 #line 2270 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp24_ = self->temperature_slider;
+	_tmp22_ = self->tint_slider;
 #line 2270 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_scale_set_draw_value (_tmp24_, FALSE);
+	gtk_grid_attach (slider_organizer, G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, gtk_widget_get_type (), GtkWidget), 1, 3, 1, 1);
 #line 2271 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp25_ = self->temperature_slider;
+	_tmp23_ = self->tint_slider;
 #line 2271 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_widget_set_margin_right (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, gtk_widget_get_type (), GtkWidget), 0);
+	gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, gtk_widget_get_type (), GtkWidget), EDITING_TOOLS_ADJUST_TOOL_SLIDER_WIDTH, -1);
+#line 2272 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	_tmp24_ = self->tint_slider;
+#line 2272 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	gtk_scale_set_draw_value (_tmp24_, FALSE);
 #line 2273 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp26_ = _ ("Shadows:");
+	_tmp25_ = self->tint_slider;
 #line 2273 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	gtk_widget_set_margin_right (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, gtk_widget_get_type (), GtkWidget), 0);
+#line 2275 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	_tmp26_ = _ ("Temperature:");
+#line 2275 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp27_ = (GtkLabel*) gtk_label_new_with_mnemonic (_tmp26_);
-#line 2273 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2275 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_object_ref_sink (_tmp27_);
-#line 2273 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	shadows_label = _tmp27_;
-#line 2274 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_misc_set_alignment (G_TYPE_CHECK_INSTANCE_CAST (shadows_label, gtk_misc_get_type (), GtkMisc), 0.0f, 0.5f);
 #line 2275 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_grid_attach (slider_organizer, G_TYPE_CHECK_INSTANCE_CAST (shadows_label, gtk_widget_get_type (), GtkWidget), 0, 4, 1, 1);
-#line 2276 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp28_ = self->shadows_slider;
-#line 2276 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_grid_attach (slider_organizer, G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, gtk_widget_get_type (), GtkWidget), 1, 4, 1, 1);
+	temperature_label = _tmp27_;
 #line 2277 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp29_ = self->shadows_slider;
-#line 2277 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, gtk_widget_get_type (), GtkWidget), EDITING_TOOLS_ADJUST_TOOL_SLIDER_WIDTH, -1);
-#line 2278 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp30_ = self->shadows_slider;
+	gtk_misc_set_alignment (G_TYPE_CHECK_INSTANCE_CAST (temperature_label, gtk_misc_get_type (), GtkMisc), 0.0f, 0.5f);
 #line 2278 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_scale_set_draw_value (_tmp30_, FALSE);
+	gtk_grid_attach (slider_organizer, G_TYPE_CHECK_INSTANCE_CAST (temperature_label, gtk_widget_get_type (), GtkWidget), 0, 4, 1, 1);
 #line 2279 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp31_ = self->shadows_slider;
+	_tmp28_ = self->temperature_slider;
 #line 2279 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_widget_set_margin_right (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, gtk_widget_get_type (), GtkWidget), 0);
-#line 2281 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp32_ = _ ("Highlights:");
+	gtk_grid_attach (slider_organizer, G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, gtk_widget_get_type (), GtkWidget), 1, 4, 1, 1);
+#line 2280 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	_tmp29_ = self->temperature_slider;
+#line 2280 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, gtk_widget_get_type (), GtkWidget), EDITING_TOOLS_ADJUST_TOOL_SLIDER_WIDTH, -1);
 #line 2281 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp33_ = (GtkLabel*) gtk_label_new_with_mnemonic (_tmp32_);
+	_tmp30_ = self->temperature_slider;
 #line 2281 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	g_object_ref_sink (_tmp33_);
-#line 2281 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	highlights_label = _tmp33_;
+	gtk_scale_set_draw_value (_tmp30_, FALSE);
 #line 2282 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_misc_set_alignment (G_TYPE_CHECK_INSTANCE_CAST (highlights_label, gtk_misc_get_type (), GtkMisc), 0.0f, 0.5f);
-#line 2283 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_grid_attach (slider_organizer, G_TYPE_CHECK_INSTANCE_CAST (highlights_label, gtk_widget_get_type (), GtkWidget), 0, 5, 1, 1);
+	_tmp31_ = self->temperature_slider;
+#line 2282 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	gtk_widget_set_margin_right (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, gtk_widget_get_type (), GtkWidget), 0);
 #line 2284 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp34_ = self->highlights_slider;
+	_tmp32_ = _ ("Shadows:");
 #line 2284 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_grid_attach (slider_organizer, G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, gtk_widget_get_type (), GtkWidget), 1, 5, 1, 1);
-#line 2285 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp35_ = self->highlights_slider;
+	_tmp33_ = (GtkLabel*) gtk_label_new_with_mnemonic (_tmp32_);
+#line 2284 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	g_object_ref_sink (_tmp33_);
+#line 2284 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	shadows_label = _tmp33_;
 #line 2285 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, gtk_widget_get_type (), GtkWidget), EDITING_TOOLS_ADJUST_TOOL_SLIDER_WIDTH, -1);
-#line 2286 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp36_ = self->highlights_slider;
+	gtk_misc_set_alignment (G_TYPE_CHECK_INSTANCE_CAST (shadows_label, gtk_misc_get_type (), GtkMisc), 0.0f, 0.5f);
 #line 2286 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_scale_set_draw_value (_tmp36_, FALSE);
-#line 2288 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp37_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 8);
+	gtk_grid_attach (slider_organizer, G_TYPE_CHECK_INSTANCE_CAST (shadows_label, gtk_widget_get_type (), GtkWidget), 0, 5, 1, 1);
+#line 2287 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	_tmp34_ = self->shadows_slider;
+#line 2287 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	gtk_grid_attach (slider_organizer, G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, gtk_widget_get_type (), GtkWidget), 1, 5, 1, 1);
 #line 2288 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	g_object_ref_sink (_tmp37_);
+	_tmp35_ = self->shadows_slider;
 #line 2288 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	button_layouter = _tmp37_;
+	gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, gtk_widget_get_type (), GtkWidget), EDITING_TOOLS_ADJUST_TOOL_SLIDER_WIDTH, -1);
 #line 2289 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_box_set_homogeneous (button_layouter, TRUE);
+	_tmp36_ = self->shadows_slider;
+#line 2289 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	gtk_scale_set_draw_value (_tmp36_, FALSE);
 #line 2290 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp38_ = self->cancel_button;
+	_tmp37_ = self->shadows_slider;
 #line 2290 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_box_pack_start (button_layouter, G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 1);
-#line 2291 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp39_ = self->reset_button;
-#line 2291 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_box_pack_start (button_layouter, G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 1);
+	gtk_widget_set_margin_right (G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, gtk_widget_get_type (), GtkWidget), 0);
 #line 2292 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp40_ = self->ok_button;
+	_tmp38_ = _ ("Highlights:");
 #line 2292 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_box_pack_start (button_layouter, G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 1);
-#line 2294 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp41_ = (GtkAlignment*) gtk_alignment_new (0.0f, 0.0f, 0.0f, 0.0f);
-#line 2294 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	g_object_ref_sink (_tmp41_);
+	_tmp39_ = (GtkLabel*) gtk_label_new_with_mnemonic (_tmp38_);
+#line 2292 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	g_object_ref_sink (_tmp39_);
+#line 2292 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	highlights_label = _tmp39_;
+#line 2293 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	gtk_misc_set_alignment (G_TYPE_CHECK_INSTANCE_CAST (highlights_label, gtk_misc_get_type (), GtkMisc), 0.0f, 0.5f);
 #line 2294 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	histogram_aligner = _tmp41_;
+	gtk_grid_attach (slider_organizer, G_TYPE_CHECK_INSTANCE_CAST (highlights_label, gtk_widget_get_type (), GtkWidget), 0, 6, 1, 1);
 #line 2295 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp42_ = self->histogram_manipulator;
+	_tmp40_ = self->highlights_slider;
 #line 2295 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (histogram_aligner, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, gtk_widget_get_type (), GtkWidget));
+	gtk_grid_attach (slider_organizer, G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, gtk_widget_get_type (), GtkWidget), 1, 6, 1, 1);
 #line 2296 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_alignment_set_padding (histogram_aligner, (guint) 12, (guint) 8, (guint) 12, (guint) 12);
-#line 2298 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp43_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 8);
-#line 2298 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	_tmp41_ = self->highlights_slider;
+#line 2296 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, gtk_widget_get_type (), GtkWidget), EDITING_TOOLS_ADJUST_TOOL_SLIDER_WIDTH, -1);
+#line 2297 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	_tmp42_ = self->highlights_slider;
+#line 2297 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	gtk_scale_set_draw_value (_tmp42_, FALSE);
+#line 2299 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	_tmp43_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 8);
+#line 2299 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_object_ref_sink (_tmp43_);
-#line 2298 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	pane_layouter = _tmp43_;
 #line 2299 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (pane_layouter, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (histogram_aligner, gtk_widget_get_type (), GtkWidget));
+	button_layouter = _tmp43_;
 #line 2300 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (pane_layouter, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (slider_organizer, gtk_widget_get_type (), GtkWidget));
+	gtk_box_set_homogeneous (button_layouter, TRUE);
 #line 2301 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (pane_layouter, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (button_layouter, gtk_widget_get_type (), GtkWidget));
+	_tmp44_ = self->cancel_button;
+#line 2301 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	gtk_box_pack_start (button_layouter, G_TYPE_CHECK_INSTANCE_CAST (_tmp44_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 1);
 #line 2302 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	_tmp45_ = self->reset_button;
+#line 2302 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	gtk_box_pack_start (button_layouter, G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 1);
+#line 2303 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	_tmp46_ = self->ok_button;
+#line 2303 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	gtk_box_pack_start (button_layouter, G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 1);
+#line 2305 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	_tmp47_ = (GtkAlignment*) gtk_alignment_new (0.0f, 0.0f, 0.0f, 0.0f);
+#line 2305 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	g_object_ref_sink (_tmp47_);
+#line 2305 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	histogram_aligner = _tmp47_;
+#line 2306 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	_tmp48_ = self->histogram_manipulator;
+#line 2306 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (histogram_aligner, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, gtk_widget_get_type (), GtkWidget));
+#line 2307 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	gtk_alignment_set_padding (histogram_aligner, (guint) 12, (guint) 8, (guint) 12, (guint) 12);
+#line 2309 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	_tmp49_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 8);
+#line 2309 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	g_object_ref_sink (_tmp49_);
+#line 2309 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	pane_layouter = _tmp49_;
+#line 2310 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (pane_layouter, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (histogram_aligner, gtk_widget_get_type (), GtkWidget));
+#line 2311 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (pane_layouter, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (slider_organizer, gtk_widget_get_type (), GtkWidget));
+#line 2312 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (pane_layouter, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (button_layouter, gtk_widget_get_type (), GtkWidget));
+#line 2313 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_box_set_child_packing (pane_layouter, G_TYPE_CHECK_INSTANCE_CAST (histogram_aligner, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0, GTK_PACK_START);
-#line 2304 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2315 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (pane_layouter, gtk_widget_get_type (), GtkWidget));
-#line 2230 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2233 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (pane_layouter);
-#line 2230 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2233 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (histogram_aligner);
-#line 2230 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2233 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (button_layouter);
-#line 2230 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2233 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (highlights_label);
-#line 2230 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2233 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (shadows_label);
-#line 2230 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2233 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (temperature_label);
-#line 2230 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2233 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (tint_label);
-#line 2230 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2233 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (saturation_label);
-#line 2230 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2233 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	_g_object_unref0 (contrast_label);
+#line 2233 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (exposure_label);
-#line 2230 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2233 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (slider_organizer);
-#line 2230 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2233 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return self;
-#line 18208 "EditingTools.c"
+#line 18431 "EditingTools.c"
 }
 
 
 static EditingToolsAdjustToolAdjustToolWindow* editing_tools_adjust_tool_adjust_tool_window_new (GtkWindow* container) {
-#line 2230 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2233 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return editing_tools_adjust_tool_adjust_tool_window_construct (EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_TOOL_WINDOW, container);
-#line 18215 "EditingTools.c"
+#line 18438 "EditingTools.c"
 }
 
 
@@ -18220,22 +18443,23 @@ static void editing_tools_adjust_tool_adjust_tool_window_class_init (EditingTool
 	editing_tools_adjust_tool_adjust_tool_window_parent_class = g_type_class_peek_parent (klass);
 #line 2204 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	G_OBJECT_CLASS (klass)->finalize = editing_tools_adjust_tool_adjust_tool_window_finalize;
-#line 18224 "EditingTools.c"
+#line 18447 "EditingTools.c"
 }
 
 
 static void editing_tools_adjust_tool_adjust_tool_window_instance_init (EditingToolsAdjustToolAdjustToolWindow * self) {
 	GtkScale* _tmp0_ = NULL;
-	GtkScale* _tmp1_ = NULL;
+	GtkHScale* _tmp1_ = NULL;
 	GtkScale* _tmp2_ = NULL;
 	GtkScale* _tmp3_ = NULL;
 	GtkScale* _tmp4_ = NULL;
 	GtkScale* _tmp5_ = NULL;
-	GtkButton* _tmp6_ = NULL;
-	const gchar* _tmp7_ = NULL;
-	GtkButton* _tmp8_ = NULL;
+	GtkScale* _tmp6_ = NULL;
+	GtkButton* _tmp7_ = NULL;
+	const gchar* _tmp8_ = NULL;
 	GtkButton* _tmp9_ = NULL;
-	RGBHistogramManipulator* _tmp10_ = NULL;
+	GtkButton* _tmp10_ = NULL;
+	RGBHistogramManipulator* _tmp11_ = NULL;
 #line 2205 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = (GtkScale*) gtk_scale_new_with_range (GTK_ORIENTATION_HORIZONTAL, (gdouble) EXPOSURE_TRANSFORMATION_MIN_PARAMETER, (gdouble) EXPOSURE_TRANSFORMATION_MAX_PARAMETER, 1.0);
 #line 2205 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -18243,62 +18467,68 @@ static void editing_tools_adjust_tool_adjust_tool_window_instance_init (EditingT
 #line 2205 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->exposure_slider = _tmp0_;
 #line 2208 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp1_ = (GtkScale*) gtk_scale_new_with_range (GTK_ORIENTATION_HORIZONTAL, (gdouble) SATURATION_TRANSFORMATION_MIN_PARAMETER, (gdouble) SATURATION_TRANSFORMATION_MAX_PARAMETER, 1.0);
+	_tmp1_ = (GtkHScale*) gtk_hscale_new_with_range ((gdouble) CONTRAST_TRANSFORMATION_MIN_PARAMETER, (gdouble) CONTRAST_TRANSFORMATION_MAX_PARAMETER, 1.0);
 #line 2208 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_object_ref_sink (_tmp1_);
 #line 2208 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	self->saturation_slider = _tmp1_;
+	self->contrast_slider = _tmp1_;
 #line 2211 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp2_ = (GtkScale*) gtk_scale_new_with_range (GTK_ORIENTATION_HORIZONTAL, (gdouble) TINT_TRANSFORMATION_MIN_PARAMETER, (gdouble) TINT_TRANSFORMATION_MAX_PARAMETER, 1.0);
+	_tmp2_ = (GtkScale*) gtk_scale_new_with_range (GTK_ORIENTATION_HORIZONTAL, (gdouble) SATURATION_TRANSFORMATION_MIN_PARAMETER, (gdouble) SATURATION_TRANSFORMATION_MAX_PARAMETER, 1.0);
 #line 2211 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_object_ref_sink (_tmp2_);
 #line 2211 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	self->tint_slider = _tmp2_;
-#line 2213 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp3_ = (GtkScale*) gtk_scale_new_with_range (GTK_ORIENTATION_HORIZONTAL, (gdouble) TEMPERATURE_TRANSFORMATION_MIN_PARAMETER, (gdouble) TEMPERATURE_TRANSFORMATION_MAX_PARAMETER, 1.0);
-#line 2213 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	self->saturation_slider = _tmp2_;
+#line 2214 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	_tmp3_ = (GtkScale*) gtk_scale_new_with_range (GTK_ORIENTATION_HORIZONTAL, (gdouble) TINT_TRANSFORMATION_MIN_PARAMETER, (gdouble) TINT_TRANSFORMATION_MAX_PARAMETER, 1.0);
+#line 2214 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_object_ref_sink (_tmp3_);
-#line 2213 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	self->temperature_slider = _tmp3_;
-#line 2217 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp4_ = (GtkScale*) gtk_scale_new_with_range (GTK_ORIENTATION_HORIZONTAL, (gdouble) SHADOW_DETAIL_TRANSFORMATION_MIN_PARAMETER, (gdouble) SHADOW_DETAIL_TRANSFORMATION_MAX_PARAMETER, 1.0);
-#line 2217 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2214 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	self->tint_slider = _tmp3_;
+#line 2216 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	_tmp4_ = (GtkScale*) gtk_scale_new_with_range (GTK_ORIENTATION_HORIZONTAL, (gdouble) TEMPERATURE_TRANSFORMATION_MIN_PARAMETER, (gdouble) TEMPERATURE_TRANSFORMATION_MAX_PARAMETER, 1.0);
+#line 2216 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_object_ref_sink (_tmp4_);
-#line 2217 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	self->shadows_slider = _tmp4_;
-#line 2221 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp5_ = (GtkScale*) gtk_scale_new_with_range (GTK_ORIENTATION_HORIZONTAL, (gdouble) HIGHLIGHT_DETAIL_TRANSFORMATION_MIN_PARAMETER, (gdouble) HIGHLIGHT_DETAIL_TRANSFORMATION_MAX_PARAMETER, 1.0);
-#line 2221 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2216 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	self->temperature_slider = _tmp4_;
+#line 2220 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	_tmp5_ = (GtkScale*) gtk_scale_new_with_range (GTK_ORIENTATION_HORIZONTAL, (gdouble) SHADOW_DETAIL_TRANSFORMATION_MIN_PARAMETER, (gdouble) SHADOW_DETAIL_TRANSFORMATION_MAX_PARAMETER, 1.0);
+#line 2220 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_object_ref_sink (_tmp5_);
-#line 2221 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	self->highlights_slider = _tmp5_;
-#line 2225 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp6_ = (GtkButton*) gtk_button_new_with_mnemonic (RESOURCES_OK_LABEL);
-#line 2225 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2220 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	self->shadows_slider = _tmp5_;
+#line 2224 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	_tmp6_ = (GtkScale*) gtk_scale_new_with_range (GTK_ORIENTATION_HORIZONTAL, (gdouble) HIGHLIGHT_DETAIL_TRANSFORMATION_MIN_PARAMETER, (gdouble) HIGHLIGHT_DETAIL_TRANSFORMATION_MAX_PARAMETER, 1.0);
+#line 2224 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_object_ref_sink (_tmp6_);
-#line 2225 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	self->ok_button = _tmp6_;
-#line 2226 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp7_ = _ ("_Reset");
-#line 2226 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp8_ = (GtkButton*) gtk_button_new_with_mnemonic (_tmp7_);
-#line 2226 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	g_object_ref_sink (_tmp8_);
-#line 2226 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	self->reset_button = _tmp8_;
-#line 2227 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp9_ = (GtkButton*) gtk_button_new_with_mnemonic (RESOURCES_CANCEL_LABEL);
-#line 2227 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	g_object_ref_sink (_tmp9_);
-#line 2227 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	self->cancel_button = _tmp9_;
+#line 2224 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	self->highlights_slider = _tmp6_;
 #line 2228 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp10_ = rgb_histogram_manipulator_new ();
+	_tmp7_ = (GtkButton*) gtk_button_new_with_mnemonic (RESOURCES_OK_LABEL);
 #line 2228 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	g_object_ref_sink (_tmp10_);
+	g_object_ref_sink (_tmp7_);
 #line 2228 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	self->histogram_manipulator = _tmp10_;
-#line 18302 "EditingTools.c"
+	self->ok_button = _tmp7_;
+#line 2229 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	_tmp8_ = _ ("_Reset");
+#line 2229 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	_tmp9_ = (GtkButton*) gtk_button_new_with_mnemonic (_tmp8_);
+#line 2229 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	g_object_ref_sink (_tmp9_);
+#line 2229 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	self->reset_button = _tmp9_;
+#line 2230 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	_tmp10_ = (GtkButton*) gtk_button_new_with_mnemonic (RESOURCES_CANCEL_LABEL);
+#line 2230 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	g_object_ref_sink (_tmp10_);
+#line 2230 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	self->cancel_button = _tmp10_;
+#line 2231 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	_tmp11_ = rgb_histogram_manipulator_new ();
+#line 2231 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	g_object_ref_sink (_tmp11_);
+#line 2231 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	self->histogram_manipulator = _tmp11_;
+#line 18532 "EditingTools.c"
 }
 
 
@@ -18309,26 +18539,28 @@ static void editing_tools_adjust_tool_adjust_tool_window_finalize (GObject* obj)
 #line 2205 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->exposure_slider);
 #line 2208 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_g_object_unref0 (self->saturation_slider);
+	_g_object_unref0 (self->contrast_slider);
 #line 2211 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	_g_object_unref0 (self->saturation_slider);
+#line 2214 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->tint_slider);
-#line 2213 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2216 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->temperature_slider);
-#line 2217 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2220 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->shadows_slider);
-#line 2221 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2224 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->highlights_slider);
-#line 2225 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2228 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->ok_button);
-#line 2226 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2229 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->reset_button);
-#line 2227 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2230 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->cancel_button);
-#line 2228 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2231 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->histogram_manipulator);
 #line 2204 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	G_OBJECT_CLASS (editing_tools_adjust_tool_adjust_tool_window_parent_class)->finalize (obj);
-#line 18332 "EditingTools.c"
+#line 18564 "EditingTools.c"
 }
 
 
@@ -18345,9 +18577,9 @@ static GType editing_tools_adjust_tool_adjust_tool_window_get_type (void) {
 
 
 static void _editing_tools_adjust_tool_adjust_tool_command_on_owner_deactivated_editing_tools_editing_tool_deactivated (EditingToolsEditingTool* _sender, gpointer self) {
-#line 2320 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2331 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_adjust_tool_command_on_owner_deactivated ((EditingToolsAdjustToolAdjustToolCommand*) self);
-#line 18351 "EditingTools.c"
+#line 18583 "EditingTools.c"
 }
 
 
@@ -18357,55 +18589,55 @@ static EditingToolsAdjustToolAdjustToolCommand* editing_tools_adjust_tool_adjust
 	const gchar* _tmp1_ = NULL;
 	EditingToolsAdjustTool* _tmp2_ = NULL;
 	EditingToolsAdjustTool* _tmp3_ = NULL;
-#line 2311 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2322 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (owner), NULL);
-#line 2311 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2322 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (name != NULL, NULL);
-#line 2311 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2322 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (explanation != NULL, NULL);
-#line 2312 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2323 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = name;
-#line 2312 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2323 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = explanation;
-#line 2312 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2323 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = (EditingToolsAdjustToolAdjustToolCommand*) command_construct (object_type, _tmp0_, _tmp1_);
-#line 2314 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2325 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = owner;
-#line 2314 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2325 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->owner = _tmp2_;
-#line 2315 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2326 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = owner;
-#line 2315 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2326 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool), "deactivated", (GCallback) _editing_tools_adjust_tool_adjust_tool_command_on_owner_deactivated_editing_tools_editing_tool_deactivated, self, 0);
-#line 2311 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2322 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return self;
-#line 18383 "EditingTools.c"
+#line 18615 "EditingTools.c"
 }
 
 
 static void editing_tools_adjust_tool_adjust_tool_command_on_owner_deactivated (EditingToolsAdjustToolAdjustToolCommand* self) {
 	CommandManager* _tmp0_ = NULL;
 	CommandManager* _tmp1_ = NULL;
-#line 2323 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2334 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_ADJUST_TOOL_IS_ADJUST_TOOL_COMMAND (self));
-#line 2326 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2337 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = app_window_get_command_manager ();
-#line 2326 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2337 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = _tmp0_;
-#line 2326 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2337 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	command_manager_reset (_tmp1_);
-#line 2326 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2337 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_command_manager_unref0 (_tmp1_);
-#line 18400 "EditingTools.c"
+#line 18632 "EditingTools.c"
 }
 
 
 static void editing_tools_adjust_tool_adjust_tool_command_class_init (EditingToolsAdjustToolAdjustToolCommandClass * klass) {
-#line 2308 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2319 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_adjust_tool_command_parent_class = g_type_class_peek_parent (klass);
-#line 2308 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2319 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	G_OBJECT_CLASS (klass)->finalize = editing_tools_adjust_tool_adjust_tool_command_finalize;
-#line 18409 "EditingTools.c"
+#line 18641 "EditingTools.c"
 }
 
 
@@ -18416,26 +18648,26 @@ static void editing_tools_adjust_tool_adjust_tool_command_instance_init (Editing
 static void editing_tools_adjust_tool_adjust_tool_command_finalize (GObject* obj) {
 	EditingToolsAdjustToolAdjustToolCommand * self;
 	EditingToolsAdjustTool* _tmp0_ = NULL;
-#line 2308 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (obj, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_TOOL_COMMAND, EditingToolsAdjustToolAdjustToolCommand);
 #line 2319 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (obj, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_TOOL_COMMAND, EditingToolsAdjustToolAdjustToolCommand);
+#line 2330 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->owner;
-#line 2319 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2330 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp0_ != NULL) {
-#line 18426 "EditingTools.c"
+#line 18658 "EditingTools.c"
 		EditingToolsAdjustTool* _tmp1_ = NULL;
 		guint _tmp2_ = 0U;
-#line 2320 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2331 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp1_ = self->owner;
-#line 2320 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2331 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		g_signal_parse_name ("deactivated", EDITING_TOOLS_TYPE_EDITING_TOOL, &_tmp2_, NULL, FALSE);
-#line 2320 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2331 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp2_, 0, NULL, (GCallback) _editing_tools_adjust_tool_adjust_tool_command_on_owner_deactivated_editing_tools_editing_tool_deactivated, self);
-#line 18435 "EditingTools.c"
+#line 18667 "EditingTools.c"
 	}
-#line 2308 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2319 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	G_OBJECT_CLASS (editing_tools_adjust_tool_adjust_tool_command_parent_class)->finalize (obj);
-#line 18439 "EditingTools.c"
+#line 18671 "EditingTools.c"
 }
 
 
@@ -18460,46 +18692,46 @@ static EditingToolsAdjustToolAdjustResetCommand* editing_tools_adjust_tool_adjus
 	PixelTransformationBundle* _tmp4_ = NULL;
 	PixelTransformationBundle* _tmp5_ = NULL;
 	PixelTransformationBundle* _tmp6_ = NULL;
-#line 2334 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2345 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (owner), NULL);
-#line 2334 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2345 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (IS_PIXEL_TRANSFORMATION_BUNDLE (current), NULL);
-#line 2335 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2346 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = owner;
-#line 2335 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2346 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = _ ("Reset Colors");
-#line 2335 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2346 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = _ ("Reset all color adjustments to original");
-#line 2335 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2346 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = (EditingToolsAdjustToolAdjustResetCommand*) editing_tools_adjust_tool_adjust_tool_command_construct (object_type, _tmp0_, _tmp1_, _tmp2_);
-#line 2337 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2348 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = current;
-#line 2337 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2348 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = pixel_transformation_bundle_copy (_tmp3_);
-#line 2337 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2348 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_pixel_transformation_bundle_unref0 (self->priv->original);
-#line 2337 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2348 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->original = _tmp4_;
-#line 2338 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2349 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = pixel_transformation_bundle_new ();
-#line 2338 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2349 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_pixel_transformation_bundle_unref0 (self->priv->reset);
-#line 2338 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2349 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->reset = _tmp5_;
-#line 2339 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2350 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = self->priv->reset;
-#line 2339 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2350 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	pixel_transformation_bundle_set_to_identity (_tmp6_);
-#line 2334 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2345 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return self;
-#line 18496 "EditingTools.c"
+#line 18728 "EditingTools.c"
 }
 
 
 static EditingToolsAdjustToolAdjustResetCommand* editing_tools_adjust_tool_adjust_reset_command_new (EditingToolsAdjustTool* owner, PixelTransformationBundle* current) {
-#line 2334 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2345 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return editing_tools_adjust_tool_adjust_reset_command_construct (EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_RESET_COMMAND, owner, current);
-#line 18503 "EditingTools.c"
+#line 18735 "EditingTools.c"
 }
 
 
@@ -18507,15 +18739,15 @@ static void editing_tools_adjust_tool_adjust_reset_command_real_execute (Command
 	EditingToolsAdjustToolAdjustResetCommand * self;
 	EditingToolsAdjustTool* _tmp0_ = NULL;
 	PixelTransformationBundle* _tmp1_ = NULL;
-#line 2342 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2353 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_RESET_COMMAND, EditingToolsAdjustToolAdjustResetCommand);
-#line 2343 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2354 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_TOOL_COMMAND, EditingToolsAdjustToolAdjustToolCommand)->owner;
-#line 2343 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2354 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = self->priv->reset;
-#line 2343 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2354 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_set_adjustments (_tmp0_, _tmp1_);
-#line 18519 "EditingTools.c"
+#line 18751 "EditingTools.c"
 }
 
 
@@ -18523,15 +18755,15 @@ static void editing_tools_adjust_tool_adjust_reset_command_real_undo (Command* b
 	EditingToolsAdjustToolAdjustResetCommand * self;
 	EditingToolsAdjustTool* _tmp0_ = NULL;
 	PixelTransformationBundle* _tmp1_ = NULL;
-#line 2346 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2357 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_RESET_COMMAND, EditingToolsAdjustToolAdjustResetCommand);
-#line 2347 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2358 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_TOOL_COMMAND, EditingToolsAdjustToolAdjustToolCommand)->owner;
-#line 2347 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2358 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = self->priv->original;
-#line 2347 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2358 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_set_adjustments (_tmp0_, _tmp1_);
-#line 18535 "EditingTools.c"
+#line 18767 "EditingTools.c"
 }
 
 
@@ -18545,89 +18777,89 @@ static gboolean editing_tools_adjust_tool_adjust_reset_command_real_compress (Co
 	EditingToolsAdjustToolAdjustResetCommand* _tmp3_ = NULL;
 	EditingToolsAdjustTool* _tmp4_ = NULL;
 	EditingToolsAdjustTool* _tmp5_ = NULL;
-#line 2350 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2361 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_RESET_COMMAND, EditingToolsAdjustToolAdjustResetCommand);
-#line 2350 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2361 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (IS_COMMAND (command), FALSE);
-#line 2351 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2362 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = command;
-#line 2351 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2362 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_RESET_COMMAND) ? ((EditingToolsAdjustToolAdjustResetCommand*) _tmp0_) : NULL);
-#line 2351 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2362 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	reset_command = _tmp1_;
-#line 2352 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2363 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = reset_command;
-#line 2352 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2363 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp2_ == NULL) {
-#line 2353 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2364 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		result = FALSE;
-#line 2353 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2364 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_object_unref0 (reset_command);
-#line 2353 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2364 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return result;
-#line 18569 "EditingTools.c"
+#line 18801 "EditingTools.c"
 	}
-#line 2355 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2366 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = reset_command;
-#line 2355 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2366 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_TOOL_COMMAND, EditingToolsAdjustToolAdjustToolCommand)->owner;
-#line 2355 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2366 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_TOOL_COMMAND, EditingToolsAdjustToolAdjustToolCommand)->owner;
-#line 2355 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2366 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp4_ != _tmp5_) {
-#line 2356 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2367 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		result = FALSE;
-#line 2356 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2367 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_object_unref0 (reset_command);
-#line 2356 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2367 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return result;
-#line 18585 "EditingTools.c"
+#line 18817 "EditingTools.c"
 	}
-#line 2359 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2370 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	result = TRUE;
-#line 2359 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2370 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (reset_command);
-#line 2359 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2370 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 18593 "EditingTools.c"
+#line 18825 "EditingTools.c"
 }
 
 
 static void editing_tools_adjust_tool_adjust_reset_command_class_init (EditingToolsAdjustToolAdjustResetCommandClass * klass) {
-#line 2330 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2341 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_adjust_reset_command_parent_class = g_type_class_peek_parent (klass);
-#line 2330 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2341 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_type_class_add_private (klass, sizeof (EditingToolsAdjustToolAdjustResetCommandPrivate));
-#line 2330 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2341 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	((CommandClass *) klass)->execute = editing_tools_adjust_tool_adjust_reset_command_real_execute;
-#line 2330 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2341 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	((CommandClass *) klass)->undo = editing_tools_adjust_tool_adjust_reset_command_real_undo;
-#line 2330 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2341 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	((CommandClass *) klass)->compress = editing_tools_adjust_tool_adjust_reset_command_real_compress;
-#line 2330 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2341 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	G_OBJECT_CLASS (klass)->finalize = editing_tools_adjust_tool_adjust_reset_command_finalize;
-#line 18610 "EditingTools.c"
+#line 18842 "EditingTools.c"
 }
 
 
 static void editing_tools_adjust_tool_adjust_reset_command_instance_init (EditingToolsAdjustToolAdjustResetCommand * self) {
-#line 2330 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2341 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv = EDITING_TOOLS_ADJUST_TOOL_ADJUST_RESET_COMMAND_GET_PRIVATE (self);
-#line 18617 "EditingTools.c"
+#line 18849 "EditingTools.c"
 }
 
 
 static void editing_tools_adjust_tool_adjust_reset_command_finalize (GObject* obj) {
 	EditingToolsAdjustToolAdjustResetCommand * self;
-#line 2330 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2341 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_RESET_COMMAND, EditingToolsAdjustToolAdjustResetCommand);
-#line 2331 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2342 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_pixel_transformation_bundle_unref0 (self->priv->original);
-#line 2332 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2343 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_pixel_transformation_bundle_unref0 (self->priv->reset);
-#line 2330 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2341 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	G_OBJECT_CLASS (editing_tools_adjust_tool_adjust_reset_command_parent_class)->finalize (obj);
-#line 18631 "EditingTools.c"
+#line 18863 "EditingTools.c"
 }
 
 
@@ -18657,62 +18889,62 @@ static EditingToolsAdjustToolSliderAdjustmentCommand* editing_tools_adjust_tool_
 	PixelTransformation* _tmp9_ = NULL;
 	PixelTransformationType _tmp10_ = 0;
 	PixelTransformationType _tmp11_ = 0;
-#line 2368 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2379 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (owner), NULL);
-#line 2368 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2379 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (IS_PIXEL_TRANSFORMATION (old_transformation), NULL);
-#line 2368 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2379 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (IS_PIXEL_TRANSFORMATION (new_transformation), NULL);
-#line 2368 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2379 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (name != NULL, NULL);
-#line 2370 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2381 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = owner;
-#line 2370 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2381 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = name;
-#line 2370 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2381 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = name;
-#line 2370 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2381 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = (EditingToolsAdjustToolSliderAdjustmentCommand*) editing_tools_adjust_tool_adjust_tool_command_construct (object_type, _tmp0_, _tmp1_, _tmp2_);
-#line 2372 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2383 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = old_transformation;
-#line 2372 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2383 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = _pixel_transformation_ref0 (_tmp3_);
-#line 2372 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2383 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_pixel_transformation_unref0 (self->priv->old_transformation);
-#line 2372 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2383 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->old_transformation = _tmp4_;
-#line 2373 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2384 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = new_transformation;
-#line 2373 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2384 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = _pixel_transformation_ref0 (_tmp5_);
-#line 2373 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2384 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_pixel_transformation_unref0 (self->priv->new_transformation);
-#line 2373 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2384 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->new_transformation = _tmp6_;
-#line 2374 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2385 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7_ = old_transformation;
-#line 2374 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2385 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp8_ = pixel_transformation_get_transformation_type (_tmp7_);
-#line 2374 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2385 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->transformation_type = _tmp8_;
-#line 2375 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2386 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp9_ = new_transformation;
-#line 2375 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2386 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp10_ = pixel_transformation_get_transformation_type (_tmp9_);
-#line 2375 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2386 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp11_ = self->priv->transformation_type;
-#line 2375 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2386 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_vala_assert (_tmp10_ == _tmp11_, "new_transformation.get_transformation_type() == transformation_type");
-#line 2368 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2379 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return self;
-#line 18709 "EditingTools.c"
+#line 18941 "EditingTools.c"
 }
 
 
 static EditingToolsAdjustToolSliderAdjustmentCommand* editing_tools_adjust_tool_slider_adjustment_command_new (EditingToolsAdjustTool* owner, PixelTransformation* old_transformation, PixelTransformation* new_transformation, const gchar* name) {
-#line 2368 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2379 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return editing_tools_adjust_tool_slider_adjustment_command_construct (EDITING_TOOLS_ADJUST_TOOL_TYPE_SLIDER_ADJUSTMENT_COMMAND, owner, old_transformation, new_transformation, name);
-#line 18716 "EditingTools.c"
+#line 18948 "EditingTools.c"
 }
 
 
@@ -18722,21 +18954,21 @@ static void editing_tools_adjust_tool_slider_adjustment_command_real_execute (Co
 	PixelTransformation* _tmp1_ = NULL;
 	EditingToolsAdjustTool* _tmp2_ = NULL;
 	EditingToolsPhotoCanvas* _tmp3_ = NULL;
-#line 2378 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2389 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_ADJUST_TOOL_TYPE_SLIDER_ADJUSTMENT_COMMAND, EditingToolsAdjustToolSliderAdjustmentCommand);
-#line 2380 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2391 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_TOOL_COMMAND, EditingToolsAdjustToolAdjustToolCommand)->owner;
-#line 2380 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2391 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = self->priv->new_transformation;
-#line 2380 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2391 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_update_transformation (_tmp0_, _tmp1_);
-#line 2381 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2392 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_TOOL_COMMAND, EditingToolsAdjustToolAdjustToolCommand)->owner;
-#line 2381 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2392 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 2381 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2392 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_photo_canvas_repaint (_tmp3_);
-#line 18740 "EditingTools.c"
+#line 18972 "EditingTools.c"
 }
 
 
@@ -18750,35 +18982,35 @@ static void editing_tools_adjust_tool_slider_adjustment_command_real_undo (Comma
 	EditingToolsAdjustTool* _tmp5_ = NULL;
 	EditingToolsAdjustTool* _tmp6_ = NULL;
 	EditingToolsPhotoCanvas* _tmp7_ = NULL;
-#line 2384 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2395 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_ADJUST_TOOL_TYPE_SLIDER_ADJUSTMENT_COMMAND, EditingToolsAdjustToolSliderAdjustmentCommand);
-#line 2385 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2396 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_TOOL_COMMAND, EditingToolsAdjustToolAdjustToolCommand)->owner;
-#line 2385 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2396 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = self->priv->old_transformation;
-#line 2385 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2396 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_update_transformation (_tmp0_, _tmp1_);
-#line 2387 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2398 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_TOOL_COMMAND, EditingToolsAdjustToolAdjustToolCommand)->owner;
-#line 2387 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2398 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_unbind_window_handlers (_tmp2_);
-#line 2388 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2399 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_TOOL_COMMAND, EditingToolsAdjustToolAdjustToolCommand)->owner;
-#line 2388 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2399 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = self->priv->old_transformation;
-#line 2388 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2399 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_update_slider (_tmp3_, _tmp4_);
-#line 2389 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2400 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_TOOL_COMMAND, EditingToolsAdjustToolAdjustToolCommand)->owner;
-#line 2389 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2400 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_bind_window_handlers (_tmp5_);
-#line 2391 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2402 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_TOOL_COMMAND, EditingToolsAdjustToolAdjustToolCommand)->owner;
-#line 2391 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2402 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 2391 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2402 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_photo_canvas_repaint (_tmp7_);
-#line 18782 "EditingTools.c"
+#line 19014 "EditingTools.c"
 }
 
 
@@ -18792,35 +19024,35 @@ static void editing_tools_adjust_tool_slider_adjustment_command_real_redo (Comma
 	EditingToolsAdjustTool* _tmp5_ = NULL;
 	EditingToolsAdjustTool* _tmp6_ = NULL;
 	EditingToolsPhotoCanvas* _tmp7_ = NULL;
-#line 2394 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2405 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_ADJUST_TOOL_TYPE_SLIDER_ADJUSTMENT_COMMAND, EditingToolsAdjustToolSliderAdjustmentCommand);
-#line 2395 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2406 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_TOOL_COMMAND, EditingToolsAdjustToolAdjustToolCommand)->owner;
-#line 2395 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2406 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = self->priv->new_transformation;
-#line 2395 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2406 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_update_transformation (_tmp0_, _tmp1_);
-#line 2397 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2408 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_TOOL_COMMAND, EditingToolsAdjustToolAdjustToolCommand)->owner;
-#line 2397 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2408 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_unbind_window_handlers (_tmp2_);
-#line 2398 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2409 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_TOOL_COMMAND, EditingToolsAdjustToolAdjustToolCommand)->owner;
-#line 2398 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2409 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = self->priv->new_transformation;
-#line 2398 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2409 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_update_slider (_tmp3_, _tmp4_);
-#line 2399 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2410 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_TOOL_COMMAND, EditingToolsAdjustToolAdjustToolCommand)->owner;
-#line 2399 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2410 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_bind_window_handlers (_tmp5_);
-#line 2401 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2412 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_TOOL_COMMAND, EditingToolsAdjustToolAdjustToolCommand)->owner;
-#line 2401 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2412 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 2401 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2412 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_photo_canvas_repaint (_tmp7_);
-#line 18824 "EditingTools.c"
+#line 19056 "EditingTools.c"
 }
 
 
@@ -18841,121 +19073,121 @@ static gboolean editing_tools_adjust_tool_slider_adjustment_command_real_compres
 	EditingToolsAdjustToolSliderAdjustmentCommand* _tmp10_ = NULL;
 	PixelTransformation* _tmp11_ = NULL;
 	PixelTransformation* _tmp12_ = NULL;
-#line 2404 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2415 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_ADJUST_TOOL_TYPE_SLIDER_ADJUSTMENT_COMMAND, EditingToolsAdjustToolSliderAdjustmentCommand);
-#line 2404 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2415 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (IS_COMMAND (command), FALSE);
-#line 2405 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2416 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = command;
-#line 2405 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2416 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, EDITING_TOOLS_ADJUST_TOOL_TYPE_SLIDER_ADJUSTMENT_COMMAND) ? ((EditingToolsAdjustToolSliderAdjustmentCommand*) _tmp0_) : NULL);
-#line 2405 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2416 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	slider_adjustment = _tmp1_;
-#line 2406 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2417 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = slider_adjustment;
-#line 2406 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2417 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp2_ == NULL) {
-#line 2407 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2418 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		result = FALSE;
-#line 2407 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2418 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_object_unref0 (slider_adjustment);
-#line 2407 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2418 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return result;
-#line 18865 "EditingTools.c"
+#line 19097 "EditingTools.c"
 	}
-#line 2410 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2421 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = slider_adjustment;
-#line 2410 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2421 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_TOOL_COMMAND, EditingToolsAdjustToolAdjustToolCommand)->owner;
-#line 2410 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2421 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_TOOL_COMMAND, EditingToolsAdjustToolAdjustToolCommand)->owner;
-#line 2410 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2421 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp4_ != _tmp5_) {
-#line 2411 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2422 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		result = FALSE;
-#line 2411 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2422 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_object_unref0 (slider_adjustment);
-#line 2411 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2422 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return result;
-#line 18881 "EditingTools.c"
+#line 19113 "EditingTools.c"
 	}
-#line 2414 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2425 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = slider_adjustment;
-#line 2414 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2425 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp7_ = _tmp6_->priv->transformation_type;
-#line 2414 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2425 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp8_ = self->priv->transformation_type;
-#line 2414 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2425 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp7_ != _tmp8_) {
-#line 2415 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2426 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		result = FALSE;
-#line 2415 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2426 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_object_unref0 (slider_adjustment);
-#line 2415 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2426 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return result;
-#line 18897 "EditingTools.c"
+#line 19129 "EditingTools.c"
 	}
-#line 2418 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2429 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp9_ = slider_adjustment;
-#line 2418 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2429 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	command_execute (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_COMMAND, Command));
-#line 2421 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2432 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp10_ = slider_adjustment;
-#line 2421 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2432 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp11_ = _tmp10_->priv->new_transformation;
-#line 2421 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2432 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp12_ = _pixel_transformation_ref0 (_tmp11_);
-#line 2421 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2432 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_pixel_transformation_unref0 (self->priv->new_transformation);
-#line 2421 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2432 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->new_transformation = _tmp12_;
-#line 2423 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2434 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	result = TRUE;
-#line 2423 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2434 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (slider_adjustment);
-#line 2423 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2434 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 18919 "EditingTools.c"
+#line 19151 "EditingTools.c"
 }
 
 
 static void editing_tools_adjust_tool_slider_adjustment_command_class_init (EditingToolsAdjustToolSliderAdjustmentCommandClass * klass) {
-#line 2363 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2374 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_slider_adjustment_command_parent_class = g_type_class_peek_parent (klass);
-#line 2363 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2374 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_type_class_add_private (klass, sizeof (EditingToolsAdjustToolSliderAdjustmentCommandPrivate));
-#line 2363 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2374 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	((CommandClass *) klass)->execute = editing_tools_adjust_tool_slider_adjustment_command_real_execute;
-#line 2363 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2374 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	((CommandClass *) klass)->undo = editing_tools_adjust_tool_slider_adjustment_command_real_undo;
-#line 2363 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2374 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	((CommandClass *) klass)->redo = editing_tools_adjust_tool_slider_adjustment_command_real_redo;
-#line 2363 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2374 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	((CommandClass *) klass)->compress = editing_tools_adjust_tool_slider_adjustment_command_real_compress;
-#line 2363 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2374 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	G_OBJECT_CLASS (klass)->finalize = editing_tools_adjust_tool_slider_adjustment_command_finalize;
-#line 18938 "EditingTools.c"
+#line 19170 "EditingTools.c"
 }
 
 
 static void editing_tools_adjust_tool_slider_adjustment_command_instance_init (EditingToolsAdjustToolSliderAdjustmentCommand * self) {
-#line 2363 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2374 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv = EDITING_TOOLS_ADJUST_TOOL_SLIDER_ADJUSTMENT_COMMAND_GET_PRIVATE (self);
-#line 18945 "EditingTools.c"
+#line 19177 "EditingTools.c"
 }
 
 
 static void editing_tools_adjust_tool_slider_adjustment_command_finalize (GObject* obj) {
 	EditingToolsAdjustToolSliderAdjustmentCommand * self;
-#line 2363 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2374 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, EDITING_TOOLS_ADJUST_TOOL_TYPE_SLIDER_ADJUSTMENT_COMMAND, EditingToolsAdjustToolSliderAdjustmentCommand);
-#line 2365 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2376 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_pixel_transformation_unref0 (self->priv->new_transformation);
-#line 2366 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2377 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_pixel_transformation_unref0 (self->priv->old_transformation);
-#line 2363 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2374 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	G_OBJECT_CLASS (editing_tools_adjust_tool_slider_adjustment_command_parent_class)->finalize (obj);
-#line 18959 "EditingTools.c"
+#line 19191 "EditingTools.c"
 }
 
 
@@ -18978,40 +19210,40 @@ static EditingToolsAdjustToolAdjustEnhanceCommand* editing_tools_adjust_tool_adj
 	Photo* _tmp2_ = NULL;
 	Photo* _tmp3_ = NULL;
 	PixelTransformationBundle* _tmp4_ = NULL;
-#line 2432 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2443 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (owner), NULL);
-#line 2432 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2443 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (IS_PHOTO (photo), NULL);
-#line 2433 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2444 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = owner;
-#line 2433 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2444 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = (EditingToolsAdjustToolAdjustEnhanceCommand*) editing_tools_adjust_tool_adjust_tool_command_construct (object_type, _tmp0_, RESOURCES_ENHANCE_LABEL, RESOURCES_ENHANCE_TOOLTIP);
-#line 2435 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2446 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = photo;
-#line 2435 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2446 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = _g_object_ref0 (_tmp1_);
-#line 2435 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2446 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->priv->photo);
-#line 2435 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2446 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->photo = _tmp2_;
-#line 2436 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = photo;
-#line 2436 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = photo_get_color_adjustments (_tmp3_);
-#line 2436 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_pixel_transformation_bundle_unref0 (self->priv->original);
-#line 2436 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->original = _tmp4_;
-#line 2432 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2443 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return self;
-#line 19008 "EditingTools.c"
+#line 19240 "EditingTools.c"
 }
 
 
 static EditingToolsAdjustToolAdjustEnhanceCommand* editing_tools_adjust_tool_adjust_enhance_command_new (EditingToolsAdjustTool* owner, Photo* photo) {
-#line 2432 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2443 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return editing_tools_adjust_tool_adjust_enhance_command_construct (EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_ENHANCE_COMMAND, owner, photo);
-#line 19015 "EditingTools.c"
+#line 19247 "EditingTools.c"
 }
 
 
@@ -19020,32 +19252,32 @@ static void editing_tools_adjust_tool_adjust_enhance_command_real_execute (Comma
 	PixelTransformationBundle* _tmp0_ = NULL;
 	EditingToolsAdjustTool* _tmp3_ = NULL;
 	PixelTransformationBundle* _tmp4_ = NULL;
-#line 2439 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2450 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_ENHANCE_COMMAND, EditingToolsAdjustToolAdjustEnhanceCommand);
-#line 2440 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2451 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->enhanced;
-#line 2440 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2451 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp0_ == NULL) {
-#line 19030 "EditingTools.c"
+#line 19262 "EditingTools.c"
 		Photo* _tmp1_ = NULL;
 		PixelTransformationBundle* _tmp2_ = NULL;
-#line 2441 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2452 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp1_ = self->priv->photo;
-#line 2441 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2452 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp2_ = photo_get_enhance_transformations (_tmp1_);
-#line 2441 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2452 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_pixel_transformation_bundle_unref0 (self->priv->enhanced);
-#line 2441 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2452 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		self->priv->enhanced = _tmp2_;
-#line 19041 "EditingTools.c"
+#line 19273 "EditingTools.c"
 	}
-#line 2443 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2454 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_TOOL_COMMAND, EditingToolsAdjustToolAdjustToolCommand)->owner;
-#line 2443 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2454 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp4_ = self->priv->enhanced;
-#line 2443 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2454 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_set_adjustments (_tmp3_, _tmp4_);
-#line 19049 "EditingTools.c"
+#line 19281 "EditingTools.c"
 }
 
 
@@ -19053,15 +19285,15 @@ static void editing_tools_adjust_tool_adjust_enhance_command_real_undo (Command*
 	EditingToolsAdjustToolAdjustEnhanceCommand * self;
 	EditingToolsAdjustTool* _tmp0_ = NULL;
 	PixelTransformationBundle* _tmp1_ = NULL;
-#line 2446 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2457 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_ENHANCE_COMMAND, EditingToolsAdjustToolAdjustEnhanceCommand);
-#line 2447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2458 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_TOOL_COMMAND, EditingToolsAdjustToolAdjustToolCommand)->owner;
-#line 2447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2458 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = self->priv->original;
-#line 2447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2458 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_set_adjustments (_tmp0_, _tmp1_);
-#line 19065 "EditingTools.c"
+#line 19297 "EditingTools.c"
 }
 
 
@@ -19079,21 +19311,21 @@ static gboolean editing_tools_adjust_tool_adjust_enhance_command_real_compress (
 	EditingToolsAdjustToolAdjustEnhanceCommand* _tmp15_ = NULL;
 	EditingToolsAdjustTool* _tmp16_ = NULL;
 	EditingToolsAdjustTool* _tmp17_ = NULL;
-#line 2450 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2461 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_ENHANCE_COMMAND, EditingToolsAdjustToolAdjustEnhanceCommand);
-#line 2450 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2461 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (IS_COMMAND (command), FALSE);
-#line 2452 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2463 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = command;
-#line 2452 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2463 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_ENHANCE_SINGLE_COMMAND) ? ((EnhanceSingleCommand*) _tmp0_) : NULL);
-#line 2452 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2463 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	enhance_single = _tmp1_;
-#line 2453 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = enhance_single;
-#line 2453 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp2_ != NULL) {
-#line 19097 "EditingTools.c"
+#line 19329 "EditingTools.c"
 		Photo* photo = NULL;
 		EnhanceSingleCommand* _tmp3_ = NULL;
 		DataSource* _tmp4_ = NULL;
@@ -19104,127 +19336,127 @@ static gboolean editing_tools_adjust_tool_adjust_enhance_command_real_compress (
 		Photo* _tmp9_ = NULL;
 		gboolean _tmp10_ = FALSE;
 		gboolean _tmp11_ = FALSE;
-#line 2454 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2465 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp3_ = enhance_single;
-#line 2454 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2465 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp4_ = single_data_source_command_get_source (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_SINGLE_DATA_SOURCE_COMMAND, SingleDataSourceCommand));
-#line 2454 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2465 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		photo = G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_PHOTO, Photo);
-#line 2458 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp5_ = photo;
-#line 2458 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp6_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_TOOL_COMMAND, EditingToolsAdjustToolAdjustToolCommand)->owner;
-#line 2458 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp7_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 2458 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp8_ = editing_tools_photo_canvas_get_photo (_tmp7_);
-#line 2458 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp9_ = _tmp8_;
-#line 2458 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp10_ = data_source_equals (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_DATA_SOURCE, DataSource), G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_DATA_SOURCE, DataSource));
-#line 2458 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp11_ = _tmp10_;
-#line 2458 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_object_unref0 (_tmp9_);
-#line 2458 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		result = _tmp11_;
-#line 2458 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_object_unref0 (photo);
-#line 2458 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_object_unref0 (enhance_single);
-#line 2458 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return result;
-#line 19138 "EditingTools.c"
+#line 19370 "EditingTools.c"
 	}
-#line 2461 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2472 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp12_ = command;
-#line 2461 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2472 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp13_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp12_, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_ENHANCE_COMMAND) ? ((EditingToolsAdjustToolAdjustEnhanceCommand*) _tmp12_) : NULL);
-#line 2461 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2472 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	enhance_command = _tmp13_;
-#line 2462 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2473 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp14_ = enhance_command;
-#line 2462 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2473 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp14_ == NULL) {
-#line 2463 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2474 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		result = FALSE;
-#line 2463 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2474 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_object_unref0 (enhance_command);
-#line 2463 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2474 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_object_unref0 (enhance_single);
-#line 2463 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2474 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return result;
-#line 19158 "EditingTools.c"
+#line 19390 "EditingTools.c"
 	}
-#line 2465 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2476 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp15_ = enhance_command;
-#line 2465 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2476 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp16_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_TOOL_COMMAND, EditingToolsAdjustToolAdjustToolCommand)->owner;
-#line 2465 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2476 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp17_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_TOOL_COMMAND, EditingToolsAdjustToolAdjustToolCommand)->owner;
-#line 2465 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2476 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp16_ != _tmp17_) {
-#line 2466 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2477 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		result = FALSE;
-#line 2466 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2477 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_object_unref0 (enhance_command);
-#line 2466 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2477 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_object_unref0 (enhance_single);
-#line 2466 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2477 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return result;
-#line 19176 "EditingTools.c"
+#line 19408 "EditingTools.c"
 	}
-#line 2469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2480 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	result = TRUE;
-#line 2469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2480 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (enhance_command);
-#line 2469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2480 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (enhance_single);
-#line 2469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2480 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 19186 "EditingTools.c"
+#line 19418 "EditingTools.c"
 }
 
 
 static void editing_tools_adjust_tool_adjust_enhance_command_class_init (EditingToolsAdjustToolAdjustEnhanceCommandClass * klass) {
-#line 2427 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2438 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_adjust_enhance_command_parent_class = g_type_class_peek_parent (klass);
-#line 2427 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2438 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_type_class_add_private (klass, sizeof (EditingToolsAdjustToolAdjustEnhanceCommandPrivate));
-#line 2427 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2438 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	((CommandClass *) klass)->execute = editing_tools_adjust_tool_adjust_enhance_command_real_execute;
-#line 2427 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2438 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	((CommandClass *) klass)->undo = editing_tools_adjust_tool_adjust_enhance_command_real_undo;
-#line 2427 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2438 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	((CommandClass *) klass)->compress = editing_tools_adjust_tool_adjust_enhance_command_real_compress;
-#line 2427 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2438 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	G_OBJECT_CLASS (klass)->finalize = editing_tools_adjust_tool_adjust_enhance_command_finalize;
-#line 19203 "EditingTools.c"
+#line 19435 "EditingTools.c"
 }
 
 
 static void editing_tools_adjust_tool_adjust_enhance_command_instance_init (EditingToolsAdjustToolAdjustEnhanceCommand * self) {
-#line 2427 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2438 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv = EDITING_TOOLS_ADJUST_TOOL_ADJUST_ENHANCE_COMMAND_GET_PRIVATE (self);
-#line 2430 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2441 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->enhanced = NULL;
-#line 19212 "EditingTools.c"
+#line 19444 "EditingTools.c"
 }
 
 
 static void editing_tools_adjust_tool_adjust_enhance_command_finalize (GObject* obj) {
 	EditingToolsAdjustToolAdjustEnhanceCommand * self;
-#line 2427 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2438 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_ENHANCE_COMMAND, EditingToolsAdjustToolAdjustEnhanceCommand);
-#line 2428 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2439 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->priv->photo);
-#line 2429 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2440 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_pixel_transformation_bundle_unref0 (self->priv->original);
-#line 2430 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2441 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_pixel_transformation_bundle_unref0 (self->priv->enhanced);
-#line 2427 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2438 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	G_OBJECT_CLASS (editing_tools_adjust_tool_adjust_enhance_command_parent_class)->finalize (obj);
-#line 19228 "EditingTools.c"
+#line 19460 "EditingTools.c"
 }
 
 
@@ -19259,50 +19491,52 @@ static void editing_tools_adjust_tool_class_init (EditingToolsAdjustToolClass *
 	((EditingToolsEditingToolClass *) klass)->get_display_pixbuf = editing_tools_adjust_tool_real_get_display_pixbuf;
 #line 2200 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	((EditingToolsEditingToolClass *) klass)->on_keypress = editing_tools_adjust_tool_real_on_keypress;
-#line 19263 "EditingTools.c"
+#line 19495 "EditingTools.c"
 }
 
 
 static void editing_tools_adjust_tool_instance_init (EditingToolsAdjustTool * self) {
 #line 2200 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv = EDITING_TOOLS_ADJUST_TOOL_GET_PRIVATE (self);
-#line 2473 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2484 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->adjust_tool_window = NULL;
-#line 2474 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2485 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->suppress_effect_redraw = FALSE;
-#line 2475 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2486 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->draw_to_pixbuf = NULL;
-#line 2476 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2487 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->histogram_pixbuf = NULL;
-#line 2477 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2488 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->virgin_histogram_pixbuf = NULL;
-#line 2478 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2489 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->transformer = NULL;
-#line 2479 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2490 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->histogram_transformer = NULL;
-#line 2480 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2491 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->transformations = NULL;
-#line 2481 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2492 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->fp_pixel_cache = NULL;
-#line 2481 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2492 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->fp_pixel_cache_length1 = 0;
-#line 2481 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2492 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->_fp_pixel_cache_size_ = self->priv->fp_pixel_cache_length1;
-#line 2482 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2493 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->disable_histogram_refresh = FALSE;
-#line 2483 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2494 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->temperature_scheduler = NULL;
-#line 2484 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2495 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->tint_scheduler = NULL;
-#line 2485 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2496 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	self->priv->contrast_scheduler = NULL;
+#line 2497 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->saturation_scheduler = NULL;
-#line 2486 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2498 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->exposure_scheduler = NULL;
-#line 2487 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2499 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->shadows_scheduler = NULL;
-#line 2488 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2500 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->highlights_scheduler = NULL;
-#line 19306 "EditingTools.c"
+#line 19540 "EditingTools.c"
 }
 
 
@@ -19310,37 +19544,39 @@ static void editing_tools_adjust_tool_finalize (EditingToolsEditingTool* obj) {
 	EditingToolsAdjustTool * self;
 #line 2200 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, EDITING_TOOLS_TYPE_ADJUST_TOOL, EditingToolsAdjustTool);
-#line 2473 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2484 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->priv->adjust_tool_window);
-#line 2475 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2486 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->priv->draw_to_pixbuf);
-#line 2476 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2487 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->priv->histogram_pixbuf);
-#line 2477 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2488 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->priv->virgin_histogram_pixbuf);
-#line 2478 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2489 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_pixel_transformer_unref0 (self->priv->transformer);
-#line 2479 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2490 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_pixel_transformer_unref0 (self->priv->histogram_transformer);
-#line 2480 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2491 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_pixel_transformation_bundle_unref0 (self->priv->transformations);
-#line 2481 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2492 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->fp_pixel_cache = (g_free (self->priv->fp_pixel_cache), NULL);
-#line 2483 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2494 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_one_shot_scheduler_unref0 (self->priv->temperature_scheduler);
-#line 2484 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2495 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_one_shot_scheduler_unref0 (self->priv->tint_scheduler);
-#line 2485 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2496 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	_one_shot_scheduler_unref0 (self->priv->contrast_scheduler);
+#line 2497 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_one_shot_scheduler_unref0 (self->priv->saturation_scheduler);
-#line 2486 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2498 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_one_shot_scheduler_unref0 (self->priv->exposure_scheduler);
-#line 2487 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2499 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_one_shot_scheduler_unref0 (self->priv->shadows_scheduler);
-#line 2488 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+#line 2500 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_one_shot_scheduler_unref0 (self->priv->highlights_scheduler);
 #line 2200 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	EDITING_TOOLS_EDITING_TOOL_CLASS (editing_tools_adjust_tool_parent_class)->finalize (obj);
-#line 19344 "EditingTools.c"
+#line 19580 "EditingTools.c"
 }
 
 
diff --git a/src/editing_tools/EditingTools.vala b/src/editing_tools/EditingTools.vala
index c61a38c..b2ba172 100644
--- a/src/editing_tools/EditingTools.vala
+++ b/src/editing_tools/EditingTools.vala
@@ -755,28 +755,28 @@ public class CropTool : EditingTool {
         result += new ConstraintDescription(_("Screen"), 0, 0, true, SCREEN_ASPECT_RATIO);
         result += new ConstraintDescription(_("Original Size"), 0, 0, true, ORIGINAL_ASPECT_RATIO);
         result += new ConstraintDescription(_("-"), 0, 0, false, SEPARATOR);
-        result += new ConstraintDescription(_("SD Video (4 : 3)"), 4, 3, true);
-        result += new ConstraintDescription(_("HD Video (16 : 9)"), 16, 9, true);
+        result += new ConstraintDescription(_("SD Video (4 ∶ 3)"), 4, 3, true);
+        result += new ConstraintDescription(_("HD Video (16 ∶ 9)"), 16, 9, true);
         result += new ConstraintDescription(_("-"), 0, 0, false, SEPARATOR);
-        result += new ConstraintDescription(_("Wallet (2 x 3 in.)"), 3, 2, true);
-        result += new ConstraintDescription(_("Notecard (3 x 5 in.)"), 5, 3, true);
-        result += new ConstraintDescription(_("4 x 6 in."), 6, 4, true);
-        result += new ConstraintDescription(_("5 x 7 in."), 7, 5, true);
-        result += new ConstraintDescription(_("8 x 10 in."), 10, 8, true);
-        result += new ConstraintDescription(_("Letter (8.5 x 11 in.)"), 85, 110, true);
-        result += new ConstraintDescription(_("11 x 14 in."), 14, 11, true);
-        result += new ConstraintDescription(_("Tabloid (11 x 17 in.)"), 17, 11, true);
-        result += new ConstraintDescription(_("16 x 20 in."), 20, 16, true);
+        result += new ConstraintDescription(_("Wallet (2 × 3 in.)"), 3, 2, true);
+        result += new ConstraintDescription(_("Notecard (3 × 5 in.)"), 5, 3, true);
+        result += new ConstraintDescription(_("4 × 6 in."), 6, 4, true);
+        result += new ConstraintDescription(_("5 × 7 in."), 7, 5, true);
+        result += new ConstraintDescription(_("8 × 10 in."), 10, 8, true);
+        result += new ConstraintDescription(_("Letter (8.5 × 11 in.)"), 85, 110, true);
+        result += new ConstraintDescription(_("11 × 14 in."), 14, 11, true);
+        result += new ConstraintDescription(_("Tabloid (11 × 17 in.)"), 17, 11, true);
+        result += new ConstraintDescription(_("16 × 20 in."), 20, 16, true);
         result += new ConstraintDescription(_("-"), 0, 0, false, SEPARATOR);
-        result += new ConstraintDescription(_("Metric Wallet (9 x 13 cm)"), 13, 9, true);
-        result += new ConstraintDescription(_("Postcard (10 x 15 cm)"), 15, 10, true);
-        result += new ConstraintDescription(_("13 x 18 cm"), 18, 13, true);
-        result += new ConstraintDescription(_("18 x 24 cm"), 24, 18, true);
-        result += new ConstraintDescription(_("A4 (210 x 297 mm)"), 210, 297, true);
-        result += new ConstraintDescription(_("20 x 30 cm"), 30, 20, true);
-        result += new ConstraintDescription(_("24 x 40 cm"), 40, 24, true);
-        result += new ConstraintDescription(_("30 x 40 cm"), 40, 30, true);
-        result += new ConstraintDescription(_("A3 (297 x 420 mm)"), 420, 297, true);
+        result += new ConstraintDescription(_("Metric Wallet (9 × 13 cm)"), 13, 9, true);
+        result += new ConstraintDescription(_("Postcard (10 × 15 cm)"), 15, 10, true);
+        result += new ConstraintDescription(_("13 × 18 cm"), 18, 13, true);
+        result += new ConstraintDescription(_("18 × 24 cm"), 24, 18, true);
+        result += new ConstraintDescription(_("A4 (210 × 297 mm)"), 210, 297, true);
+        result += new ConstraintDescription(_("20 × 30 cm"), 30, 20, true);
+        result += new ConstraintDescription(_("24 × 40 cm"), 40, 24, true);
+        result += new ConstraintDescription(_("30 × 40 cm"), 40, 30, true);
+        result += new ConstraintDescription(_("A3 (297 × 420 mm)"), 420, 297, true);
         result += new ConstraintDescription(_("-"), 0, 0, false, SEPARATOR);
         result += new ConstraintDescription(_("Custom"), 0, 0, true, CUSTOM_ASPECT_RATIO);
 
@@ -2205,6 +2205,9 @@ public class AdjustTool : EditingTool {
         public Gtk.Scale exposure_slider = new Gtk.Scale.with_range(Gtk.Orientation.HORIZONTAL,
             ExposureTransformation.MIN_PARAMETER, ExposureTransformation.MAX_PARAMETER,
             1.0);
+        public Gtk.HScale contrast_slider = new Gtk.HScale.with_range(
+            ContrastTransformation.MIN_PARAMETER, ContrastTransformation.MAX_PARAMETER,
+            1.0);
         public Gtk.Scale saturation_slider = new Gtk.Scale.with_range(Gtk.Orientation.HORIZONTAL,
             SaturationTransformation.MIN_PARAMETER, SaturationTransformation.MAX_PARAMETER,
             1.0);
@@ -2244,19 +2247,27 @@ public class AdjustTool : EditingTool {
             exposure_slider.set_size_request(SLIDER_WIDTH, -1);
             exposure_slider.set_draw_value(false);
             exposure_slider.set_margin_right(0);
-            
+
+            Gtk.Label contrast_label = new Gtk.Label.with_mnemonic(_("Contrast:"));
+            contrast_label.set_alignment(0.0f, 0.5f);
+            slider_organizer.attach(contrast_label, 0, 1, 1, 1);
+            slider_organizer.attach(contrast_slider, 1, 1, 1, 1);
+            contrast_slider.set_size_request(SLIDER_WIDTH, -1);
+            contrast_slider.set_draw_value(false);
+            contrast_slider.set_margin_right(0);
+
             Gtk.Label saturation_label = new Gtk.Label.with_mnemonic(_("Saturation:"));
             saturation_label.set_alignment(0.0f, 0.5f);
-            slider_organizer.attach(saturation_label, 0, 1, 1, 1);
-            slider_organizer.attach(saturation_slider, 1, 1, 1, 1);
+            slider_organizer.attach(saturation_label, 0, 2, 1, 1);
+            slider_organizer.attach(saturation_slider, 1, 2, 1, 1);
             saturation_slider.set_size_request(SLIDER_WIDTH, -1);
             saturation_slider.set_draw_value(false);
             saturation_slider.set_margin_right(0);
 
             Gtk.Label tint_label = new Gtk.Label.with_mnemonic(_("Tint:"));
             tint_label.set_alignment(0.0f, 0.5f);
-            slider_organizer.attach(tint_label, 0, 2, 1, 1);
-            slider_organizer.attach(tint_slider, 1, 2, 1, 1);
+            slider_organizer.attach(tint_label, 0, 3, 1, 1);
+            slider_organizer.attach(tint_slider, 1, 3, 1, 1);
             tint_slider.set_size_request(SLIDER_WIDTH, -1);
             tint_slider.set_draw_value(false);
             tint_slider.set_margin_right(0);
@@ -2264,24 +2275,24 @@ public class AdjustTool : EditingTool {
             Gtk.Label temperature_label =
                 new Gtk.Label.with_mnemonic(_("Temperature:"));
             temperature_label.set_alignment(0.0f, 0.5f);
-            slider_organizer.attach(temperature_label, 0, 3, 1, 1);
-            slider_organizer.attach(temperature_slider, 1, 3, 1, 1);
+            slider_organizer.attach(temperature_label, 0, 4, 1, 1);
+            slider_organizer.attach(temperature_slider, 1, 4, 1, 1);
             temperature_slider.set_size_request(SLIDER_WIDTH, -1);
             temperature_slider.set_draw_value(false);
             temperature_slider.set_margin_right(0);
 
             Gtk.Label shadows_label = new Gtk.Label.with_mnemonic(_("Shadows:"));
             shadows_label.set_alignment(0.0f, 0.5f);
-            slider_organizer.attach(shadows_label, 0, 4, 1, 1);
-            slider_organizer.attach(shadows_slider, 1, 4, 1, 1);
+            slider_organizer.attach(shadows_label, 0, 5, 1, 1);
+            slider_organizer.attach(shadows_slider, 1, 5, 1, 1);
             shadows_slider.set_size_request(SLIDER_WIDTH, -1);
             shadows_slider.set_draw_value(false);
             shadows_slider.set_margin_right(0);
 
             Gtk.Label highlights_label = new Gtk.Label.with_mnemonic(_("Highlights:"));
             highlights_label.set_alignment(0.0f, 0.5f);
-            slider_organizer.attach(highlights_label, 0, 5, 1, 1);
-            slider_organizer.attach(highlights_slider, 1, 5, 1, 1);
+            slider_organizer.attach(highlights_label, 0, 6, 1, 1);
+            slider_organizer.attach(highlights_slider, 1, 6, 1, 1);
             highlights_slider.set_size_request(SLIDER_WIDTH, -1);
             highlights_slider.set_draw_value(false);
 
@@ -2482,6 +2493,7 @@ public class AdjustTool : EditingTool {
     private bool disable_histogram_refresh = false;
     private OneShotScheduler? temperature_scheduler = null;
     private OneShotScheduler? tint_scheduler = null;
+    private OneShotScheduler? contrast_scheduler = null;
     private OneShotScheduler? saturation_scheduler = null;
     private OneShotScheduler? exposure_scheduler = null;
     private OneShotScheduler? shadows_scheduler = null;
@@ -2552,6 +2564,12 @@ public class AdjustTool : EditingTool {
         histogram_transformer.attach_transformation(exposure_trans);
         adjust_tool_window.exposure_slider.set_value(exposure_trans.get_parameter());
 
+        /* set up contrast */
+        ContrastTransformation contrast_trans = (ContrastTransformation)
+            transformations.get_transformation(PixelTransformationType.CONTRAST);
+        histogram_transformer.attach_transformation(contrast_trans);
+        adjust_tool_window.contrast_slider.set_value(contrast_trans.get_parameter());
+
         bind_canvas_handlers(canvas);
         bind_window_handlers();
 
@@ -2690,7 +2708,6 @@ public class AdjustTool : EditingTool {
     private void on_tint_adjustment() {
         if (tint_scheduler == null)
             tint_scheduler = new OneShotScheduler("tint", on_delayed_tint_adjustment);
-
         tint_scheduler.after_timeout(SLIDER_DELAY_MSEC, true);
     }
 
@@ -2700,6 +2717,19 @@ public class AdjustTool : EditingTool {
         slider_updated(new_tint_trans, _("Tint"));
     }
 
+    private void on_contrast_adjustment() {
+        if (this.contrast_scheduler == null)
+            this.contrast_scheduler = new OneShotScheduler("contrast", on_delayed_contrast_adjustment);
+        this.contrast_scheduler.after_timeout(SLIDER_DELAY_MSEC, true);
+    }
+
+    private void on_delayed_contrast_adjustment() {
+        ContrastTransformation new_exp_trans = new ContrastTransformation(
+            (float) adjust_tool_window.contrast_slider.get_value());
+        slider_updated(new_exp_trans, _("Contrast"));
+    }
+
+
     private void on_saturation_adjustment() {
         if (saturation_scheduler == null)
             saturation_scheduler = new OneShotScheduler("saturation", on_delayed_saturation_adjustment);
@@ -2794,6 +2824,7 @@ public class AdjustTool : EditingTool {
         adjust_tool_window.reset_button.clicked.connect(on_reset);
         adjust_tool_window.cancel_button.clicked.connect(notify_cancel);
         adjust_tool_window.exposure_slider.value_changed.connect(on_exposure_adjustment);
+        adjust_tool_window.contrast_slider.value_changed.connect(on_contrast_adjustment);
         adjust_tool_window.saturation_slider.value_changed.connect(on_saturation_adjustment);
         adjust_tool_window.tint_slider.value_changed.connect(on_tint_adjustment);
         adjust_tool_window.temperature_slider.value_changed.connect(on_temperature_adjustment);
@@ -2803,6 +2834,7 @@ public class AdjustTool : EditingTool {
 
         adjust_tool_window.saturation_slider.button_press_event.connect(on_hscale_reset);
         adjust_tool_window.exposure_slider.button_press_event.connect(on_hscale_reset);
+        adjust_tool_window.contrast_slider.button_press_event.connect(on_hscale_reset);
         adjust_tool_window.tint_slider.button_press_event.connect(on_hscale_reset);
         adjust_tool_window.temperature_slider.button_press_event.connect(on_hscale_reset);
         adjust_tool_window.shadows_slider.button_press_event.connect(on_hscale_reset);
@@ -2814,6 +2846,7 @@ public class AdjustTool : EditingTool {
         adjust_tool_window.reset_button.clicked.disconnect(on_reset);
         adjust_tool_window.cancel_button.clicked.disconnect(notify_cancel);
         adjust_tool_window.exposure_slider.value_changed.disconnect(on_exposure_adjustment);
+        adjust_tool_window.contrast_slider.value_changed.disconnect(on_contrast_adjustment);
         adjust_tool_window.saturation_slider.value_changed.disconnect(on_saturation_adjustment);
         adjust_tool_window.tint_slider.value_changed.disconnect(on_tint_adjustment);
         adjust_tool_window.temperature_slider.value_changed.disconnect(on_temperature_adjustment);
@@ -2823,6 +2856,7 @@ public class AdjustTool : EditingTool {
 
         adjust_tool_window.saturation_slider.button_press_event.disconnect(on_hscale_reset);
         adjust_tool_window.exposure_slider.button_press_event.disconnect(on_hscale_reset);
+        adjust_tool_window.contrast_slider.button_press_event.disconnect(on_hscale_reset);
         adjust_tool_window.tint_slider.button_press_event.disconnect(on_hscale_reset);
         adjust_tool_window.temperature_slider.button_press_event.disconnect(on_hscale_reset);
         adjust_tool_window.shadows_slider.button_press_event.disconnect(on_hscale_reset);
@@ -2876,6 +2910,11 @@ public class AdjustTool : EditingTool {
                     ((ShadowDetailTransformation) transformation).get_parameter());
             break;
 
+            case PixelTransformationType.CONTRAST:
+                adjust_tool_window.contrast_slider.set_value(
+                    ((ContrastTransformation) transformation).get_parameter());
+            break;
+
             case PixelTransformationType.HIGHLIGHTS:
                 adjust_tool_window.highlights_slider.set_value(
                     ((HighlightDetailTransformation) transformation).get_parameter());
diff --git a/src/events/EventDirectoryItem.c b/src/events/EventDirectoryItem.c
index 5f70718..c15f5e7 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 __catch49_g_error;
+			goto __catch50_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 __finally49;
-	__catch49_g_error:
+	goto __finally50;
+	__catch50_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"
 	}
-	__finally49:
+	__finally50:
 #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 __catch50_g_error;
+				goto __catch51_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 __finally50;
-		__catch50_g_error:
+		goto __finally51;
+		__catch51_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"
 		}
-		__finally50:
+		__finally51:
 #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/events/EventPage.c b/src/events/EventPage.c
index 492b7a6..0c1e86a 100644
--- a/src/events/EventPage.c
+++ b/src/events/EventPage.c
@@ -836,9 +836,9 @@ static void _event_page_on_make_primary_gtk_action_callback (GtkAction* action,
 static void _vala_array_add130 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
 static void event_page_on_rename (EventPage* self);
 static void _event_page_on_rename_gtk_action_callback (GtkAction* action, gpointer self);
-#define RESOURCES_RENAME_EVENT_MENU _ ("Re_name Event...")
+#define RESOURCES_RENAME_EVENT_MENU _ ("Re_name Event…")
 static void _vala_array_add131 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
-#define RESOURCES_EDIT_EVENT_COMMENT_MENU _ ("Edit Event _Comment...")
+#define RESOURCES_EDIT_EVENT_COMMENT_MENU _ ("Edit Event _Comment…")
 void media_page_on_edit_comment (MediaPage* self);
 static void _media_page_on_edit_comment_gtk_action_callback (GtkAction* action, gpointer self);
 static void _vala_array_add132 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
diff --git a/src/events/EventsDirectoryPage.c b/src/events/EventsDirectoryPage.c
index f4f08e0..a009036 100644
--- a/src/events/EventsDirectoryPage.c
+++ b/src/events/EventsDirectoryPage.c
@@ -992,14 +992,14 @@ GtkActionEntry* page_init_collect_action_entries (Page* self, int* result_length
 #define TRANSLATABLE "translatable"
 static void events_directory_page_on_rename (EventsDirectoryPage* self);
 static void _events_directory_page_on_rename_gtk_action_callback (GtkAction* action, gpointer self);
-#define RESOURCES_RENAME_EVENT_MENU _ ("Re_name Event...")
+#define RESOURCES_RENAME_EVENT_MENU _ ("Re_name Event…")
 static void _vala_array_add126 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
 #define RESOURCES_MERGE_TOOLTIP _ ("Combine events into a single event")
 static void events_directory_page_on_merge (EventsDirectoryPage* self);
 static void _events_directory_page_on_merge_gtk_action_callback (GtkAction* action, gpointer self);
 #define RESOURCES_MERGE_MENU _ ("_Merge Events")
 static void _vala_array_add127 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
-#define RESOURCES_EDIT_COMMENT_MENU _ ("Edit _Comment...")
+#define RESOURCES_EDIT_COMMENT_MENU _ ("Edit _Comment…")
 void events_directory_page_on_edit_comment (EventsDirectoryPage* self);
 static void _events_directory_page_on_edit_comment_gtk_action_callback (GtkAction* action, gpointer self);
 static void _vala_array_add128 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
diff --git a/src/folders/Branch.c b/src/folders/Branch.c
index 469846b..3cb5c74 100644
--- a/src/folders/Branch.c
+++ b/src/folders/Branch.c
@@ -558,7 +558,7 @@ static void _vala_folders_sidebar_entry_set_property (GObject * object, guint pr
 
 
 static void _folders_branch_on_media_contents_altered_data_collection_contents_altered (DataCollection* _sender, GeeIterable* added, GeeIterable* removed, gpointer self) {
-#line 28 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 31 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	folders_branch_on_media_contents_altered ((FoldersBranch*) self, added, removed);
 #line 564 "Branch.c"
 }
@@ -602,16 +602,16 @@ FoldersBranch* folders_branch_construct (GType object_type) {
 #line 13 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	_tmp1_ = _tmp0_;
 #line 13 "/home/jens/Source/shotwell/src/folders/Branch.vala"
-	self = (FoldersBranch*) sidebar_branch_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, SIDEBAR_TYPE_ENTRY, SidebarEntry), SIDEBAR_BRANCH_OPTIONS_STARTUP_OPEN_GROUPING, _folders_branch_comparator_gcompare_func, NULL);
+	self = (FoldersBranch*) sidebar_branch_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, SIDEBAR_TYPE_ENTRY, SidebarEntry), SIDEBAR_BRANCH_OPTIONS_STARTUP_OPEN_GROUPING | SIDEBAR_BRANCH_OPTIONS_HIDE_IF_EMPTY, _folders_branch_comparator_gcompare_func, NULL);
 #line 13 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	_g_object_unref0 (_tmp1_);
-#line 15 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 18 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	_tmp2_ = g_get_home_dir ();
-#line 15 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 18 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	_tmp3_ = g_file_new_for_path (_tmp2_);
-#line 15 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 18 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	_g_object_unref0 (self->priv->home_dir);
-#line 15 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 18 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	self->priv->home_dir = _tmp3_;
 #line 617 "Branch.c"
 	{
@@ -622,25 +622,25 @@ FoldersBranch* folders_branch_construct (GType object_type) {
 		GeeCollection* _tmp7_ = NULL;
 		GeeIterator* _tmp8_ = NULL;
 		GeeIterator* _tmp9_ = NULL;
-#line 17 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 20 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 		_tmp4_ = media_collection_registry_get_instance ();
-#line 17 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 20 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 		_tmp5_ = _tmp4_;
-#line 17 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 20 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 		_tmp6_ = media_collection_registry_get_all (_tmp5_);
-#line 17 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 20 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 		_tmp7_ = _tmp6_;
-#line 17 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 20 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 		_tmp8_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 17 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 20 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 		_tmp9_ = _tmp8_;
-#line 17 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 20 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 		_g_object_unref0 (_tmp7_);
-#line 17 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 20 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 		_media_collection_registry_unref0 (_tmp5_);
-#line 17 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 20 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 		_sources_it = _tmp9_;
-#line 17 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 20 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 		while (TRUE) {
 #line 646 "Branch.c"
 			GeeIterator* _tmp10_ = NULL;
@@ -652,41 +652,41 @@ FoldersBranch* folders_branch_construct (GType object_type) {
 			GeeCollection* _tmp15_ = NULL;
 			GeeCollection* _tmp16_ = NULL;
 			MediaSourceCollection* _tmp17_ = NULL;
-#line 17 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 20 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 			_tmp10_ = _sources_it;
-#line 17 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 20 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 			_tmp11_ = gee_iterator_next (_tmp10_);
-#line 17 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 20 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 			if (!_tmp11_) {
-#line 17 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 20 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 				break;
 #line 664 "Branch.c"
 			}
-#line 17 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 20 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 			_tmp12_ = _sources_it;
-#line 17 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 20 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 			_tmp13_ = gee_iterator_get (_tmp12_);
-#line 17 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 20 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 			sources = (MediaSourceCollection*) _tmp13_;
-#line 19 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 22 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 			_tmp14_ = sources;
-#line 19 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 22 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 			_tmp15_ = data_collection_get_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_DATA_COLLECTION, DataCollection));
-#line 19 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 22 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 			_tmp16_ = _tmp15_;
-#line 19 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 22 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 			folders_branch_on_media_contents_altered (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_ITERABLE, GeeIterable), NULL);
-#line 19 "/home/jens/Source/shotwell/src/folders/Branch.vala"
-			_g_object_unref0 (_tmp16_);
 #line 22 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+			_g_object_unref0 (_tmp16_);
+#line 25 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 			_tmp17_ = sources;
-#line 22 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 25 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 			g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, TYPE_DATA_COLLECTION, DataCollection), "contents-altered", (GCallback) _folders_branch_on_media_contents_altered_data_collection_contents_altered, self, 0);
-#line 17 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 20 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 			_data_collection_unref0 (sources);
 #line 688 "Branch.c"
 		}
-#line 17 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 20 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 		_g_object_unref0 (_sources_it);
 #line 692 "Branch.c"
 	}
@@ -717,43 +717,43 @@ static gint folders_branch_comparator (SidebarEntry* a, SidebarEntry* b) {
 	const gchar* _tmp8_ = NULL;
 	gint _tmp9_ = 0;
 	gint _tmp10_ = 0;
-#line 31 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 34 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	g_return_val_if_fail (SIDEBAR_IS_ENTRY (a), 0);
-#line 31 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 34 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	g_return_val_if_fail (SIDEBAR_IS_ENTRY (b), 0);
-#line 32 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 35 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	_tmp0_ = a;
-#line 32 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 35 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	_tmp1_ = b;
-#line 32 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 35 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	if (_tmp0_ == _tmp1_) {
-#line 33 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 36 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 		result = 0;
-#line 33 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 36 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 		return result;
 #line 735 "Branch.c"
 	}
-#line 35 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 38 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	_tmp2_ = g_strcmp0;
-#line 35 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 38 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	_tmp3_ = a;
-#line 35 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 38 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	_tmp4_ = folders_sidebar_entry_get_collation (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, FOLDERS_TYPE_SIDEBAR_ENTRY, FoldersSidebarEntry));
-#line 35 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 38 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	_tmp5_ = _tmp4_;
-#line 35 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 38 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	_tmp6_ = b;
-#line 35 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 38 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	_tmp7_ = folders_sidebar_entry_get_collation (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, FOLDERS_TYPE_SIDEBAR_ENTRY, FoldersSidebarEntry));
-#line 35 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 38 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	_tmp8_ = _tmp7_;
-#line 35 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 38 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	_tmp9_ = _tmp2_ (_tmp5_, _tmp8_);
-#line 35 "/home/jens/Source/shotwell/src/folders/Branch.vala"
-	coll_key_equality = _tmp9_;
 #line 38 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+	coll_key_equality = _tmp9_;
+#line 41 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	_tmp10_ = coll_key_equality;
-#line 38 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 41 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	if (_tmp10_ == 0) {
 #line 759 "Branch.c"
 		GCompareFunc _tmp11_ = NULL;
@@ -765,37 +765,37 @@ static gint folders_branch_comparator (SidebarEntry* a, SidebarEntry* b) {
 		gchar* _tmp17_ = NULL;
 		gint _tmp18_ = 0;
 		gint _tmp19_ = 0;
-#line 41 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 44 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 		_tmp11_ = g_strcmp0;
-#line 41 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 44 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 		_tmp12_ = a;
-#line 41 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 44 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 		_tmp13_ = sidebar_simple_page_entry_get_sidebar_name (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, FOLDERS_TYPE_SIDEBAR_ENTRY, FoldersSidebarEntry), SIDEBAR_TYPE_SIMPLE_PAGE_ENTRY, SidebarSimplePageEntry));
-#line 41 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 44 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 		_tmp14_ = _tmp13_;
-#line 41 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 44 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 		_tmp15_ = b;
-#line 41 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 44 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 		_tmp16_ = sidebar_simple_page_entry_get_sidebar_name (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, FOLDERS_TYPE_SIDEBAR_ENTRY, FoldersSidebarEntry), SIDEBAR_TYPE_SIMPLE_PAGE_ENTRY, SidebarSimplePageEntry));
-#line 41 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 44 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 		_tmp17_ = _tmp16_;
-#line 41 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 44 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 		_tmp18_ = _tmp11_ (_tmp14_, _tmp17_);
-#line 41 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 44 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 		_tmp19_ = _tmp18_;
-#line 41 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 44 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 		_g_free0 (_tmp17_);
-#line 41 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 44 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 		_g_free0 (_tmp14_);
-#line 41 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 44 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 		result = _tmp19_;
-#line 41 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 44 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 		return result;
 #line 795 "Branch.c"
 	}
-#line 45 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 48 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	result = coll_key_equality;
-#line 45 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 48 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	return result;
 #line 801 "Branch.c"
 }
@@ -804,28 +804,28 @@ static gint folders_branch_comparator (SidebarEntry* a, SidebarEntry* b) {
 static void folders_branch_on_master_source_replaced (FoldersBranch* self, MediaSource* media_source, GFile* old_file, GFile* new_file) {
 	GFile* _tmp0_ = NULL;
 	MediaSource* _tmp1_ = NULL;
-#line 48 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 51 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	g_return_if_fail (FOLDERS_IS_BRANCH (self));
-#line 48 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 51 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	g_return_if_fail (IS_MEDIA_SOURCE (media_source));
-#line 48 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 51 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	g_return_if_fail (G_IS_FILE (old_file));
-#line 48 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 51 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	g_return_if_fail (G_IS_FILE (new_file));
-#line 49 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 52 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	_tmp0_ = old_file;
-#line 49 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 52 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	folders_branch_remove_entry (self, _tmp0_);
-#line 50 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 53 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	_tmp1_ = media_source;
-#line 50 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 53 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	folders_branch_add_entry (self, _tmp1_);
 #line 824 "Branch.c"
 }
 
 
 static void _folders_branch_on_master_source_replaced_media_source_master_replaced (MediaSource* _sender, GFile* old_file, GFile* new_file, gpointer self) {
-#line 57 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 60 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	folders_branch_on_master_source_replaced ((FoldersBranch*) self, _sender, old_file, new_file);
 #line 831 "Branch.c"
 }
@@ -834,28 +834,28 @@ static void _folders_branch_on_master_source_replaced_media_source_master_replac
 static void folders_branch_on_media_contents_altered (FoldersBranch* self, GeeIterable* added, GeeIterable* removed) {
 	GeeIterable* _tmp0_ = NULL;
 	GeeIterable* _tmp9_ = NULL;
-#line 53 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 56 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	g_return_if_fail (FOLDERS_IS_BRANCH (self));
-#line 53 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 56 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	g_return_if_fail ((added == NULL) || GEE_IS_ITERABLE (added));
-#line 53 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 56 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	g_return_if_fail ((removed == NULL) || GEE_IS_ITERABLE (removed));
-#line 54 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 57 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	_tmp0_ = added;
-#line 54 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 57 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	if (_tmp0_ != NULL) {
 #line 848 "Branch.c"
 		{
 			GeeIterator* _object_it = NULL;
 			GeeIterable* _tmp1_ = NULL;
 			GeeIterator* _tmp2_ = NULL;
-#line 55 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 58 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 			_tmp1_ = added;
-#line 55 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 58 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 			_tmp2_ = gee_iterable_iterator (_tmp1_);
-#line 55 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 58 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 			_object_it = _tmp2_;
-#line 55 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 58 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 			while (TRUE) {
 #line 861 "Branch.c"
 				GeeIterator* _tmp3_ = NULL;
@@ -865,55 +865,55 @@ static void folders_branch_on_media_contents_altered (FoldersBranch* self, GeeIt
 				gpointer _tmp6_ = NULL;
 				DataObject* _tmp7_ = NULL;
 				DataObject* _tmp8_ = NULL;
-#line 55 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 58 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 				_tmp3_ = _object_it;
-#line 55 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 58 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 				_tmp4_ = gee_iterator_next (_tmp3_);
-#line 55 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 58 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 				if (!_tmp4_) {
-#line 55 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 58 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 					break;
 #line 877 "Branch.c"
 				}
-#line 55 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 58 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 				_tmp5_ = _object_it;
-#line 55 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 58 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 				_tmp6_ = gee_iterator_get (_tmp5_);
-#line 55 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 58 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 				object = (DataObject*) _tmp6_;
-#line 56 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 59 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 				_tmp7_ = object;
-#line 56 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 59 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 				folders_branch_add_entry (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 57 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 60 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 				_tmp8_ = object;
-#line 57 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 60 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 				g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_MEDIA_SOURCE, MediaSource), "master-replaced", (GCallback) _folders_branch_on_master_source_replaced_media_source_master_replaced, self, 0);
-#line 55 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 58 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 				_g_object_unref0 (object);
 #line 895 "Branch.c"
 			}
-#line 55 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 58 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 			_g_object_unref0 (_object_it);
 #line 899 "Branch.c"
 		}
 	}
-#line 61 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 64 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	_tmp9_ = removed;
-#line 61 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 64 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	if (_tmp9_ != NULL) {
 #line 906 "Branch.c"
 		{
 			GeeIterator* _object_it = NULL;
 			GeeIterable* _tmp10_ = NULL;
 			GeeIterator* _tmp11_ = NULL;
-#line 62 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 65 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 			_tmp10_ = removed;
-#line 62 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 65 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 			_tmp11_ = gee_iterable_iterator (_tmp10_);
-#line 62 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 65 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 			_object_it = _tmp11_;
-#line 62 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 65 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 			while (TRUE) {
 #line 919 "Branch.c"
 				GeeIterator* _tmp12_ = NULL;
@@ -926,43 +926,43 @@ static void folders_branch_on_media_contents_altered (FoldersBranch* self, GeeIt
 				GFile* _tmp18_ = NULL;
 				DataObject* _tmp19_ = NULL;
 				guint _tmp20_ = 0U;
-#line 62 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 65 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 				_tmp12_ = _object_it;
-#line 62 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 65 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 				_tmp13_ = gee_iterator_next (_tmp12_);
-#line 62 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 65 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 				if (!_tmp13_) {
-#line 62 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 65 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 					break;
 #line 938 "Branch.c"
 				}
-#line 62 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 65 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 				_tmp14_ = _object_it;
-#line 62 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 65 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 				_tmp15_ = gee_iterator_get (_tmp14_);
-#line 62 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 65 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 				object = (DataObject*) _tmp15_;
-#line 63 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 66 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 				_tmp16_ = object;
-#line 63 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 66 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 				_tmp17_ = media_source_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 63 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 66 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 				_tmp18_ = _tmp17_;
-#line 63 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 66 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 				folders_branch_remove_entry (self, _tmp18_);
-#line 63 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 66 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 				_g_object_unref0 (_tmp18_);
-#line 64 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 67 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 				_tmp19_ = object;
-#line 64 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 67 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 				g_signal_parse_name ("master-replaced", TYPE_MEDIA_SOURCE, &_tmp20_, NULL, FALSE);
-#line 64 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 67 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 				g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, TYPE_MEDIA_SOURCE, MediaSource), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp20_, 0, NULL, (GCallback) _folders_branch_on_master_source_replaced_media_source_master_replaced, self);
-#line 62 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 65 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 				_g_object_unref0 (object);
 #line 964 "Branch.c"
 			}
-#line 62 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 65 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 			_g_object_unref0 (_object_it);
 #line 968 "Branch.c"
 		}
@@ -971,7 +971,7 @@ static void folders_branch_on_media_contents_altered (FoldersBranch* self, GeeIt
 
 
 static gpointer _g_object_ref0 (gpointer self) {
-#line 93 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 96 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	return self ? g_object_ref (self) : NULL;
 #line 977 "Branch.c"
 }
@@ -987,27 +987,27 @@ static void folders_branch_add_entry (FoldersBranch* self, MediaSource* media) {
 	GFile* _tmp3_ = NULL;
 	GFile* _tmp4_ = NULL;
 	FoldersSidebarEntry* parent_entry = NULL;
-#line 69 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 72 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	g_return_if_fail (FOLDERS_IS_BRANCH (self));
-#line 69 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 72 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	g_return_if_fail (IS_MEDIA_SOURCE (media));
-#line 70 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 73 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	_tmp0_ = media;
-#line 70 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 73 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	_tmp1_ = media_source_get_file (_tmp0_);
-#line 70 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 73 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	file = _tmp1_;
-#line 72 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 75 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	_tmp2_ = gee_array_list_new (G_TYPE_FILE, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
-#line 72 "/home/jens/Source/shotwell/src/folders/Branch.vala"
-	elements = _tmp2_;
 #line 75 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+	elements = _tmp2_;
+#line 78 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	_tmp3_ = file;
-#line 75 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 78 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	_tmp4_ = g_file_get_parent (_tmp3_);
-#line 75 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 78 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	parent = _tmp4_;
-#line 76 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 79 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	while (TRUE) {
 #line 1013 "Branch.c"
 		GFile* _tmp5_ = NULL;
@@ -1021,51 +1021,51 @@ static void folders_branch_add_entry (FoldersBranch* self, MediaSource* media) {
 		GFile* _tmp13_ = NULL;
 		GFile* _tmp14_ = NULL;
 		GFile* _tmp15_ = NULL;
-#line 76 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 79 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 		_tmp5_ = parent;
-#line 76 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 79 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 		if (!(_tmp5_ != NULL)) {
-#line 76 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 79 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 			break;
 #line 1031 "Branch.c"
 		}
-#line 78 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 81 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 		_tmp6_ = parent;
-#line 78 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 81 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 		_tmp7_ = self->priv->home_dir;
-#line 78 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 81 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 		_tmp8_ = g_file_get_parent (_tmp7_);
-#line 78 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 81 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 		_tmp9_ = _tmp8_;
-#line 78 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 81 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 		_tmp10_ = g_file_equal (_tmp6_, _tmp9_);
-#line 78 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 81 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 		_tmp11_ = _tmp10_;
-#line 78 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 81 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 		_g_object_unref0 (_tmp9_);
-#line 78 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 81 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 		if (_tmp11_) {
-#line 79 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 82 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 			break;
 #line 1051 "Branch.c"
 		}
-#line 81 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 84 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 		_tmp12_ = elements;
-#line 81 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 84 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 		_tmp13_ = parent;
-#line 81 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 84 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 		gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp13_);
-#line 83 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 86 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 		_tmp14_ = parent;
-#line 83 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 86 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 		_tmp15_ = g_file_get_parent (_tmp14_);
-#line 83 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 86 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 		_g_object_unref0 (parent);
-#line 83 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 86 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 		parent = _tmp15_;
 #line 1067 "Branch.c"
 	}
-#line 88 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 91 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	parent_entry = NULL;
 #line 1071 "Branch.c"
 	{
@@ -1073,20 +1073,20 @@ static void folders_branch_add_entry (FoldersBranch* self, MediaSource* media) {
 		GeeArrayList* _tmp16_ = NULL;
 		gint _tmp17_ = 0;
 		gint _tmp18_ = 0;
-#line 89 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 92 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 		_tmp16_ = elements;
-#line 89 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 92 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 		_tmp17_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 89 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 92 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 		_tmp18_ = _tmp17_;
-#line 89 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 92 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 		ctr = _tmp18_ - 1;
 #line 1085 "Branch.c"
 		{
 			gboolean _tmp19_ = FALSE;
-#line 89 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 92 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 			_tmp19_ = TRUE;
-#line 89 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 92 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 			while (TRUE) {
 #line 1092 "Branch.c"
 				gint _tmp21_ = 0;
@@ -1102,53 +1102,53 @@ static void folders_branch_add_entry (FoldersBranch* self, MediaSource* media) {
 				gpointer _tmp29_ = NULL;
 				FoldersSidebarEntry* _tmp30_ = NULL;
 				gint _tmp42_ = 0;
-#line 89 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 92 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 				if (!_tmp19_) {
 #line 1108 "Branch.c"
 					gint _tmp20_ = 0;
-#line 89 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 92 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 					_tmp20_ = ctr;
-#line 89 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 92 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 					ctr = _tmp20_ - 1;
 #line 1114 "Branch.c"
 				}
-#line 89 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 92 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 				_tmp19_ = FALSE;
-#line 89 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 92 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 				_tmp21_ = ctr;
-#line 89 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 92 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 				if (!(_tmp21_ >= 0)) {
-#line 89 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 92 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 					break;
 #line 1124 "Branch.c"
 				}
-#line 90 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 93 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 				_tmp22_ = elements;
-#line 90 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 93 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 				_tmp23_ = ctr;
-#line 90 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 93 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 				_tmp24_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp23_);
-#line 90 "/home/jens/Source/shotwell/src/folders/Branch.vala"
-				parent_dir = (GFile*) _tmp24_;
 #line 93 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+				parent_dir = (GFile*) _tmp24_;
+#line 96 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 				_tmp25_ = parent_entry;
-#line 93 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 96 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 				_tmp26_ = _g_object_ref0 (_tmp25_);
-#line 93 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 96 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 				old_parent_entry = _tmp26_;
-#line 95 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 98 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 				_tmp27_ = self->priv->entries;
-#line 95 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 98 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 				_tmp28_ = parent_dir;
-#line 95 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 98 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 				_tmp29_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp28_);
-#line 95 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 98 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 				_g_object_unref0 (parent_entry);
-#line 95 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 98 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 				parent_entry = (FoldersSidebarEntry*) _tmp29_;
-#line 96 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 99 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 				_tmp30_ = parent_entry;
-#line 96 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 99 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 				if (_tmp30_ == NULL) {
 #line 1154 "Branch.c"
 					GFile* _tmp31_ = NULL;
@@ -1159,89 +1159,89 @@ static void folders_branch_add_entry (FoldersBranch* self, MediaSource* media) {
 					SidebarEntry* _tmp36_ = NULL;
 					FoldersSidebarEntry* _tmp37_ = NULL;
 					FoldersSidebarEntry* _tmp41_ = NULL;
-#line 97 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 100 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 					_tmp31_ = parent_dir;
-#line 97 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 100 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 					_tmp32_ = folders_sidebar_entry_new (_tmp31_);
-#line 97 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 100 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 					_g_object_unref0 (parent_entry);
-#line 97 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 100 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 					parent_entry = _tmp32_;
-#line 98 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 101 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 					_tmp33_ = self->priv->entries;
-#line 98 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 101 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 					_tmp34_ = parent_dir;
-#line 98 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 101 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 					_tmp35_ = parent_entry;
-#line 98 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 101 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 					gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp34_, _tmp35_);
-#line 100 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 103 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 					_tmp37_ = old_parent_entry;
-#line 100 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 103 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 					if (_tmp37_ == NULL) {
 #line 1183 "Branch.c"
 						SidebarEntry* _tmp38_ = NULL;
-#line 100 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 103 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 						_tmp38_ = sidebar_branch_get_root (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch));
-#line 100 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 103 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 						_g_object_unref0 (_tmp36_);
-#line 100 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 103 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 						_tmp36_ = _tmp38_;
 #line 1191 "Branch.c"
 					} else {
 						FoldersSidebarEntry* _tmp39_ = NULL;
 						SidebarEntry* _tmp40_ = NULL;
-#line 100 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 103 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 						_tmp39_ = old_parent_entry;
-#line 100 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 103 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 						_tmp40_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, SIDEBAR_TYPE_ENTRY, SidebarEntry));
-#line 100 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 103 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 						_g_object_unref0 (_tmp36_);
-#line 100 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 103 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 						_tmp36_ = _tmp40_;
 #line 1203 "Branch.c"
 					}
-#line 100 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 103 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 					_tmp41_ = parent_entry;
-#line 100 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 103 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 					sidebar_branch_graft (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp36_, G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, SIDEBAR_TYPE_ENTRY, SidebarEntry), NULL);
-#line 96 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 99 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 					_g_object_unref0 (_tmp36_);
 #line 1211 "Branch.c"
 				}
-#line 104 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 107 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 				_tmp42_ = ctr;
-#line 104 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 107 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 				if (_tmp42_ == 0) {
 #line 1217 "Branch.c"
 					FoldersSidebarEntry* _tmp43_ = NULL;
 					gint _tmp44_ = 0;
 					gint _tmp45_ = 0;
-#line 105 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 108 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 					_tmp43_ = parent_entry;
-#line 105 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 108 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 					_tmp44_ = folders_sidebar_entry_get_count (_tmp43_);
-#line 105 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 108 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 					_tmp45_ = _tmp44_;
-#line 105 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 108 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 					folders_sidebar_entry_set_count (_tmp43_, _tmp45_ + 1);
 #line 1229 "Branch.c"
 				}
-#line 89 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 92 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 				_g_object_unref0 (old_parent_entry);
-#line 89 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 92 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 				_g_object_unref0 (parent_dir);
 #line 1235 "Branch.c"
 			}
 		}
 	}
-#line 69 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 72 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	_g_object_unref0 (parent_entry);
-#line 69 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 72 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	_g_object_unref0 (parent);
-#line 69 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 72 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	_g_object_unref0 (elements);
-#line 69 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 72 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	_g_object_unref0 (file);
 #line 1247 "Branch.c"
 }
@@ -1269,94 +1269,94 @@ static void folders_branch_remove_entry (FoldersBranch* self, GFile* file) {
 	FoldersSidebarEntry* _tmp18_ = NULL;
 	FoldersSidebarEntry* _tmp19_ = NULL;
 	FoldersSidebarEntry* _tmp40_ = NULL;
-#line 109 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 112 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	g_return_if_fail (FOLDERS_IS_BRANCH (self));
-#line 109 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 112 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	g_return_if_fail (G_IS_FILE (file));
-#line 110 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 113 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	_tmp0_ = self->priv->entries;
-#line 110 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 113 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	_tmp1_ = file;
-#line 110 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 113 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	_tmp2_ = g_file_get_parent (_tmp1_);
-#line 110 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 113 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	_tmp3_ = _tmp2_;
-#line 110 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 113 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	_tmp4_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp3_);
-#line 110 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 113 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	_tmp5_ = (FoldersSidebarEntry*) _tmp4_;
-#line 110 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 113 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	_g_object_unref0 (_tmp3_);
-#line 110 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 113 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	folder_entry = _tmp5_;
-#line 111 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 114 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	_tmp6_ = folder_entry;
-#line 111 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 114 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	if (_tmp6_ == NULL) {
-#line 112 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 115 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 		_g_object_unref0 (folder_entry);
-#line 112 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 115 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 		return;
 #line 1301 "Branch.c"
 	}
-#line 114 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 117 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	_tmp7_ = folder_entry;
-#line 114 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 117 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	_tmp8_ = folders_sidebar_entry_get_count (_tmp7_);
-#line 114 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 117 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	_tmp9_ = _tmp8_;
-#line 114 "/home/jens/Source/shotwell/src/folders/Branch.vala"
-	_vala_assert (_tmp9_ > 0, "folder_entry.count > 0");
 #line 117 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+	_vala_assert (_tmp9_ > 0, "folder_entry.count > 0");
+#line 120 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	_tmp11_ = folder_entry;
-#line 117 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 120 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	_tmp12_ = folder_entry;
-#line 117 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 120 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	_tmp13_ = folders_sidebar_entry_get_count (_tmp12_);
-#line 117 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 120 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	_tmp14_ = _tmp13_;
-#line 117 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 120 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	folders_sidebar_entry_set_count (_tmp12_, _tmp14_ - 1);
-#line 117 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 120 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	if ((_tmp14_ - 1) > 0) {
-#line 117 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 120 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 		_tmp10_ = TRUE;
 #line 1325 "Branch.c"
 	} else {
 		FoldersSidebarEntry* _tmp15_ = NULL;
 		gint _tmp16_ = 0;
-#line 117 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 120 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 		_tmp15_ = folder_entry;
-#line 117 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 120 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 		_tmp16_ = sidebar_branch_get_child_count (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, SIDEBAR_TYPE_ENTRY, SidebarEntry));
-#line 117 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 120 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 		_tmp10_ = _tmp16_ > 0;
 #line 1335 "Branch.c"
 	}
-#line 117 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 120 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	if (_tmp10_) {
-#line 118 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 121 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 		_g_object_unref0 (folder_entry);
-#line 118 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 121 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 		return;
 #line 1343 "Branch.c"
 	}
-#line 121 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 124 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	_tmp17_ = folder_entry;
-#line 121 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 124 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	_tmp18_ = _g_object_ref0 (_tmp17_);
-#line 121 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 124 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	prune_point = _tmp18_;
-#line 122 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 125 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	_tmp19_ = prune_point;
-#line 122 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 125 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	_vala_assert (_tmp19_ != NULL, "prune_point != null");
 #line 1355 "Branch.c"
 	{
 		gboolean _tmp20_ = FALSE;
-#line 124 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 127 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 		_tmp20_ = TRUE;
-#line 124 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 127 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 		while (TRUE) {
 #line 1362 "Branch.c"
 			gboolean removed = FALSE;
@@ -1375,107 +1375,107 @@ static void folders_branch_remove_entry (FoldersBranch* self, GFile* file) {
 			FoldersSidebarEntry* _tmp32_ = NULL;
 			FoldersSidebarEntry* _tmp38_ = NULL;
 			FoldersSidebarEntry* _tmp39_ = NULL;
-#line 124 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 127 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 			if (!_tmp20_) {
 #line 1381 "Branch.c"
 			}
-#line 124 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 127 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 			_tmp20_ = FALSE;
-#line 125 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 128 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 			_tmp21_ = self->priv->entries;
-#line 125 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 128 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 			_tmp22_ = prune_point;
-#line 125 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 128 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 			_tmp23_ = folders_sidebar_entry_get_dir (_tmp22_);
-#line 125 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 128 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 			_tmp24_ = _tmp23_;
-#line 125 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 128 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 			_tmp25_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp24_, NULL);
-#line 125 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 128 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 			removed = _tmp25_;
-#line 126 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 129 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 			_tmp26_ = removed;
-#line 126 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 129 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 			_vala_assert (_tmp26_, "removed");
-#line 128 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 131 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 			_tmp27_ = prune_point;
-#line 128 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 131 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 			_tmp28_ = sidebar_branch_get_parent (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, SIDEBAR_TYPE_ENTRY, SidebarEntry));
-#line 128 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 131 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 			_tmp29_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp28_, FOLDERS_TYPE_SIDEBAR_ENTRY) ? ((FoldersSidebarEntry*) _tmp28_) : NULL;
-#line 128 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 131 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 			if (_tmp29_ == NULL) {
-#line 128 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 131 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 				_g_object_unref0 (_tmp28_);
 #line 1411 "Branch.c"
 			}
-#line 128 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 131 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 			parent = _tmp29_;
-#line 129 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 132 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 			_tmp32_ = parent;
-#line 129 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 132 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 			if (_tmp32_ == NULL) {
-#line 129 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 132 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 				_tmp31_ = TRUE;
 #line 1421 "Branch.c"
 			} else {
 				FoldersSidebarEntry* _tmp33_ = NULL;
 				gint _tmp34_ = 0;
 				gint _tmp35_ = 0;
-#line 129 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 132 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 				_tmp33_ = parent;
-#line 129 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 132 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 				_tmp34_ = folders_sidebar_entry_get_count (_tmp33_);
-#line 129 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 132 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 				_tmp35_ = _tmp34_;
-#line 129 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 132 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 				_tmp31_ = _tmp35_ != 0;
 #line 1434 "Branch.c"
 			}
-#line 129 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 132 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 			if (_tmp31_) {
-#line 129 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 132 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 				_tmp30_ = TRUE;
 #line 1440 "Branch.c"
 			} else {
 				FoldersSidebarEntry* _tmp36_ = NULL;
 				gint _tmp37_ = 0;
-#line 129 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 132 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 				_tmp36_ = parent;
-#line 129 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 132 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 				_tmp37_ = sidebar_branch_get_child_count (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, SIDEBAR_TYPE_ENTRY, SidebarEntry));
-#line 129 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 132 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 				_tmp30_ = _tmp37_ > 1;
 #line 1450 "Branch.c"
 			}
-#line 129 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 132 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 			if (_tmp30_) {
-#line 130 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 133 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 				_g_object_unref0 (parent);
-#line 130 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 133 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 				break;
 #line 1458 "Branch.c"
 			}
-#line 132 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 135 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 			_tmp38_ = parent;
-#line 132 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 135 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 			_tmp39_ = _g_object_ref0 (_tmp38_);
-#line 132 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 135 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 			_g_object_unref0 (prune_point);
-#line 132 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 135 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 			prune_point = _tmp39_;
-#line 124 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 127 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 			_g_object_unref0 (parent);
 #line 1470 "Branch.c"
 		}
 	}
-#line 135 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 138 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	_tmp40_ = prune_point;
-#line 135 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 138 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	sidebar_branch_prune (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, SIDEBAR_TYPE_ENTRY, SidebarEntry));
-#line 109 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 112 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	_g_object_unref0 (prune_point);
-#line 109 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 112 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	_g_object_unref0 (folder_entry);
 #line 1481 "Branch.c"
 }
@@ -1517,25 +1517,25 @@ static void folders_branch_finalize (GObject* obj) {
 		GeeCollection* _tmp3_ = NULL;
 		GeeIterator* _tmp4_ = NULL;
 		GeeIterator* _tmp5_ = NULL;
-#line 27 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 30 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 		_tmp0_ = media_collection_registry_get_instance ();
-#line 27 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 30 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 		_tmp1_ = _tmp0_;
-#line 27 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 30 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 		_tmp2_ = media_collection_registry_get_all (_tmp1_);
-#line 27 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 30 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 		_tmp3_ = _tmp2_;
-#line 27 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 30 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 		_tmp4_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 27 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 30 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 		_tmp5_ = _tmp4_;
-#line 27 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 30 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 		_g_object_unref0 (_tmp3_);
-#line 27 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 30 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 		_media_collection_registry_unref0 (_tmp1_);
-#line 27 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 30 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 		_sources_it = _tmp5_;
-#line 27 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 30 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 		while (TRUE) {
 #line 1541 "Branch.c"
 			GeeIterator* _tmp6_ = NULL;
@@ -1545,33 +1545,33 @@ static void folders_branch_finalize (GObject* obj) {
 			gpointer _tmp9_ = NULL;
 			MediaSourceCollection* _tmp10_ = NULL;
 			guint _tmp11_ = 0U;
-#line 27 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 30 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 			_tmp6_ = _sources_it;
-#line 27 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 30 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 			_tmp7_ = gee_iterator_next (_tmp6_);
-#line 27 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 30 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 			if (!_tmp7_) {
-#line 27 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 30 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 				break;
 #line 1557 "Branch.c"
 			}
-#line 27 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 30 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 			_tmp8_ = _sources_it;
-#line 27 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 30 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 			_tmp9_ = gee_iterator_get (_tmp8_);
-#line 27 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 30 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 			sources = (MediaSourceCollection*) _tmp9_;
-#line 28 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 31 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 			_tmp10_ = sources;
-#line 28 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 31 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 			g_signal_parse_name ("contents-altered", TYPE_DATA_COLLECTION, &_tmp11_, NULL, FALSE);
-#line 28 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 31 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 			g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_DATA_COLLECTION, DataCollection), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp11_, 0, NULL, (GCallback) _folders_branch_on_media_contents_altered_data_collection_contents_altered, self);
-#line 27 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 30 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 			_data_collection_unref0 (sources);
 #line 1573 "Branch.c"
 		}
-#line 27 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 30 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 		_g_object_unref0 (_sources_it);
 #line 1577 "Branch.c"
 	}
@@ -1600,25 +1600,25 @@ GType folders_branch_get_type (void) {
 FoldersRoot* folders_root_construct (GType object_type) {
 	FoldersRoot * self = NULL;
 	const gchar* _tmp0_ = NULL;
-#line 141 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 144 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	_tmp0_ = _ ("Folders");
-#line 141 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 144 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	self = (FoldersRoot*) sidebar_header_construct (object_type, _tmp0_, TRUE);
-#line 140 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 143 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	return self;
 #line 1610 "Branch.c"
 }
 
 
 FoldersRoot* folders_root_new (void) {
-#line 140 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 143 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	return folders_root_construct (FOLDERS_TYPE_ROOT);
 #line 1617 "Branch.c"
 }
 
 
 static void folders_root_class_init (FoldersRootClass * klass) {
-#line 139 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 142 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	folders_root_parent_class = g_type_class_peek_parent (klass);
 #line 1624 "Branch.c"
 }
@@ -1648,38 +1648,38 @@ FoldersSidebarEntry* folders_sidebar_entry_construct (GType object_type, GFile*
 	gchar* _tmp3_ = NULL;
 	gchar* _tmp4_ = NULL;
 	gchar* _tmp5_ = NULL;
-#line 166 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 169 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	g_return_val_if_fail (G_IS_FILE (dir), NULL);
-#line 166 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 169 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	self = (FoldersSidebarEntry*) sidebar_simple_page_entry_construct (object_type);
-#line 167 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 170 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	_tmp0_ = dir;
-#line 167 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 170 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	folders_sidebar_entry_set_dir (self, _tmp0_);
-#line 168 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 171 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	_tmp1_ = dir;
-#line 168 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 171 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	_tmp2_ = g_file_get_path (_tmp1_);
-#line 168 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 171 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	_tmp3_ = _tmp2_;
-#line 168 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 171 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	_tmp4_ = g_utf8_collate_key_for_filename (_tmp3_, (gssize) -1);
-#line 168 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 171 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	_tmp5_ = _tmp4_;
-#line 168 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 171 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	folders_sidebar_entry_set_collation (self, _tmp5_);
-#line 168 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 171 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	_g_free0 (_tmp5_);
-#line 168 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 171 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	_g_free0 (_tmp3_);
-#line 166 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 169 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	return self;
 #line 1678 "Branch.c"
 }
 
 
 FoldersSidebarEntry* folders_sidebar_entry_new (GFile* dir) {
-#line 166 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 169 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	return folders_sidebar_entry_construct (FOLDERS_TYPE_SIDEBAR_ENTRY, dir);
 #line 1685 "Branch.c"
 }
@@ -1690,15 +1690,15 @@ static gchar* folders_sidebar_entry_real_get_sidebar_name (SidebarSimplePageEntr
 	gchar* result = NULL;
 	GFile* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
-#line 171 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 174 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, FOLDERS_TYPE_SIDEBAR_ENTRY, FoldersSidebarEntry);
-#line 172 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 175 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	_tmp0_ = self->priv->_dir;
-#line 172 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 175 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	_tmp1_ = g_file_get_basename (_tmp0_);
-#line 172 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 175 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	result = _tmp1_;
-#line 172 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 175 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	return result;
 #line 1704 "Branch.c"
 }
@@ -1711,34 +1711,34 @@ static gchar* folders_sidebar_entry_real_get_sidebar_icon (SidebarSimplePageEntr
 	gint _tmp1_ = 0;
 	gint _tmp2_ = 0;
 	gchar* _tmp5_ = NULL;
-#line 175 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 178 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, FOLDERS_TYPE_SIDEBAR_ENTRY, FoldersSidebarEntry);
-#line 176 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 179 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	_tmp1_ = folders_sidebar_entry_get_count (self);
-#line 176 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 179 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	_tmp2_ = _tmp1_;
-#line 176 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 179 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	if (_tmp2_ == 0) {
 #line 1723 "Branch.c"
 		const gchar* _tmp3_ = NULL;
-#line 176 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 179 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 		_tmp3_ = folders_icon;
-#line 176 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 179 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 		_tmp0_ = _tmp3_;
 #line 1729 "Branch.c"
 	} else {
 		const gchar* _tmp4_ = NULL;
-#line 176 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 179 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 		_tmp4_ = folders_have_photos_icon;
-#line 176 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 179 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 		_tmp0_ = _tmp4_;
 #line 1736 "Branch.c"
 	}
-#line 176 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 179 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	_tmp5_ = g_strdup (_tmp0_);
-#line 176 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 179 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	result = _tmp5_;
-#line 176 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 179 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	return result;
 #line 1744 "Branch.c"
 }
@@ -1749,15 +1749,15 @@ static gchar* folders_sidebar_entry_real_to_string (SidebarSimplePageEntry* base
 	gchar* result = NULL;
 	GFile* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
-#line 179 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 182 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, FOLDERS_TYPE_SIDEBAR_ENTRY, FoldersSidebarEntry);
-#line 180 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 183 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	_tmp0_ = self->priv->_dir;
-#line 180 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 183 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	_tmp1_ = g_file_get_path (_tmp0_);
-#line 180 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 183 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	result = _tmp1_;
-#line 180 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 183 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	return result;
 #line 1763 "Branch.c"
 }
@@ -1766,11 +1766,11 @@ static gchar* folders_sidebar_entry_real_to_string (SidebarSimplePageEntry* base
 static gboolean folders_sidebar_entry_real_expand_on_select (SidebarExpandableEntry* base) {
 	FoldersSidebarEntry * self;
 	gboolean result = FALSE;
-#line 183 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 186 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, FOLDERS_TYPE_SIDEBAR_ENTRY, FoldersSidebarEntry);
-#line 184 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 187 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	result = TRUE;
-#line 184 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 187 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	return result;
 #line 1776 "Branch.c"
 }
@@ -1781,17 +1781,17 @@ static Page* folders_sidebar_entry_real_create_page (SidebarSimplePageEntry* bas
 	Page* result = NULL;
 	GFile* _tmp0_ = NULL;
 	FoldersPage* _tmp1_ = NULL;
-#line 187 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 190 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, FOLDERS_TYPE_SIDEBAR_ENTRY, FoldersSidebarEntry);
-#line 188 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 191 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	_tmp0_ = self->priv->_dir;
-#line 188 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 191 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	_tmp1_ = folders_page_new (_tmp0_);
-#line 188 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 191 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	g_object_ref_sink (_tmp1_);
-#line 188 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 191 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PAGE, Page);
-#line 188 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 191 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	return result;
 #line 1797 "Branch.c"
 }
@@ -1800,13 +1800,13 @@ static Page* folders_sidebar_entry_real_create_page (SidebarSimplePageEntry* bas
 GFile* folders_sidebar_entry_get_dir (FoldersSidebarEntry* self) {
 	GFile* result;
 	GFile* _tmp0_ = NULL;
-#line 146 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 149 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	g_return_val_if_fail (FOLDERS_IS_SIDEBAR_ENTRY (self), NULL);
-#line 146 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 149 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	_tmp0_ = self->priv->_dir;
-#line 146 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 149 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	result = _tmp0_;
-#line 146 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 149 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	return result;
 #line 1812 "Branch.c"
 }
@@ -1815,17 +1815,17 @@ GFile* folders_sidebar_entry_get_dir (FoldersSidebarEntry* self) {
 static void folders_sidebar_entry_set_dir (FoldersSidebarEntry* self, GFile* value) {
 	GFile* _tmp0_ = NULL;
 	GFile* _tmp1_ = NULL;
-#line 146 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 149 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	g_return_if_fail (FOLDERS_IS_SIDEBAR_ENTRY (self));
-#line 146 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 149 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	_tmp0_ = value;
-#line 146 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 149 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 146 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 149 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	_g_object_unref0 (self->priv->_dir);
-#line 146 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 149 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	self->priv->_dir = _tmp1_;
-#line 146 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 149 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	g_object_notify ((GObject *) self, "dir");
 #line 1831 "Branch.c"
 }
@@ -1834,13 +1834,13 @@ static void folders_sidebar_entry_set_dir (FoldersSidebarEntry* self, GFile* val
 const gchar* folders_sidebar_entry_get_collation (FoldersSidebarEntry* self) {
 	const gchar* result;
 	const gchar* _tmp0_ = NULL;
-#line 147 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 150 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	g_return_val_if_fail (FOLDERS_IS_SIDEBAR_ENTRY (self), NULL);
-#line 147 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 150 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	_tmp0_ = self->priv->_collation;
-#line 147 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 150 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	result = _tmp0_;
-#line 147 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 150 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	return result;
 #line 1846 "Branch.c"
 }
@@ -1849,17 +1849,17 @@ const gchar* folders_sidebar_entry_get_collation (FoldersSidebarEntry* self) {
 static void folders_sidebar_entry_set_collation (FoldersSidebarEntry* self, const gchar* value) {
 	const gchar* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
-#line 147 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 150 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	g_return_if_fail (FOLDERS_IS_SIDEBAR_ENTRY (self));
-#line 147 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 150 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	_tmp0_ = value;
-#line 147 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 150 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 147 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 150 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	_g_free0 (self->priv->_collation);
-#line 147 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 150 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	self->priv->_collation = _tmp1_;
-#line 147 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 150 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	g_object_notify ((GObject *) self, "collation");
 #line 1865 "Branch.c"
 }
@@ -1868,13 +1868,13 @@ static void folders_sidebar_entry_set_collation (FoldersSidebarEntry* self, cons
 gint folders_sidebar_entry_get_count (FoldersSidebarEntry* self) {
 	gint result;
 	gint _tmp0_ = 0;
-#line 151 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 154 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	g_return_val_if_fail (FOLDERS_IS_SIDEBAR_ENTRY (self), 0);
-#line 152 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 155 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	_tmp0_ = self->priv->_count;
-#line 152 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 155 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	result = _tmp0_;
-#line 152 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 155 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	return result;
 #line 1880 "Branch.c"
 }
@@ -1887,123 +1887,123 @@ void folders_sidebar_entry_set_count (FoldersSidebarEntry* self, gint value) {
 	gboolean _tmp2_ = FALSE;
 	gboolean _tmp3_ = FALSE;
 	gint _tmp4_ = 0;
-#line 155 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 158 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	g_return_if_fail (FOLDERS_IS_SIDEBAR_ENTRY (self));
-#line 156 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 159 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	_tmp0_ = self->priv->_count;
-#line 156 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 159 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	prev_count = _tmp0_;
-#line 157 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 160 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	_tmp1_ = value;
-#line 157 "/home/jens/Source/shotwell/src/folders/Branch.vala"
-	self->priv->_count = _tmp1_;
 #line 160 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+	self->priv->_count = _tmp1_;
+#line 163 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	_tmp4_ = prev_count;
-#line 160 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 163 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	if (_tmp4_ == 0) {
 #line 1905 "Branch.c"
 		gint _tmp5_ = 0;
-#line 160 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 163 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 		_tmp5_ = self->priv->_count;
-#line 160 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 163 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 		_tmp3_ = _tmp5_ == 1;
 #line 1911 "Branch.c"
 	} else {
-#line 160 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 163 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 		_tmp3_ = FALSE;
 #line 1915 "Branch.c"
 	}
-#line 160 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 163 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	if (_tmp3_) {
-#line 160 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 163 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 		_tmp2_ = TRUE;
 #line 1921 "Branch.c"
 	} else {
 		gboolean _tmp6_ = FALSE;
 		gint _tmp7_ = 0;
-#line 160 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 163 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 		_tmp7_ = prev_count;
-#line 160 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 163 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 		if (_tmp7_ == 1) {
 #line 1929 "Branch.c"
 			gint _tmp8_ = 0;
-#line 160 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 163 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 			_tmp8_ = self->priv->_count;
-#line 160 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 163 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 			_tmp6_ = _tmp8_ == 0;
 #line 1935 "Branch.c"
 		} else {
-#line 160 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 163 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 			_tmp6_ = FALSE;
 #line 1939 "Branch.c"
 		}
-#line 160 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 163 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 		_tmp2_ = _tmp6_;
 #line 1943 "Branch.c"
 	}
-#line 160 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 163 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	if (_tmp2_) {
 #line 1947 "Branch.c"
 		gchar* _tmp9_ = NULL;
 		gchar* _tmp10_ = NULL;
-#line 161 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 164 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 		_tmp9_ = sidebar_simple_page_entry_get_sidebar_icon (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_SIMPLE_PAGE_ENTRY, SidebarSimplePageEntry));
-#line 161 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 164 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 		_tmp10_ = _tmp9_;
-#line 161 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 164 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 		g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_ENTRY, SidebarEntry), "sidebar-icon-changed", _tmp10_);
-#line 161 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 164 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 		_g_free0 (_tmp10_);
 #line 1958 "Branch.c"
 	}
-#line 155 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 158 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	g_object_notify ((GObject *) self, "count");
 #line 1962 "Branch.c"
 }
 
 
 static void folders_sidebar_entry_class_init (FoldersSidebarEntryClass * klass) {
-#line 145 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	folders_sidebar_entry_parent_class = g_type_class_peek_parent (klass);
-#line 145 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	g_type_class_add_private (klass, sizeof (FoldersSidebarEntryPrivate));
-#line 145 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	((SidebarSimplePageEntryClass *) klass)->get_sidebar_name = folders_sidebar_entry_real_get_sidebar_name;
-#line 145 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	((SidebarSimplePageEntryClass *) klass)->get_sidebar_icon = folders_sidebar_entry_real_get_sidebar_icon;
-#line 145 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	((SidebarSimplePageEntryClass *) klass)->to_string = folders_sidebar_entry_real_to_string;
-#line 145 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	((SidebarSimplePageEntryClass *) klass)->create_page = folders_sidebar_entry_real_create_page;
-#line 145 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	G_OBJECT_CLASS (klass)->get_property = _vala_folders_sidebar_entry_get_property;
-#line 145 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	G_OBJECT_CLASS (klass)->set_property = _vala_folders_sidebar_entry_set_property;
-#line 145 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	G_OBJECT_CLASS (klass)->finalize = folders_sidebar_entry_finalize;
-#line 145 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	g_object_class_install_property (G_OBJECT_CLASS (klass), FOLDERS_SIDEBAR_ENTRY_DIR, g_param_spec_object ("dir", "dir", "dir", G_TYPE_FILE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE));
-#line 145 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	g_object_class_install_property (G_OBJECT_CLASS (klass), FOLDERS_SIDEBAR_ENTRY_COLLATION, g_param_spec_string ("collation", "collation", "collation", NULL, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE));
-#line 145 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	g_object_class_install_property (G_OBJECT_CLASS (klass), FOLDERS_SIDEBAR_ENTRY_COUNT, g_param_spec_int ("count", "count", "count", G_MININT, G_MAXINT, 0, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE));
 #line 1991 "Branch.c"
 }
 
 
 static void folders_sidebar_entry_sidebar_expandable_entry_interface_init (SidebarExpandableEntryIface * iface) {
-#line 145 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	folders_sidebar_entry_sidebar_expandable_entry_parent_iface = g_type_interface_peek_parent (iface);
-#line 145 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	iface->expand_on_select = (gboolean (*)(SidebarExpandableEntry*)) folders_sidebar_entry_real_expand_on_select;
 #line 2000 "Branch.c"
 }
 
 
 static void folders_sidebar_entry_instance_init (FoldersSidebarEntry * self) {
-#line 145 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	self->priv = FOLDERS_SIDEBAR_ENTRY_GET_PRIVATE (self);
-#line 149 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 152 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	self->priv->_count = 0;
 #line 2009 "Branch.c"
 }
@@ -2011,13 +2011,13 @@ static void folders_sidebar_entry_instance_init (FoldersSidebarEntry * self) {
 
 static void folders_sidebar_entry_finalize (GObject* obj) {
 	FoldersSidebarEntry * self;
-#line 145 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, FOLDERS_TYPE_SIDEBAR_ENTRY, FoldersSidebarEntry);
-#line 146 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 149 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	_g_object_unref0 (self->priv->_dir);
-#line 147 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 150 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	_g_free0 (self->priv->_collation);
-#line 145 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	G_OBJECT_CLASS (folders_sidebar_entry_parent_class)->finalize (obj);
 #line 2023 "Branch.c"
 }
@@ -2040,31 +2040,31 @@ GType folders_sidebar_entry_get_type (void) {
 static void _vala_folders_sidebar_entry_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec) {
 	FoldersSidebarEntry * self;
 	self = G_TYPE_CHECK_INSTANCE_CAST (object, FOLDERS_TYPE_SIDEBAR_ENTRY, FoldersSidebarEntry);
-#line 145 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	switch (property_id) {
-#line 145 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 		case FOLDERS_SIDEBAR_ENTRY_DIR:
-#line 145 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 		g_value_set_object (value, folders_sidebar_entry_get_dir (self));
-#line 145 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 		break;
-#line 145 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 		case FOLDERS_SIDEBAR_ENTRY_COLLATION:
-#line 145 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 		g_value_set_string (value, folders_sidebar_entry_get_collation (self));
-#line 145 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 		break;
-#line 145 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 		case FOLDERS_SIDEBAR_ENTRY_COUNT:
-#line 145 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 		g_value_set_int (value, folders_sidebar_entry_get_count (self));
-#line 145 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 		break;
 #line 2064 "Branch.c"
 		default:
-#line 145 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
-#line 145 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 		break;
 #line 2070 "Branch.c"
 	}
@@ -2074,31 +2074,31 @@ static void _vala_folders_sidebar_entry_get_property (GObject * object, guint pr
 static void _vala_folders_sidebar_entry_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec) {
 	FoldersSidebarEntry * self;
 	self = G_TYPE_CHECK_INSTANCE_CAST (object, FOLDERS_TYPE_SIDEBAR_ENTRY, FoldersSidebarEntry);
-#line 145 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 	switch (property_id) {
-#line 145 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 		case FOLDERS_SIDEBAR_ENTRY_DIR:
-#line 145 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 		folders_sidebar_entry_set_dir (self, g_value_get_object (value));
-#line 145 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 		break;
-#line 145 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 		case FOLDERS_SIDEBAR_ENTRY_COLLATION:
-#line 145 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 		folders_sidebar_entry_set_collation (self, g_value_get_string (value));
-#line 145 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 		break;
-#line 145 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 		case FOLDERS_SIDEBAR_ENTRY_COUNT:
-#line 145 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 		folders_sidebar_entry_set_count (self, g_value_get_int (value));
-#line 145 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 		break;
 #line 2098 "Branch.c"
 		default:
-#line 145 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
-#line 145 "/home/jens/Source/shotwell/src/folders/Branch.vala"
+#line 148 "/home/jens/Source/shotwell/src/folders/Branch.vala"
 		break;
 #line 2104 "Branch.c"
 	}
diff --git a/src/folders/Branch.vala b/src/folders/Branch.vala
index 38b8c80..d14a148 100644
--- a/src/folders/Branch.vala
+++ b/src/folders/Branch.vala
@@ -10,7 +10,10 @@ public class Folders.Branch : Sidebar.Branch {
     private File home_dir;
     
     public class Branch() {
-        base (new Folders.Root(), Sidebar.Branch.Options.STARTUP_OPEN_GROUPING, comparator);
+        base (new Folders.Root(),
+              Sidebar.Branch.Options.STARTUP_OPEN_GROUPING
+              | Sidebar.Branch.Options.HIDE_IF_EMPTY,
+              comparator);
         
         home_dir = File.new_for_path(Environment.get_home_dir());
         
diff --git a/src/library/ImportQueuePage.c b/src/library/ImportQueuePage.c
index 2fba690..112dd16 100644
--- a/src/library/ImportQueuePage.c
+++ b/src/library/ImportQueuePage.c
@@ -462,7 +462,7 @@ GType batch_import_get_type (void) G_GNUC_CONST;
 enum  {
 	IMPORT_QUEUE_PAGE_DUMMY_PROPERTY
 };
-#define IMPORT_QUEUE_PAGE_NAME _ ("Importing...")
+#define IMPORT_QUEUE_PAGE_NAME _ ("Importing…")
 ImportQueuePage* import_queue_page_new (void);
 ImportQueuePage* import_queue_page_construct (GType object_type);
 SinglePhotoPage* single_photo_page_construct (GType object_type, const gchar* page_name, gboolean scale_up_to_viewport);
@@ -1101,7 +1101,7 @@ static void import_queue_page_on_preparing (ImportQueuePage* self) {
 #line 124 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	_tmp0_ = self->priv->progress_bar;
 #line 124 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
-	_tmp1_ = _ ("Preparing to import...");
+	_tmp1_ = _ ("Preparing to import…");
 #line 124 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
 	gtk_progress_bar_set_text (_tmp0_, _tmp1_);
 #line 125 "/home/jens/Source/shotwell/src/library/ImportQueuePage.vala"
diff --git a/src/library/ImportQueuePage.vala b/src/library/ImportQueuePage.vala
index f19f947..b5a5eb6 100644
--- a/src/library/ImportQueuePage.vala
+++ b/src/library/ImportQueuePage.vala
@@ -5,7 +5,7 @@
  */
 
 public class ImportQueuePage : SinglePhotoPage {
-    public const string NAME = _("Importing...");
+    public const string NAME = _("Importing…");
     
     private Gee.ArrayList<BatchImport> queue = new Gee.ArrayList<BatchImport>();
     private Gee.HashSet<BatchImport> cancel_unallowed = new Gee.HashSet<BatchImport>();
@@ -121,7 +121,7 @@ public class ImportQueuePage : SinglePhotoPage {
     }
     
     private void on_preparing() {
-        progress_bar.set_text(_("Preparing to import..."));
+        progress_bar.set_text(_("Preparing to import…"));
         progress_bar.pulse();
     }
     
diff --git a/src/library/ImportQueueSidebarEntry.c b/src/library/ImportQueueSidebarEntry.c
index 5ce68ec..c218235 100644
--- a/src/library/ImportQueueSidebarEntry.c
+++ b/src/library/ImportQueueSidebarEntry.c
@@ -213,7 +213,7 @@ static void library_import_queue_sidebar_entry_on_destroying_page (LibraryImport
 static void _library_import_queue_sidebar_entry_on_destroying_page_sidebar_page_representative_destroying_page (SidebarPageRepresentative* _sender, Page* page, gpointer self);
 void library_hideable_page_entry_set_visible (LibraryHideablePageEntry* self, gboolean value);
 static gchar* library_import_queue_sidebar_entry_real_get_sidebar_name (SidebarSimplePageEntry* base);
-#define IMPORT_QUEUE_PAGE_NAME _ ("Importing...")
+#define IMPORT_QUEUE_PAGE_NAME _ ("Importing…")
 static gchar* library_import_queue_sidebar_entry_real_get_sidebar_icon (SidebarSimplePageEntry* base);
 #define RESOURCES_ICON_IMPORTING "go-down"
 static Page* library_import_queue_sidebar_entry_real_create_page (SidebarSimplePageEntry* base);
diff --git a/src/library/LibraryWindow.c b/src/library/LibraryWindow.c
index 2ef18d9..5a491c5 100644
--- a/src/library/LibraryWindow.c
+++ b/src/library/LibraryWindow.c
@@ -2078,14 +2078,14 @@ LibraryWindow* library_window_construct (GType object_type, ProgressMonitor prog
 #line 181 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 			_g_object_unref0 (ui_file);
 #line 2081 "LibraryWindow.c"
-			goto __catch38_g_error;
+			goto __catch39_g_error;
 		}
 #line 179 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_g_object_unref0 (ui_file);
 #line 2086 "LibraryWindow.c"
 	}
-	goto __finally38;
-	__catch38_g_error:
+	goto __finally39;
+	__catch39_g_error:
 	{
 		GError* e = NULL;
 		const gchar* _tmp27_ = NULL;
@@ -2101,7 +2101,7 @@ LibraryWindow* library_window_construct (GType object_type, ProgressMonitor prog
 		_g_error_free0 (e);
 #line 2103 "LibraryWindow.c"
 	}
-	__finally38:
+	__finally39:
 #line 179 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 179 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -2936,7 +2936,7 @@ static GtkActionEntry* library_window_create_common_actions (LibraryWindow* self
 #line 283 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	import = _tmp1_;
 #line 285 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp2_ = _ ("_Import From Folder...");
+	_tmp2_ = _ ("_Import From Folder…");
 #line 285 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	import.label = _tmp2_;
 #line 286 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -2966,7 +2966,7 @@ static GtkActionEntry* library_window_create_common_actions (LibraryWindow* self
 #line 289 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	import_from_external = _tmp6_;
 #line 293 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp7_ = _ ("Import From _Application...");
+	_tmp7_ = _ ("Import From _Application…");
 #line 293 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	import_from_external.label = _tmp7_;
 #line 294 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -3152,7 +3152,7 @@ static GtkActionEntry* library_window_create_common_actions (LibraryWindow* self
 #line 327 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	new_search = _tmp34_;
 #line 329 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp35_ = _ ("Ne_w Saved Search...");
+	_tmp35_ = _ ("Ne_w Saved Search…");
 #line 329 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	new_search.label = _tmp35_;
 #line 330 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -5932,7 +5932,7 @@ static void library_window_on_empty_trash (LibraryWindow* self) {
 #line 726 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp7_ = _ ("Empty Trash");
 #line 726 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp8_ = _ ("Emptying Trash...");
+	_tmp8_ = _ ("Emptying Trash…");
 #line 726 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	remove_from_app (G_TYPE_CHECK_INSTANCE_CAST (to_remove, GEE_TYPE_COLLECTION, GeeCollection), _tmp7_, _tmp8_);
 #line 728 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -7949,7 +7949,7 @@ static void library_window_on_camera_added (LibraryWindow* self, DiscoveredCamer
 #line 1088 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 7951 "LibraryWindow.c"
-			goto __catch39_g_error;
+			goto __catch40_g_error;
 		}
 #line 1088 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp12_ = _tmp9_;
@@ -7963,8 +7963,8 @@ static void library_window_on_camera_added (LibraryWindow* self, DiscoveredCamer
 		_g_object_unref0 (_tmp9_);
 #line 7964 "LibraryWindow.c"
 	}
-	goto __finally39;
-	__catch39_g_error:
+	goto __finally40;
+	__catch40_g_error:
 	{
 		GError* err = NULL;
 #line 1087 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -7975,7 +7975,7 @@ static void library_window_on_camera_added (LibraryWindow* self, DiscoveredCamer
 		_g_error_free0 (err);
 #line 7976 "LibraryWindow.c"
 	}
-	__finally39:
+	__finally40:
 #line 1087 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1087 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -8624,7 +8624,7 @@ static void library_window_on_library_monitor_discovery_started (LibraryWindow*
 #line 1246 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
 #line 1247 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp0_ = _ ("Updating library...");
+	_tmp0_ = _ ("Updating library…");
 #line 1247 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_start_pulse_background_progress_bar (self, _tmp0_, LIBRARY_WINDOW_STARTUP_SCAN_PROGRESS_PRIORITY);
 #line 8630 "LibraryWindow.c"
@@ -8656,7 +8656,7 @@ static void library_window_on_library_monitor_auto_update_progress (LibraryWindo
 		gint _tmp2_ = 0;
 		gint _tmp3_ = 0;
 #line 1258 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp1_ = _ ("Updating library...");
+		_tmp1_ = _ ("Updating library…");
 #line 1258 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp2_ = completed_files;
 #line 1258 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -8673,7 +8673,7 @@ static void library_window_on_library_monitor_auto_import_preparing (LibraryWind
 #line 1263 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
 #line 1264 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp0_ = _ ("Preparing to auto-import photos...");
+	_tmp0_ = _ ("Preparing to auto-import photos…");
 #line 1264 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	library_window_start_pulse_background_progress_bar (self, _tmp0_, LIBRARY_WINDOW_REALTIME_IMPORT_PROGRESS_PRIORITY);
 #line 8679 "LibraryWindow.c"
@@ -8687,7 +8687,7 @@ static void library_window_on_library_monitor_auto_import_progress (LibraryWindo
 #line 1268 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	g_return_if_fail (IS_LIBRARY_WINDOW (self));
 #line 1269 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-	_tmp0_ = _ ("Auto-importing photos...");
+	_tmp0_ = _ ("Auto-importing photos…");
 #line 1269 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	_tmp1_ = completed_bytes;
 #line 1269 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -8714,7 +8714,7 @@ static void library_window_on_metadata_writer_progress (LibraryWindow* self, gui
 		guint _tmp2_ = 0U;
 		guint _tmp3_ = 0U;
 #line 1277 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
-		_tmp1_ = _ ("Writing metadata to files...");
+		_tmp1_ = _ ("Writing metadata to files…");
 #line 1277 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp2_ = completed;
 #line 1277 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -9989,7 +9989,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 9991 "LibraryWindow.c"
-				goto __catch41_g_regex_error;
+				goto __catch42_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);
@@ -10014,7 +10014,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 10016 "LibraryWindow.c"
-				goto __catch41_g_regex_error;
+				goto __catch42_g_regex_error;
 			}
 #line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			_g_regex_unref0 (regex);
@@ -10040,8 +10040,8 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		return result;
 #line 10041 "LibraryWindow.c"
 	}
-	goto __finally41;
-	__catch41_g_regex_error:
+	goto __finally42;
+	__catch42_g_regex_error:
 	{
 		GError* e = NULL;
 #line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -10054,7 +10054,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		_g_error_free0 (e);
 #line 10055 "LibraryWindow.c"
 	}
-	__finally41:
+	__finally42:
 #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"
@@ -10128,7 +10128,7 @@ void library_window_mounted_camera_shell_notification (LibraryWindow* self, cons
 #line 1535 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 10130 "LibraryWindow.c"
-			goto __catch40_g_error;
+			goto __catch41_g_error;
 		}
 #line 1535 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp9_ = _tmp6_;
@@ -10142,8 +10142,8 @@ void library_window_mounted_camera_shell_notification (LibraryWindow* self, cons
 		_g_object_unref0 (_tmp6_);
 #line 10143 "LibraryWindow.c"
 	}
-	goto __finally40;
-	__catch40_g_error:
+	goto __finally41;
+	__catch41_g_error:
 	{
 		GError* err = NULL;
 		GError* _tmp10_ = NULL;
@@ -10168,7 +10168,7 @@ void library_window_mounted_camera_shell_notification (LibraryWindow* self, cons
 		return;
 #line 10169 "LibraryWindow.c"
 	}
-	__finally40:
+	__finally41:
 #line 1534 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1534 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
diff --git a/src/library/LibraryWindow.vala b/src/library/LibraryWindow.vala
index 19f819b..b464f11 100644
--- a/src/library/LibraryWindow.vala
+++ b/src/library/LibraryWindow.vala
@@ -282,7 +282,7 @@ public class LibraryWindow : AppWindow {
         
         Gtk.ActionEntry import = { "CommonFileImport", Resources.IMPORT,
             TRANSLATABLE, "<Ctrl>I", TRANSLATABLE, on_file_import };
-        import.label = _("_Import From Folder...");
+        import.label = _("_Import From Folder…");
         import.tooltip = _("Import photos from disk to library");
         actions += import;
         
@@ -290,7 +290,7 @@ public class LibraryWindow : AppWindow {
             "ExternalLibraryImport", Resources.IMPORT, TRANSLATABLE,
             null, TRANSLATABLE, on_external_library_import
         };
-        import_from_external.label = _("Import From _Application...");
+        import_from_external.label = _("Import From _Application…");
         actions += import_from_external;
 
         Gtk.ActionEntry sort = { "CommonSortEvents", null, TRANSLATABLE, null, null, null };
@@ -326,7 +326,7 @@ public class LibraryWindow : AppWindow {
         
         Gtk.ActionEntry new_search = { "CommonNewSearch", null, TRANSLATABLE, "<Ctrl>S", null, 
             on_new_search };
-        new_search.label =  _("Ne_w Saved Search...");
+        new_search.label =  _("Ne_w Saved Search…");
         actions += new_search;
 
         // top-level menus
@@ -723,7 +723,7 @@ public class LibraryWindow : AppWindow {
         to_remove.add_all(LibraryPhoto.global.get_trashcan_contents());
         to_remove.add_all(Video.global.get_trashcan_contents());
         
-        remove_from_app(to_remove, _("Empty Trash"),  _("Emptying Trash..."));
+        remove_from_app(to_remove, _("Empty Trash"),  _("Emptying Trash…"));
         
         AppWindow.get_command_manager().reset();
     }
@@ -1244,7 +1244,7 @@ public class LibraryWindow : AppWindow {
     }
     
     private void on_library_monitor_discovery_started() {
-        start_pulse_background_progress_bar(_("Updating library..."), STARTUP_SCAN_PROGRESS_PRIORITY);
+        start_pulse_background_progress_bar(_("Updating library…"), STARTUP_SCAN_PROGRESS_PRIORITY);
     }
     
     private void on_library_monitor_discovery_completed() {
@@ -1255,18 +1255,18 @@ public class LibraryWindow : AppWindow {
         if (total_files < MIN_PROGRESS_BAR_FILES)
             clear_background_progress_bar(REALTIME_UPDATE_PROGRESS_PRIORITY);
         else {
-            update_background_progress_bar(_("Updating library..."), REALTIME_UPDATE_PROGRESS_PRIORITY,
+            update_background_progress_bar(_("Updating library…"), REALTIME_UPDATE_PROGRESS_PRIORITY,
                 completed_files, total_files);
         }
     }
     
     private void on_library_monitor_auto_import_preparing() {
-        start_pulse_background_progress_bar(_("Preparing to auto-import photos..."),
+        start_pulse_background_progress_bar(_("Preparing to auto-import photos…"),
             REALTIME_IMPORT_PROGRESS_PRIORITY);
     }
     
     private void on_library_monitor_auto_import_progress(uint64 completed_bytes, uint64 total_bytes) {
-        update_background_progress_bar(_("Auto-importing photos..."),
+        update_background_progress_bar(_("Auto-importing photos…"),
             REALTIME_IMPORT_PROGRESS_PRIORITY, completed_bytes, total_bytes);
     }
     
@@ -1274,7 +1274,7 @@ public class LibraryWindow : AppWindow {
         if (total < MIN_PROGRESS_BAR_FILES)
             clear_background_progress_bar(METADATA_WRITER_PROGRESS_PRIORITY);
         else {
-            update_background_progress_bar(_("Writing metadata to files..."),
+            update_background_progress_bar(_("Writing metadata to files…"),
                 METADATA_WRITER_PROGRESS_PRIORITY, completed, total);
         }
     }
diff --git a/src/library/OfflinePage.c b/src/library/OfflinePage.c
index dacbda6..ec05a96 100644
--- a/src/library/OfflinePage.c
+++ b/src/library/OfflinePage.c
@@ -1415,7 +1415,7 @@ static void offline_page_on_remove_from_library (OfflinePage* self) {
 #line 106 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 		_tmp20_ = _tmp19_;
 #line 106 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
-		_tmp21_ = _ ("Deleting...");
+		_tmp21_ = _ ("Deleting…");
 #line 106 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
 		_tmp22_ = progress_dialog_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, gtk_window_get_type (), GtkWindow), _tmp21_, NULL);
 #line 106 "/home/jens/Source/shotwell/src/library/OfflinePage.vala"
diff --git a/src/library/OfflinePage.vala b/src/library/OfflinePage.vala
index 771a1fd..899dc53 100644
--- a/src/library/OfflinePage.vala
+++ b/src/library/OfflinePage.vala
@@ -103,7 +103,7 @@ public class OfflinePage : CheckerboardPage {
         
         ProgressDialog progress = null;
         if (sources.size >= 20)
-            progress = new ProgressDialog(AppWindow.get_instance(), _("Deleting..."));
+            progress = new ProgressDialog(AppWindow.get_instance(), _("Deleting…"));
 
         Gee.ArrayList<LibraryPhoto> photos = new Gee.ArrayList<LibraryPhoto>();
         Gee.ArrayList<Video> videos = new Gee.ArrayList<Video>();
diff --git a/src/main.c b/src/main.c
index 8d1726b..b006cc6 100644
--- a/src/main.c
+++ b/src/main.c
@@ -835,11 +835,11 @@ void library_exec (gchar** mounts, int mounts_length1) {
 #line 35 "/home/jens/Source/shotwell/src/main.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 838 "main.c"
-			goto __catch206_g_error;
+			goto __catch219_g_error;
 		}
 	}
-	goto __finally206;
-	__catch206_g_error:
+	goto __finally219;
+	__catch219_g_error:
 	{
 		GError* err = NULL;
 		GError* _tmp7_ = NULL;
@@ -860,7 +860,7 @@ void library_exec (gchar** mounts, int mounts_length1) {
 		return;
 #line 862 "main.c"
 	}
-	__finally206:
+	__finally219:
 #line 34 "/home/jens/Source/shotwell/src/main.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 34 "/home/jens/Source/shotwell/src/main.vala"
@@ -872,7 +872,7 @@ void library_exec (gchar** mounts, int mounts_length1) {
 #line 873 "main.c"
 	}
 #line 43 "/home/jens/Source/shotwell/src/main.vala"
-	g_message ("main.vala:43: Verifying database ...");
+	g_message ("main.vala:43: Verifying database…");
 #line 44 "/home/jens/Source/shotwell/src/main.vala"
 	errormsg = NULL;
 #line 47 "/home/jens/Source/shotwell/src/main.vala"
@@ -906,9 +906,9 @@ void library_exec (gchar** mounts, int mounts_length1) {
 			gint _tmp15_ = 0;
 			gchar* _tmp16_ = NULL;
 #line 54 "/home/jens/Source/shotwell/src/main.vala"
-			_tmp13_ = _ ("Your photo library is not compatible with this version of Shotwell.  I" \
-"t appears it was created by Shotwell %s (schema %d).  This version is " \
-"%s (schema %d).  Please use the latest version of Shotwell.");
+			_tmp13_ = _ ("Your photo library is not compatible with this version of Shotwell. It" \
+" appears it was created by Shotwell %s (schema %d). This version is %s" \
+" (schema %d). Please use the latest version of Shotwell.");
 #line 54 "/home/jens/Source/shotwell/src/main.vala"
 			_tmp14_ = app_version;
 #line 54 "/home/jens/Source/shotwell/src/main.vala"
@@ -933,8 +933,8 @@ void library_exec (gchar** mounts, int mounts_length1) {
 			gchar* _tmp20_ = NULL;
 #line 59 "/home/jens/Source/shotwell/src/main.vala"
 			_tmp17_ = _ ("Shotwell was unable to upgrade your photo library from version %s (sch" \
-"ema %d) to %s (schema %d).  For more information please check the Shot" \
-"well Wiki at %s");
+"ema %d) to %s (schema %d). For more information please check the Shotw" \
+"ell Wiki at %s");
 #line 59 "/home/jens/Source/shotwell/src/main.vala"
 			_tmp18_ = app_version;
 #line 59 "/home/jens/Source/shotwell/src/main.vala"
@@ -962,10 +962,10 @@ void library_exec (gchar** mounts, int mounts_length1) {
 			gchar* _tmp27_ = NULL;
 			gchar* _tmp28_ = NULL;
 #line 65 "/home/jens/Source/shotwell/src/main.vala"
-			_tmp21_ = _ ("Your photo library is not compatible with this version of Shotwell.  I" \
-"t appears it was created by Shotwell %s (schema %d).  This version is " \
-"%s (schema %d).  Please clear your library by deleting %s and re-impor" \
-"t your photos.");
+			_tmp21_ = _ ("Your photo library is not compatible with this version of Shotwell. It" \
+" appears it was created by Shotwell %s (schema %d). This version is %s" \
+" (schema %d). Please clear your library by deleting %s and re-import y" \
+"our photos.");
 #line 65 "/home/jens/Source/shotwell/src/main.vala"
 			_tmp22_ = app_version;
 #line 65 "/home/jens/Source/shotwell/src/main.vala"
@@ -999,7 +999,7 @@ void library_exec (gchar** mounts, int mounts_length1) {
 			GEnumValue* _tmp31_;
 			gchar* _tmp32_ = NULL;
 #line 71 "/home/jens/Source/shotwell/src/main.vala"
-			_tmp29_ = _ ("Unknown error attempting to verify Shotwell's database: %s");
+			_tmp29_ = _ ("Unknown error attempting to verify Shotwell’s database: %s");
 #line 71 "/home/jens/Source/shotwell/src/main.vala"
 			_tmp30_ = _result_;
 #line 72 "/home/jens/Source/shotwell/src/main.vala"
@@ -1218,7 +1218,7 @@ void library_exec (gchar** mounts, int mounts_length1) {
 #line 109 "/home/jens/Source/shotwell/src/main.vala"
 					_g_free0 (icon_path);
 #line 1214 "main.c"
-					goto __catch207_g_error;
+					goto __catch220_g_error;
 				}
 #line 109 "/home/jens/Source/shotwell/src/main.vala"
 				_tmp72_ = progress_dialog;
@@ -1230,8 +1230,8 @@ void library_exec (gchar** mounts, int mounts_length1) {
 				_g_free0 (icon_path);
 #line 1225 "main.c"
 			}
-			goto __finally207;
-			__catch207_g_error:
+			goto __finally220;
+			__catch220_g_error:
 			{
 				GError* err = NULL;
 				GError* _tmp73_ = NULL;
@@ -1251,7 +1251,7 @@ void library_exec (gchar** mounts, int mounts_length1) {
 				_g_error_free0 (err);
 #line 1245 "main.c"
 			}
-			__finally207:
+			__finally220:
 #line 107 "/home/jens/Source/shotwell/src/main.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 107 "/home/jens/Source/shotwell/src/main.vala"
@@ -1927,11 +1927,11 @@ void editing_exec (const gchar* filename) {
 #line 253 "/home/jens/Source/shotwell/src/main.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1922 "main.c"
-			goto __catch208_g_error;
+			goto __catch221_g_error;
 		}
 	}
-	goto __finally208;
-	__catch208_g_error:
+	goto __finally221;
+	__catch221_g_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
@@ -1954,7 +1954,7 @@ void editing_exec (const gchar* filename) {
 		return;
 #line 1948 "main.c"
 	}
-	__finally208:
+	__finally221:
 #line 252 "/home/jens/Source/shotwell/src/main.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 252 "/home/jens/Source/shotwell/src/main.vala"
@@ -2174,7 +2174,7 @@ GOptionEntry* commandline_options_get_options (int* result_length1) {
 #line 2167 "main.c"
 	}
 #line 293 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp4_ = _ ("Path to Shotwell's private data");
+	_tmp4_ = _ ("Path to Shotwell’s private data");
 #line 293 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp5_ = _ ("DIRECTORY");
 #line 293 "/home/jens/Source/shotwell/src/main.vala"
@@ -2228,7 +2228,7 @@ GOptionEntry* commandline_options_get_options (int* result_length1) {
 #line 299 "/home/jens/Source/shotwell/src/main.vala"
 	_vala_array_add153 (&commandline_options_entries, &commandline_options_entries_length1, &_commandline_options_entries_size_, &_tmp12_);
 #line 301 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp13_ = _ ("Don't display startup progress meter");
+	_tmp13_ = _ ("Don’t display startup progress meter");
 #line 301 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp14_.long_name = "no-startup-progress";
 #line 301 "/home/jens/Source/shotwell/src/main.vala"
@@ -2254,7 +2254,7 @@ GOptionEntry* commandline_options_get_options (int* result_length1) {
 #line 303 "/home/jens/Source/shotwell/src/main.vala"
 	_vala_array_add154 (&commandline_options_entries, &commandline_options_entries_length1, &_commandline_options_entries_size_, &_tmp16_);
 #line 305 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp17_ = _ ("Show the application's version");
+	_tmp17_ = _ ("Show the application’s version");
 #line 305 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp18_.long_name = "version";
 #line 305 "/home/jens/Source/shotwell/src/main.vala"
@@ -2468,11 +2468,11 @@ void _vala_main (gchar** args, int args_length1) {
 #line 338 "/home/jens/Source/shotwell/src/main.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 2463 "main.c"
-			goto __catch209_g_error;
+			goto __catch222_g_error;
 		}
 	}
-	goto __finally209;
-	__catch209_g_error:
+	goto __finally222;
+	__catch222_g_error:
 	{
 		GError* e = NULL;
 		GError* _tmp15_ = NULL;
@@ -2500,7 +2500,7 @@ void _vala_main (gchar** args, int args_length1) {
 #line 341 "/home/jens/Source/shotwell/src/main.vala"
 		_g_free0 (_tmp18_);
 #line 342 "/home/jens/Source/shotwell/src/main.vala"
-		_tmp19_ = _ ("Run '%s --help' to see a full list of available command line options.\n");
+		_tmp19_ = _ ("Run “%s --help” to see a full list of available command line options.\n");
 #line 342 "/home/jens/Source/shotwell/src/main.vala"
 		_tmp20_ = args;
 #line 342 "/home/jens/Source/shotwell/src/main.vala"
@@ -2517,7 +2517,7 @@ void _vala_main (gchar** args, int args_length1) {
 		return;
 #line 2511 "main.c"
 	}
-	__finally209:
+	__finally222:
 #line 337 "/home/jens/Source/shotwell/src/main.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 337 "/home/jens/Source/shotwell/src/main.vala"
@@ -2926,7 +2926,7 @@ void _vala_main (gchar** args, int args_length1) {
 #line 442 "/home/jens/Source/shotwell/src/main.vala"
 				_g_object_unref0 (src);
 #line 2921 "main.c"
-				goto __catch210_g_error;
+				goto __catch223_g_error;
 			}
 #line 439 "/home/jens/Source/shotwell/src/main.vala"
 			_g_object_unref0 (dest);
@@ -2934,8 +2934,8 @@ void _vala_main (gchar** args, int args_length1) {
 			_g_object_unref0 (src);
 #line 2928 "main.c"
 		}
-		goto __finally210;
-		__catch210_g_error:
+		goto __finally223;
+		__catch223_g_error:
 		{
 			GError* _error_ = NULL;
 			GError* _tmp85_ = NULL;
@@ -2954,7 +2954,7 @@ void _vala_main (gchar** args, int args_length1) {
 			_g_error_free0 (_error_);
 #line 2948 "main.c"
 		}
-		__finally210:
+		__finally223:
 #line 439 "/home/jens/Source/shotwell/src/main.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 439 "/home/jens/Source/shotwell/src/main.vala"
diff --git a/src/main.vala b/src/main.vala
index bbd3317..6941734 100644
--- a/src/main.vala
+++ b/src/main.vala
@@ -40,7 +40,7 @@ void library_exec(string[] mounts) {
     }
     
     // validate the databases prior to using them
-    message("Verifying database ...");
+    message("Verifying database…");
     string errormsg = null;
     string app_version;
     int schema_version;
@@ -51,24 +51,24 @@ void library_exec(string[] mounts) {
         break;
         
         case Db.VerifyResult.FUTURE_VERSION:
-            errormsg = _("Your photo library is not compatible with this version of Shotwell.  It appears it was created by Shotwell %s (schema %d).  This version is %s (schema %d).  Please use the latest version of Shotwell.").printf(
+            errormsg = _("Your photo library is not compatible with this version of Shotwell. It appears it was created by Shotwell %s (schema %d). This version is %s (schema %d). Please use the latest version of Shotwell.").printf(
                 app_version, schema_version, Resources.APP_VERSION, DatabaseTable.SCHEMA_VERSION);
         break;
         
         case Db.VerifyResult.UPGRADE_ERROR:
-            errormsg = _("Shotwell was unable to upgrade your photo library from version %s (schema %d) to %s (schema %d).  For more information please check the Shotwell Wiki at %s").printf(
+            errormsg = _("Shotwell was unable to upgrade your photo library from version %s (schema %d) to %s (schema %d). For more information please check the Shotwell Wiki at %s").printf(
                 app_version, schema_version, Resources.APP_VERSION, DatabaseTable.SCHEMA_VERSION,
                 Resources.HOME_URL);
         break;
         
         case Db.VerifyResult.NO_UPGRADE_AVAILABLE:
-            errormsg = _("Your photo library is not compatible with this version of Shotwell.  It appears it was created by Shotwell %s (schema %d).  This version is %s (schema %d).  Please clear your library by deleting %s and re-import your photos.").printf(
+            errormsg = _("Your photo library is not compatible with this version of Shotwell. It appears it was created by Shotwell %s (schema %d). This version is %s (schema %d). Please clear your library by deleting %s and re-import your photos.").printf(
                 app_version, schema_version, Resources.APP_VERSION, DatabaseTable.SCHEMA_VERSION,
                 AppDirs.get_data_dir().get_path());
         break;
         
         default:
-            errormsg = _("Unknown error attempting to verify Shotwell's database: %s").printf(
+            errormsg = _("Unknown error attempting to verify Shotwell’s database: %s").printf(
                 result.to_string());
         break;
     }
@@ -291,7 +291,7 @@ public OptionEntry[] get_options() {
         return entries;
     
     OptionEntry datadir = { "datadir", 'd', 0, OptionArg.FILENAME, &data_dir,
-        _("Path to Shotwell's private data"), _("DIRECTORY") };
+        _("Path to Shotwell’s private data"), _("DIRECTORY") };
     entries += datadir;
     
     OptionEntry no_monitoring = { "no-runtime-monitoring", 0, 0, OptionArg.NONE, &no_runtime_monitoring,
@@ -299,11 +299,11 @@ public OptionEntry[] get_options() {
     entries += no_monitoring;
     
     OptionEntry no_startup = { "no-startup-progress", 0, 0, OptionArg.NONE, &no_startup_progress,
-        _("Don't display startup progress meter"), null };
+        _("Don’t display startup progress meter"), null };
     entries += no_startup;
     
     OptionEntry version = { "version", 'V', 0, OptionArg.NONE, &show_version, 
-        _("Show the application's version"), null };
+        _("Show the application’s version"), null };
     entries += version;
     
     OptionEntry terminator = { null, 0, 0, 0, null, null, null };
@@ -339,7 +339,7 @@ void main(string[] args) {
             Resources.APP_GETTEXT_PACKAGE);
     } catch (Error e) {
         print(e.message + "\n");
-        print(_("Run '%s --help' to see a full list of available command line options.\n"), args[0]);
+        print(_("Run “%s --help” to see a full list of available command line options.\n"), args[0]);
         AppDirs.terminate();
         return;
     }
diff --git a/src/photos/GRaw.c b/src/photos/GRaw.c
index 1ee0beb..7aae9d7 100644
--- a/src/photos/GRaw.c
+++ b/src/photos/GRaw.c
@@ -510,7 +510,7 @@ GRawProcessedImage* graw_processed_image_construct_from_thumb (GType object_type
 #line 129 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			_g_bytes_unref0 (bytes);
 #line 513 "GRaw.c"
-			goto __catch26_g_error;
+			goto __catch27_g_error;
 		}
 #line 129 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		_tmp13_ = _tmp7_;
@@ -526,8 +526,8 @@ GRawProcessedImage* graw_processed_image_construct_from_thumb (GType object_type
 		_g_bytes_unref0 (bytes);
 #line 528 "GRaw.c"
 	}
-	goto __finally26;
-	__catch26_g_error:
+	goto __finally27;
+	__catch27_g_error:
 	{
 		GError* err = NULL;
 		GError* _tmp14_ = NULL;
@@ -548,9 +548,9 @@ GRawProcessedImage* graw_processed_image_construct_from_thumb (GType object_type
 #line 132 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		_g_error_free0 (err);
 #line 551 "GRaw.c"
-		goto __finally26;
+		goto __finally27;
 	}
-	__finally26:
+	__finally27:
 #line 127 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 127 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
diff --git a/src/photos/GdkSupport.c b/src/photos/GdkSupport.c
index 6c66a3d..08ee515 100644
--- a/src/photos/GdkSupport.c
+++ b/src/photos/GdkSupport.c
@@ -628,11 +628,11 @@ static DetectedPhotoInformation* gdk_sniffer_real_sniff (PhotoFileSniffer* base,
 #line 51 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 631 "GdkSupport.c"
-			goto __catch27_g_error;
+			goto __catch28_g_error;
 		}
 	}
-	goto __finally27;
-	__catch27_g_error:
+	goto __finally28;
+	__catch28_g_error:
 	{
 		GError* err = NULL;
 		DetectedPhotoInformation* _tmp11_ = NULL;
@@ -650,7 +650,7 @@ static DetectedPhotoInformation* gdk_sniffer_real_sniff (PhotoFileSniffer* base,
 		_g_error_free0 (err);
 #line 652 "GdkSupport.c"
 	}
-	__finally27:
+	__finally28:
 #line 50 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 50 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
@@ -1084,11 +1084,11 @@ static DetectedPhotoInformation* gdk_sniffer_real_sniff (PhotoFileSniffer* base,
 #line 95 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1087 "GdkSupport.c"
-			goto __catch28_g_error;
+			goto __catch29_g_error;
 		}
 	}
-	goto __finally28;
-	__catch28_g_error:
+	goto __finally29;
+	__catch29_g_error:
 	{
 		GError* err = NULL;
 #line 94 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
@@ -1099,7 +1099,7 @@ static DetectedPhotoInformation* gdk_sniffer_real_sniff (PhotoFileSniffer* base,
 		_g_error_free0 (err);
 #line 1101 "GdkSupport.c"
 	}
-	__finally28:
+	__finally29:
 #line 94 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 94 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
diff --git a/src/photos/PhotoMetadata.c b/src/photos/PhotoMetadata.c
index e2a44b3..f546f8f 100644
--- a/src/photos/PhotoMetadata.c
+++ b/src/photos/PhotoMetadata.c
@@ -27,11 +27,11 @@
 #include <glib-object.h>
 #include <stdlib.h>
 #include <string.h>
+#include <gee.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include <gio/gio.h>
 #include <gexiv2/gexiv2.h>
 #include <libexif/exif-data.h>
-#include <gee.h>
 #include <libexif/exif-mem.h>
 #include <float.h>
 #include <math.h>
@@ -40,6 +40,45 @@
 
 #define TYPE_METADATA_DOMAIN (metadata_domain_get_type ())
 
+#define TYPE_KEYWORD_TRANSFORMER (keyword_transformer_get_type ())
+#define KEYWORD_TRANSFORMER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_KEYWORD_TRANSFORMER, KeywordTransformer))
+#define KEYWORD_TRANSFORMER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_KEYWORD_TRANSFORMER, KeywordTransformerClass))
+#define IS_KEYWORD_TRANSFORMER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_KEYWORD_TRANSFORMER))
+#define IS_KEYWORD_TRANSFORMER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_KEYWORD_TRANSFORMER))
+#define KEYWORD_TRANSFORMER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_KEYWORD_TRANSFORMER, KeywordTransformerClass))
+
+typedef struct _KeywordTransformer KeywordTransformer;
+typedef struct _KeywordTransformerClass KeywordTransformerClass;
+typedef struct _KeywordTransformerPrivate KeywordTransformerPrivate;
+typedef struct _ParamSpecKeywordTransformer ParamSpecKeywordTransformer;
+
+#define TYPE_NULL_KEYWORD_TRANSFORMER (null_keyword_transformer_get_type ())
+#define NULL_KEYWORD_TRANSFORMER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_NULL_KEYWORD_TRANSFORMER, NullKeywordTransformer))
+#define NULL_KEYWORD_TRANSFORMER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_NULL_KEYWORD_TRANSFORMER, NullKeywordTransformerClass))
+#define IS_NULL_KEYWORD_TRANSFORMER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_NULL_KEYWORD_TRANSFORMER))
+#define IS_NULL_KEYWORD_TRANSFORMER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_NULL_KEYWORD_TRANSFORMER))
+#define NULL_KEYWORD_TRANSFORMER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_NULL_KEYWORD_TRANSFORMER, NullKeywordTransformerClass))
+
+typedef struct _NullKeywordTransformer NullKeywordTransformer;
+typedef struct _NullKeywordTransformerClass NullKeywordTransformerClass;
+typedef struct _NullKeywordTransformerPrivate NullKeywordTransformerPrivate;
+#define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
+
+#define TYPE_ACD_SEE_KEYWORD_TRANSFORMER (acd_see_keyword_transformer_get_type ())
+#define ACD_SEE_KEYWORD_TRANSFORMER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_ACD_SEE_KEYWORD_TRANSFORMER, ACDSeeKeywordTransformer))
+#define ACD_SEE_KEYWORD_TRANSFORMER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_ACD_SEE_KEYWORD_TRANSFORMER, ACDSeeKeywordTransformerClass))
+#define IS_ACD_SEE_KEYWORD_TRANSFORMER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_ACD_SEE_KEYWORD_TRANSFORMER))
+#define IS_ACD_SEE_KEYWORD_TRANSFORMER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_ACD_SEE_KEYWORD_TRANSFORMER))
+#define ACD_SEE_KEYWORD_TRANSFORMER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_ACD_SEE_KEYWORD_TRANSFORMER, ACDSeeKeywordTransformerClass))
+
+typedef struct _ACDSeeKeywordTransformer ACDSeeKeywordTransformer;
+typedef struct _ACDSeeKeywordTransformerClass ACDSeeKeywordTransformerClass;
+typedef struct _ACDSeeKeywordTransformerPrivate ACDSeeKeywordTransformerPrivate;
+#define _g_error_free0(var) ((var == NULL) ? NULL : (var = (g_error_free (var), NULL)))
+#define _g_markup_parse_context_unref0(var) ((var == NULL) ? NULL : (var = (g_markup_parse_context_unref (var), NULL)))
+#define _g_free0(var) (var = (g_free (var), NULL))
+#define _g_string_free0(var) ((var == NULL) ? NULL : (var = (g_string_free (var, TRUE), NULL)))
+
 #define TYPE_HIERARCHICAL_KEYWORD_FIELD (hierarchical_keyword_field_get_type ())
 #define HIERARCHICAL_KEYWORD_FIELD(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_HIERARCHICAL_KEYWORD_FIELD, HierarchicalKeywordField))
 #define HIERARCHICAL_KEYWORD_FIELD_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_HIERARCHICAL_KEYWORD_FIELD, HierarchicalKeywordFieldClass))
@@ -50,7 +89,7 @@
 typedef struct _HierarchicalKeywordField HierarchicalKeywordField;
 typedef struct _HierarchicalKeywordFieldClass HierarchicalKeywordFieldClass;
 typedef struct _HierarchicalKeywordFieldPrivate HierarchicalKeywordFieldPrivate;
-#define _g_free0(var) (var = (g_free (var), NULL))
+#define _keyword_transformer_unref0(var) ((var == NULL) ? NULL : (var = (keyword_transformer_unref (var), NULL)))
 typedef struct _ParamSpecHierarchicalKeywordField ParamSpecHierarchicalKeywordField;
 
 #define TYPE_PHOTO_PREVIEW (photo_preview_get_type ())
@@ -66,8 +105,6 @@ typedef struct _PhotoPreviewPrivate PhotoPreviewPrivate;
 
 #define TYPE_DIMENSIONS (dimensions_get_type ())
 typedef struct _Dimensions Dimensions;
-#define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
-#define _g_error_free0(var) ((var == NULL) ? NULL : (var = (g_error_free (var), NULL)))
 typedef struct _ParamSpecPhotoPreview ParamSpecPhotoPreview;
 
 #define TYPE_MEDIA_METADATA (media_metadata_get_type ())
@@ -157,6 +194,48 @@ typedef enum  {
 	METADATA_DOMAIN_IPTC
 } MetadataDomain;
 
+struct _KeywordTransformer {
+	GTypeInstance parent_instance;
+	volatile int ref_count;
+	KeywordTransformerPrivate * priv;
+};
+
+struct _KeywordTransformerClass {
+	GTypeClass parent_class;
+	void (*finalize) (KeywordTransformer *self);
+	GeeList* (*transform) (KeywordTransformer* self, const gchar* input, GError** error);
+};
+
+struct _ParamSpecKeywordTransformer {
+	GParamSpec parent_instance;
+};
+
+struct _NullKeywordTransformer {
+	KeywordTransformer parent_instance;
+	NullKeywordTransformerPrivate * priv;
+};
+
+struct _NullKeywordTransformerClass {
+	KeywordTransformerClass parent_class;
+};
+
+struct _ACDSeeKeywordTransformer {
+	KeywordTransformer parent_instance;
+	ACDSeeKeywordTransformerPrivate * priv;
+};
+
+struct _ACDSeeKeywordTransformerClass {
+	KeywordTransformerClass parent_class;
+};
+
+struct _ACDSeeKeywordTransformerPrivate {
+	GMarkupParser parser;
+	GError* error;
+	GeeArrayQueue* stack;
+	GeeArrayList* result;
+	gboolean assigned;
+};
+
 struct _HierarchicalKeywordField {
 	GTypeInstance parent_instance;
 	volatile int ref_count;
@@ -165,6 +244,7 @@ struct _HierarchicalKeywordField {
 	gchar* path_separator;
 	gboolean wants_leading_separator;
 	gboolean is_writeable;
+	KeywordTransformer* transformer;
 };
 
 struct _HierarchicalKeywordFieldClass {
@@ -328,6 +408,9 @@ struct _PhotoMetadataInternalPhotoPreviewClass {
 };
 
 
+static gpointer keyword_transformer_parent_class = NULL;
+static gpointer null_keyword_transformer_parent_class = NULL;
+static gpointer acd_see_keyword_transformer_parent_class = NULL;
 static gpointer hierarchical_keyword_field_parent_class = NULL;
 static gpointer photo_preview_parent_class = NULL;
 static gpointer photo_metadata_parent_class = NULL;
@@ -360,6 +443,11 @@ static gint photo_metadata_STANDARD_TITLE_TAGS_length1;
 static gchar** photo_metadata_STANDARD_TITLE_TAGS = NULL;
 static gint photo_metadata_STANDARD_TITLE_TAGS_length1 = 0;
 static gint _photo_metadata_STANDARD_TITLE_TAGS_size_ = 0;
+static gchar** photo_metadata_COMMENT_TAGS;
+static gint photo_metadata_COMMENT_TAGS_length1;
+static gchar** photo_metadata_COMMENT_TAGS = NULL;
+static gint photo_metadata_COMMENT_TAGS_length1 = 0;
+static gint _photo_metadata_COMMENT_TAGS_size_ = 0;
 static gchar** photo_metadata_KEYWORD_TAGS;
 static gint photo_metadata_KEYWORD_TAGS_length1;
 static gchar** photo_metadata_KEYWORD_TAGS = NULL;
@@ -383,6 +471,44 @@ static gint _photo_metadata_RATING_TAGS_size_ = 0;
 static gpointer photo_metadata_internal_photo_preview_parent_class = NULL;
 
 GType metadata_domain_get_type (void) G_GNUC_CONST;
+gpointer keyword_transformer_ref (gpointer instance);
+void keyword_transformer_unref (gpointer instance);
+GParamSpec* param_spec_keyword_transformer (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
+void value_set_keyword_transformer (GValue* value, gpointer v_object);
+void value_take_keyword_transformer (GValue* value, gpointer v_object);
+gpointer value_get_keyword_transformer (const GValue* value);
+GType keyword_transformer_get_type (void) G_GNUC_CONST;
+enum  {
+	KEYWORD_TRANSFORMER_DUMMY_PROPERTY
+};
+GeeList* keyword_transformer_transform (KeywordTransformer* self, const gchar* input, GError** error);
+static GeeList* keyword_transformer_real_transform (KeywordTransformer* self, const gchar* input, GError** error);
+KeywordTransformer* keyword_transformer_construct (GType object_type);
+static void keyword_transformer_finalize (KeywordTransformer* obj);
+GType null_keyword_transformer_get_type (void) G_GNUC_CONST;
+enum  {
+	NULL_KEYWORD_TRANSFORMER_DUMMY_PROPERTY
+};
+static GeeList* null_keyword_transformer_real_transform (KeywordTransformer* base, const gchar* input, GError** error);
+NullKeywordTransformer* null_keyword_transformer_new (void);
+NullKeywordTransformer* null_keyword_transformer_construct (GType object_type);
+GType acd_see_keyword_transformer_get_type (void) G_GNUC_CONST;
+#define ACD_SEE_KEYWORD_TRANSFORMER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_ACD_SEE_KEYWORD_TRANSFORMER, ACDSeeKeywordTransformerPrivate))
+enum  {
+	ACD_SEE_KEYWORD_TRANSFORMER_DUMMY_PROPERTY
+};
+ACDSeeKeywordTransformer* acd_see_keyword_transformer_new (void);
+ACDSeeKeywordTransformer* acd_see_keyword_transformer_construct (GType object_type);
+static void acd_see_keyword_transformer_on_start (ACDSeeKeywordTransformer* self, GMarkupParseContext* ctx, const gchar* name, gchar** attribute_names, gchar** attribute_values, GError** error);
+static void _acd_see_keyword_transformer_on_start_gmarkup_parser_start_element_func (GMarkupParseContext* context, const gchar* element_name, gchar** attribute_names, gchar** attribute_values, gpointer self, GError** error);
+static void acd_see_keyword_transformer_on_end (ACDSeeKeywordTransformer* self, GMarkupParseContext* ctx, const gchar* name, GError** error);
+static void _acd_see_keyword_transformer_on_end_gmarkup_parser_end_element_func (GMarkupParseContext* context, const gchar* element_name, gpointer self, GError** error);
+static void acd_see_keyword_transformer_on_text (ACDSeeKeywordTransformer* self, GMarkupParseContext* ctx, const gchar* text, GError** error);
+static void _acd_see_keyword_transformer_on_text_gmarkup_parser_text_func (GMarkupParseContext* context, const gchar* text, gsize text_len, gpointer self, GError** error);
+static void acd_see_keyword_transformer_on_error (ACDSeeKeywordTransformer* self, GMarkupParseContext* ctx, GError* _error_);
+static void _acd_see_keyword_transformer_on_error_gmarkup_parser_error_func (GMarkupParseContext* context, GError* _error_, gpointer self);
+static GeeList* acd_see_keyword_transformer_real_transform (KeywordTransformer* base, const gchar* input, GError** error);
+static void acd_see_keyword_transformer_finalize (KeywordTransformer* obj);
 gpointer hierarchical_keyword_field_ref (gpointer instance);
 void hierarchical_keyword_field_unref (gpointer instance);
 GParamSpec* param_spec_hierarchical_keyword_field (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
@@ -393,8 +519,8 @@ GType hierarchical_keyword_field_get_type (void) G_GNUC_CONST;
 enum  {
 	HIERARCHICAL_KEYWORD_FIELD_DUMMY_PROPERTY
 };
-HierarchicalKeywordField* hierarchical_keyword_field_new (const gchar* field_name, const gchar* path_separator, gboolean wants_leading_separator, gboolean is_writeable);
-HierarchicalKeywordField* hierarchical_keyword_field_construct (GType object_type, const gchar* field_name, const gchar* path_separator, gboolean wants_leading_separator, gboolean is_writeable);
+HierarchicalKeywordField* hierarchical_keyword_field_new (const gchar* field_name, const gchar* path_separator, gboolean wants_leading_separator, gboolean is_writeable, KeywordTransformer* transformer);
+HierarchicalKeywordField* hierarchical_keyword_field_construct (GType object_type, const gchar* field_name, const gchar* path_separator, gboolean wants_leading_separator, gboolean is_writeable, KeywordTransformer* transformer);
 static void hierarchical_keyword_field_finalize (HierarchicalKeywordField* obj);
 gpointer photo_preview_ref (gpointer instance);
 void photo_preview_unref (gpointer instance);
@@ -554,7 +680,7 @@ static gchar* photo_metadata_real_get_title (MediaMetadata* base);
 gboolean is_string_empty (const gchar* s);
 void photo_metadata_set_title (PhotoMetadata* self, const gchar* title, PhotoMetadataSetOption option);
 static gchar* photo_metadata_real_get_comment (MediaMetadata* base);
-void photo_metadata_set_comment (PhotoMetadata* self, const gchar* comment);
+void photo_metadata_set_comment (PhotoMetadata* self, const gchar* comment, PhotoMetadataSetOption option);
 GeeSet* photo_metadata_get_keywords (PhotoMetadata* self, GCompareDataFunc compare_func, void* compare_func_target, GDestroyNotify compare_func_target_destroy_notify);
 gchar* hierarchical_tag_utilities_make_flat_tag_safe (const gchar* in_tag);
 gpointer hierarchical_tag_index_ref (gpointer instance);
@@ -630,7 +756,787 @@ GType metadata_domain_get_type (void) {
 }
 
 
-HierarchicalKeywordField* hierarchical_keyword_field_construct (GType object_type, const gchar* field_name, const gchar* path_separator, gboolean wants_leading_separator, gboolean is_writeable) {
+static GeeList* keyword_transformer_real_transform (KeywordTransformer* self, const gchar* input, GError** error) {
+#line 32 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	g_critical ("Type `%s' does not implement abstract method `keyword_transformer_transform'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
+#line 32 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	return NULL;
+#line 765 "PhotoMetadata.c"
+}
+
+
+GeeList* keyword_transformer_transform (KeywordTransformer* self, const gchar* input, GError** error) {
+#line 32 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	g_return_val_if_fail (IS_KEYWORD_TRANSFORMER (self), NULL);
+#line 32 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	return KEYWORD_TRANSFORMER_GET_CLASS (self)->transform (self, input, error);
+#line 774 "PhotoMetadata.c"
+}
+
+
+KeywordTransformer* keyword_transformer_construct (GType object_type) {
+	KeywordTransformer* self = NULL;
+#line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	self = (KeywordTransformer*) g_type_create_instance (object_type);
+#line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	return self;
+#line 784 "PhotoMetadata.c"
+}
+
+
+static void value_keyword_transformer_init (GValue* value) {
+#line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	value->data[0].v_pointer = NULL;
+#line 791 "PhotoMetadata.c"
+}
+
+
+static void value_keyword_transformer_free_value (GValue* value) {
+#line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	if (value->data[0].v_pointer) {
+#line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+		keyword_transformer_unref (value->data[0].v_pointer);
+#line 800 "PhotoMetadata.c"
+	}
+}
+
+
+static void value_keyword_transformer_copy_value (const GValue* src_value, GValue* dest_value) {
+#line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	if (src_value->data[0].v_pointer) {
+#line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+		dest_value->data[0].v_pointer = keyword_transformer_ref (src_value->data[0].v_pointer);
+#line 810 "PhotoMetadata.c"
+	} else {
+#line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+		dest_value->data[0].v_pointer = NULL;
+#line 814 "PhotoMetadata.c"
+	}
+}
+
+
+static gpointer value_keyword_transformer_peek_pointer (const GValue* value) {
+#line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	return value->data[0].v_pointer;
+#line 822 "PhotoMetadata.c"
+}
+
+
+static gchar* value_keyword_transformer_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+#line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	if (collect_values[0].v_pointer) {
+#line 829 "PhotoMetadata.c"
+		KeywordTransformer* object;
+		object = collect_values[0].v_pointer;
+#line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+		if (object->parent_instance.g_class == NULL) {
+#line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
+#line 836 "PhotoMetadata.c"
+		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
+#line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.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 840 "PhotoMetadata.c"
+		}
+#line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+		value->data[0].v_pointer = keyword_transformer_ref (object);
+#line 844 "PhotoMetadata.c"
+	} else {
+#line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+		value->data[0].v_pointer = NULL;
+#line 848 "PhotoMetadata.c"
+	}
+#line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	return NULL;
+#line 852 "PhotoMetadata.c"
+}
+
+
+static gchar* value_keyword_transformer_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+	KeywordTransformer** object_p;
+	object_p = collect_values[0].v_pointer;
+#line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	if (!object_p) {
+#line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
+#line 863 "PhotoMetadata.c"
+	}
+#line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	if (!value->data[0].v_pointer) {
+#line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+		*object_p = NULL;
+#line 869 "PhotoMetadata.c"
+	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
+#line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+		*object_p = value->data[0].v_pointer;
+#line 873 "PhotoMetadata.c"
+	} else {
+#line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+		*object_p = keyword_transformer_ref (value->data[0].v_pointer);
+#line 877 "PhotoMetadata.c"
+	}
+#line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	return NULL;
+#line 881 "PhotoMetadata.c"
+}
+
+
+GParamSpec* param_spec_keyword_transformer (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
+	ParamSpecKeywordTransformer* spec;
+#line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	g_return_val_if_fail (g_type_is_a (object_type, TYPE_KEYWORD_TRANSFORMER), NULL);
+#line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
+#line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	G_PARAM_SPEC (spec)->value_type = object_type;
+#line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	return G_PARAM_SPEC (spec);
+#line 895 "PhotoMetadata.c"
+}
+
+
+gpointer value_get_keyword_transformer (const GValue* value) {
+#line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_KEYWORD_TRANSFORMER), NULL);
+#line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	return value->data[0].v_pointer;
+#line 904 "PhotoMetadata.c"
+}
+
+
+void value_set_keyword_transformer (GValue* value, gpointer v_object) {
+	KeywordTransformer* old;
+#line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_KEYWORD_TRANSFORMER));
+#line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	old = value->data[0].v_pointer;
+#line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	if (v_object) {
+#line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_KEYWORD_TRANSFORMER));
+#line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
+#line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+		value->data[0].v_pointer = v_object;
+#line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+		keyword_transformer_ref (value->data[0].v_pointer);
+#line 924 "PhotoMetadata.c"
+	} else {
+#line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+		value->data[0].v_pointer = NULL;
+#line 928 "PhotoMetadata.c"
+	}
+#line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	if (old) {
+#line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+		keyword_transformer_unref (old);
+#line 934 "PhotoMetadata.c"
+	}
+}
+
+
+void value_take_keyword_transformer (GValue* value, gpointer v_object) {
+	KeywordTransformer* old;
+#line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_KEYWORD_TRANSFORMER));
+#line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	old = value->data[0].v_pointer;
+#line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	if (v_object) {
+#line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_KEYWORD_TRANSFORMER));
+#line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
+#line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+		value->data[0].v_pointer = v_object;
+#line 953 "PhotoMetadata.c"
+	} else {
+#line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+		value->data[0].v_pointer = NULL;
+#line 957 "PhotoMetadata.c"
+	}
+#line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	if (old) {
+#line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+		keyword_transformer_unref (old);
+#line 963 "PhotoMetadata.c"
+	}
+}
+
+
+static void keyword_transformer_class_init (KeywordTransformerClass * klass) {
+#line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	keyword_transformer_parent_class = g_type_class_peek_parent (klass);
+#line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	((KeywordTransformerClass *) klass)->finalize = keyword_transformer_finalize;
+#line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	((KeywordTransformerClass *) klass)->transform = keyword_transformer_real_transform;
+#line 975 "PhotoMetadata.c"
+}
+
+
+static void keyword_transformer_instance_init (KeywordTransformer * self) {
+#line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	self->ref_count = 1;
+#line 982 "PhotoMetadata.c"
+}
+
+
+static void keyword_transformer_finalize (KeywordTransformer* obj) {
+	KeywordTransformer * self;
+#line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_KEYWORD_TRANSFORMER, KeywordTransformer);
+#line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	g_signal_handlers_destroy (self);
+#line 992 "PhotoMetadata.c"
+}
+
+
+GType keyword_transformer_get_type (void) {
+	static volatile gsize keyword_transformer_type_id__volatile = 0;
+	if (g_once_init_enter (&keyword_transformer_type_id__volatile)) {
+		static const GTypeValueTable g_define_type_value_table = { value_keyword_transformer_init, value_keyword_transformer_free_value, value_keyword_transformer_copy_value, value_keyword_transformer_peek_pointer, "p", value_keyword_transformer_collect_value, "p", value_keyword_transformer_lcopy_value };
+		static const GTypeInfo g_define_type_info = { sizeof (KeywordTransformerClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) keyword_transformer_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (KeywordTransformer), 0, (GInstanceInitFunc) keyword_transformer_instance_init, &g_define_type_value_table };
+		static const GTypeFundamentalInfo g_define_type_fundamental_info = { (G_TYPE_FLAG_CLASSED | G_TYPE_FLAG_INSTANTIATABLE | G_TYPE_FLAG_DERIVABLE | G_TYPE_FLAG_DEEP_DERIVABLE) };
+		GType keyword_transformer_type_id;
+		keyword_transformer_type_id = g_type_register_fundamental (g_type_fundamental_next (), "KeywordTransformer", &g_define_type_info, &g_define_type_fundamental_info, G_TYPE_FLAG_ABSTRACT);
+		g_once_init_leave (&keyword_transformer_type_id__volatile, keyword_transformer_type_id);
+	}
+	return keyword_transformer_type_id__volatile;
+}
+
+
+gpointer keyword_transformer_ref (gpointer instance) {
+	KeywordTransformer* self;
+	self = instance;
+#line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	g_atomic_int_inc (&self->ref_count);
+#line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	return instance;
+#line 1017 "PhotoMetadata.c"
+}
+
+
+void keyword_transformer_unref (gpointer instance) {
+	KeywordTransformer* self;
+	self = instance;
+#line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	if (g_atomic_int_dec_and_test (&self->ref_count)) {
+#line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+		KEYWORD_TRANSFORMER_GET_CLASS (self)->finalize (self);
+#line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+		g_type_free_instance ((GTypeInstance *) self);
+#line 1030 "PhotoMetadata.c"
+	}
+}
+
+
+static GeeList* null_keyword_transformer_real_transform (KeywordTransformer* base, const gchar* input, GError** error) {
+	NullKeywordTransformer * self;
+	GeeList* result = NULL;
+	GeeArrayList* _result_ = NULL;
+	GeeArrayList* _tmp0_ = NULL;
+	const gchar* _tmp1_ = NULL;
+#line 36 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_NULL_KEYWORD_TRANSFORMER, NullKeywordTransformer);
+#line 36 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	g_return_val_if_fail (input != NULL, NULL);
+#line 37 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	_tmp0_ = gee_array_list_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, NULL, NULL, NULL);
+#line 37 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	_result_ = _tmp0_;
+#line 38 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	_tmp1_ = input;
+#line 38 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_result_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp1_);
+#line 40 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	result = G_TYPE_CHECK_INSTANCE_CAST (_result_, GEE_TYPE_LIST, GeeList);
+#line 40 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	return result;
+#line 1057 "PhotoMetadata.c"
+}
+
+
+NullKeywordTransformer* null_keyword_transformer_construct (GType object_type) {
+	NullKeywordTransformer* self = NULL;
+#line 35 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	self = (NullKeywordTransformer*) keyword_transformer_construct (object_type);
+#line 35 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	return self;
+#line 1067 "PhotoMetadata.c"
+}
+
+
+NullKeywordTransformer* null_keyword_transformer_new (void) {
+#line 35 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	return null_keyword_transformer_construct (TYPE_NULL_KEYWORD_TRANSFORMER);
+#line 1074 "PhotoMetadata.c"
+}
+
+
+static void null_keyword_transformer_class_init (NullKeywordTransformerClass * klass) {
+#line 35 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	null_keyword_transformer_parent_class = g_type_class_peek_parent (klass);
+#line 35 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	((KeywordTransformerClass *) klass)->transform = null_keyword_transformer_real_transform;
+#line 1083 "PhotoMetadata.c"
+}
+
+
+static void null_keyword_transformer_instance_init (NullKeywordTransformer * self) {
+}
+
+
+GType null_keyword_transformer_get_type (void) {
+	static volatile gsize null_keyword_transformer_type_id__volatile = 0;
+	if (g_once_init_enter (&null_keyword_transformer_type_id__volatile)) {
+		static const GTypeInfo g_define_type_info = { sizeof (NullKeywordTransformerClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) null_keyword_transformer_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (NullKeywordTransformer), 0, (GInstanceInitFunc) null_keyword_transformer_instance_init, NULL };
+		GType null_keyword_transformer_type_id;
+		null_keyword_transformer_type_id = g_type_register_static (TYPE_KEYWORD_TRANSFORMER, "NullKeywordTransformer", &g_define_type_info, 0);
+		g_once_init_leave (&null_keyword_transformer_type_id__volatile, null_keyword_transformer_type_id);
+	}
+	return null_keyword_transformer_type_id__volatile;
+}
+
+
+static void _acd_see_keyword_transformer_on_start_gmarkup_parser_start_element_func (GMarkupParseContext* context, const gchar* element_name, gchar** attribute_names, gchar** attribute_values, gpointer self, GError** error) {
+#line 64 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	acd_see_keyword_transformer_on_start ((ACDSeeKeywordTransformer*) self, context, element_name, attribute_names, attribute_values, error);
+#line 1106 "PhotoMetadata.c"
+}
+
+
+static void _acd_see_keyword_transformer_on_end_gmarkup_parser_end_element_func (GMarkupParseContext* context, const gchar* element_name, gpointer self, GError** error) {
+#line 65 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	acd_see_keyword_transformer_on_end ((ACDSeeKeywordTransformer*) self, context, element_name, error);
+#line 1113 "PhotoMetadata.c"
+}
+
+
+static void _acd_see_keyword_transformer_on_text_gmarkup_parser_text_func (GMarkupParseContext* context, const gchar* text, gsize text_len, gpointer self, GError** error) {
+#line 66 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	acd_see_keyword_transformer_on_text ((ACDSeeKeywordTransformer*) self, context, text, error);
+#line 1120 "PhotoMetadata.c"
+}
+
+
+static void _acd_see_keyword_transformer_on_error_gmarkup_parser_error_func (GMarkupParseContext* context, GError* _error_, gpointer self) {
+#line 67 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	acd_see_keyword_transformer_on_error ((ACDSeeKeywordTransformer*) self, context, _error_);
+#line 1127 "PhotoMetadata.c"
+}
+
+
+ACDSeeKeywordTransformer* acd_see_keyword_transformer_construct (GType object_type) {
+	ACDSeeKeywordTransformer* self = NULL;
+	GeeArrayList* _tmp0_ = NULL;
+	GeeArrayQueue* _tmp1_ = NULL;
+#line 62 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	self = (ACDSeeKeywordTransformer*) keyword_transformer_construct (object_type);
+#line 63 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	memset (&self->priv->parser, 0, sizeof (GMarkupParser));
+#line 64 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	self->priv->parser.start_element = _acd_see_keyword_transformer_on_start_gmarkup_parser_start_element_func;
+#line 65 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	self->priv->parser.end_element = _acd_see_keyword_transformer_on_end_gmarkup_parser_end_element_func;
+#line 66 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	self->priv->parser.text = _acd_see_keyword_transformer_on_text_gmarkup_parser_text_func;
+#line 67 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	self->priv->parser.error = _acd_see_keyword_transformer_on_error_gmarkup_parser_error_func;
+#line 68 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	_tmp0_ = gee_array_list_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, NULL, NULL, NULL);
+#line 68 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	_g_object_unref0 (self->priv->result);
+#line 68 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	self->priv->result = _tmp0_;
+#line 69 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	_tmp1_ = gee_array_queue_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, NULL, NULL, NULL);
+#line 69 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	_g_object_unref0 (self->priv->stack);
+#line 69 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	self->priv->stack = _tmp1_;
+#line 62 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	return self;
+#line 1161 "PhotoMetadata.c"
+}
+
+
+ACDSeeKeywordTransformer* acd_see_keyword_transformer_new (void) {
+#line 62 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	return acd_see_keyword_transformer_construct (TYPE_ACD_SEE_KEYWORD_TRANSFORMER);
+#line 1168 "PhotoMetadata.c"
+}
+
+
+static gpointer _g_object_ref0 (gpointer self) {
+#line 77 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	return self ? g_object_ref (self) : NULL;
+#line 1175 "PhotoMetadata.c"
+}
+
+
+static GeeList* acd_see_keyword_transformer_real_transform (KeywordTransformer* base, const gchar* input, GError** error) {
+	ACDSeeKeywordTransformer * self;
+	GeeList* result = NULL;
+	GMarkupParseContext* ctx = NULL;
+	GMarkupParser _tmp0_ = {0};
+	GMarkupParseContext* _tmp1_ = NULL;
+	const gchar* _tmp2_ = NULL;
+	const gchar* _tmp3_ = NULL;
+	gint _tmp4_ = 0;
+	gint _tmp5_ = 0;
+	GeeArrayList* _tmp6_ = NULL;
+	GeeList* _tmp7_ = NULL;
+	GError * _inner_error_ = NULL;
+#line 72 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_ACD_SEE_KEYWORD_TRANSFORMER, ACDSeeKeywordTransformer);
+#line 72 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	g_return_val_if_fail (input != NULL, NULL);
+#line 73 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	_tmp0_ = self->priv->parser;
+#line 73 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	_tmp1_ = g_markup_parse_context_new (&_tmp0_, 0, self, NULL);
+#line 73 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	ctx = _tmp1_;
+#line 75 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	_tmp2_ = input;
+#line 75 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	_tmp3_ = input;
+#line 75 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	_tmp4_ = strlen (_tmp3_);
+#line 75 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	_tmp5_ = _tmp4_;
+#line 75 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	g_markup_parse_context_parse (ctx, _tmp2_, (gssize) _tmp5_, &_inner_error_);
+#line 75 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 75 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+		g_propagate_error (error, _inner_error_);
+#line 75 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+		_g_markup_parse_context_unref0 (ctx);
+#line 75 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+		return NULL;
+#line 1220 "PhotoMetadata.c"
+	}
+#line 77 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	_tmp6_ = self->priv->result;
+#line 77 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	_tmp7_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_LIST, GeeList));
+#line 77 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	result = _tmp7_;
+#line 77 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	_g_markup_parse_context_unref0 (ctx);
+#line 77 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	return result;
+#line 1232 "PhotoMetadata.c"
+}
+
+
+static void acd_see_keyword_transformer_on_start (ACDSeeKeywordTransformer* self, GMarkupParseContext* ctx, const gchar* name, gchar** attribute_names, gchar** attribute_values, GError** error) {
+	const gchar* _tmp0_ = NULL;
+	const gchar* _tmp1_ = NULL;
+	const gchar* _tmp2_ = NULL;
+	gchar** _tmp3_ = NULL;
+	gint _tmp3__length1 = 0;
+	gchar** _tmp4_ = NULL;
+	gint _tmp4__length1 = 0;
+	GError * _inner_error_ = NULL;
+#line 80 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	g_return_if_fail (IS_ACD_SEE_KEYWORD_TRANSFORMER (self));
+#line 80 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	g_return_if_fail (ctx != NULL);
+#line 80 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	g_return_if_fail (name != NULL);
+#line 88 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	self->priv->assigned = FALSE;
+#line 89 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	_tmp0_ = name;
+#line 89 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	if (g_strcmp0 (_tmp0_, "Categories") == 0) {
+#line 90 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+		return;
+#line 1259 "PhotoMetadata.c"
+	}
+#line 93 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	_tmp1_ = name;
+#line 93 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	if (g_strcmp0 (_tmp1_, "Category") != 0) {
+#line 94 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+		return;
+#line 1267 "PhotoMetadata.c"
+	}
+#line 97 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	_tmp2_ = name;
+#line 97 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	_tmp3_ = attribute_names;
+#line 97 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	_tmp3__length1 = _vala_array_length (attribute_names);
+#line 97 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	_tmp4_ = attribute_values;
+#line 97 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	_tmp4__length1 = _vala_array_length (attribute_values);
+#line 97 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	g_markup_collect_attributes (_tmp2_, _tmp3_, _tmp4_, &_inner_error_, G_MARKUP_COLLECT_BOOLEAN, "Assigned", &self->priv->assigned, G_MARKUP_COLLECT_INVALID);
+#line 97 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 97 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+		if (_inner_error_->domain == G_MARKUP_ERROR) {
+#line 97 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+			g_propagate_error (error, _inner_error_);
+#line 97 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+			return;
+#line 1289 "PhotoMetadata.c"
+		} else {
+#line 97 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
+#line 97 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+			g_clear_error (&_inner_error_);
+#line 97 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+			return;
+#line 1297 "PhotoMetadata.c"
+		}
+	}
+}
+
+
+static void acd_see_keyword_transformer_on_end (ACDSeeKeywordTransformer* self, GMarkupParseContext* ctx, const gchar* name, GError** error) {
+	const gchar* _tmp0_ = NULL;
+#line 104 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	g_return_if_fail (IS_ACD_SEE_KEYWORD_TRANSFORMER (self));
+#line 104 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	g_return_if_fail (ctx != NULL);
+#line 104 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	g_return_if_fail (name != NULL);
+#line 106 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	_tmp0_ = name;
+#line 106 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	if (g_strcmp0 (_tmp0_, "Category") == 0) {
+#line 1315 "PhotoMetadata.c"
+		GeeArrayQueue* _tmp1_ = NULL;
+		gpointer _tmp2_ = NULL;
+		gchar* _tmp3_ = NULL;
+#line 107 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+		_tmp1_ = self->priv->stack;
+#line 107 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+		_tmp2_ = gee_deque_poll_tail (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_DEQUE, GeeDeque));
+#line 107 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+		_tmp3_ = (gchar*) _tmp2_;
+#line 107 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+		_g_free0 (_tmp3_);
+#line 1327 "PhotoMetadata.c"
+	}
+}
+
+
+static void acd_see_keyword_transformer_on_text (ACDSeeKeywordTransformer* self, GMarkupParseContext* ctx, const gchar* text, GError** error) {
+	const gchar* _tmp0_ = NULL;
+	GeeArrayQueue* _tmp1_ = NULL;
+	const gchar* _tmp2_ = NULL;
+	gboolean _tmp3_ = FALSE;
+#line 111 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	g_return_if_fail (IS_ACD_SEE_KEYWORD_TRANSFORMER (self));
+#line 111 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	g_return_if_fail (ctx != NULL);
+#line 111 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	g_return_if_fail (text != NULL);
+#line 113 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	_tmp0_ = text;
+#line 113 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	if (g_strcmp0 (_tmp0_, "") == 0) {
+#line 114 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+		return;
+#line 1349 "PhotoMetadata.c"
+	}
+#line 117 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	_tmp1_ = self->priv->stack;
+#line 117 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	_tmp2_ = text;
+#line 117 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	gee_deque_offer_tail (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_DEQUE, GeeDeque), _tmp2_);
+#line 118 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	_tmp3_ = self->priv->assigned;
+#line 118 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	if (_tmp3_) {
+#line 1361 "PhotoMetadata.c"
+		GString* builder = NULL;
+		GString* _tmp4_ = NULL;
+		GString* _tmp13_ = NULL;
+		gssize _tmp14_ = 0L;
+		GeeArrayList* _tmp18_ = NULL;
+		GString* _tmp19_ = NULL;
+		const gchar* _tmp20_ = NULL;
+#line 119 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+		_tmp4_ = g_string_new ("");
+#line 119 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+		builder = _tmp4_;
+#line 1373 "PhotoMetadata.c"
+		{
+			GeeIterator* _f_it = NULL;
+			GeeArrayQueue* _tmp5_ = NULL;
+			GeeIterator* _tmp6_ = NULL;
+#line 120 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+			_tmp5_ = self->priv->stack;
+#line 120 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+			_tmp6_ = gee_abstract_collection_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
+#line 120 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+			_f_it = _tmp6_;
+#line 120 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+			while (TRUE) {
+#line 1386 "PhotoMetadata.c"
+				GeeIterator* _tmp7_ = NULL;
+				gboolean _tmp8_ = FALSE;
+				gchar* f = NULL;
+				GeeIterator* _tmp9_ = NULL;
+				gpointer _tmp10_ = NULL;
+				GString* _tmp11_ = NULL;
+				const gchar* _tmp12_ = NULL;
+#line 120 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+				_tmp7_ = _f_it;
+#line 120 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+				_tmp8_ = gee_iterator_next (_tmp7_);
+#line 120 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+				if (!_tmp8_) {
+#line 120 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+					break;
+#line 1402 "PhotoMetadata.c"
+				}
+#line 120 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+				_tmp9_ = _f_it;
+#line 120 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+				_tmp10_ = gee_iterator_get (_tmp9_);
+#line 120 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+				f = (gchar*) _tmp10_;
+#line 121 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+				_tmp11_ = builder;
+#line 121 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+				_tmp12_ = f;
+#line 121 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+				g_string_append_printf (_tmp11_, "%s|", _tmp12_);
+#line 120 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+				_g_free0 (f);
+#line 1418 "PhotoMetadata.c"
+			}
+#line 120 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+			_g_object_unref0 (_f_it);
+#line 1422 "PhotoMetadata.c"
+		}
+#line 123 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+		_tmp13_ = builder;
+#line 123 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+		_tmp14_ = _tmp13_->len;
+#line 123 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+		if (_tmp14_ > ((gssize) 0)) {
+#line 1430 "PhotoMetadata.c"
+			GString* _tmp15_ = NULL;
+			GString* _tmp16_ = NULL;
+			gssize _tmp17_ = 0L;
+#line 124 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+			_tmp15_ = builder;
+#line 124 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+			_tmp16_ = builder;
+#line 124 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+			_tmp17_ = _tmp16_->len;
+#line 124 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+			g_string_truncate (_tmp15_, (gsize) (_tmp17_ - 1));
+#line 1442 "PhotoMetadata.c"
+		}
+#line 126 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+		_tmp18_ = self->priv->result;
+#line 126 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+		_tmp19_ = builder;
+#line 126 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+		_tmp20_ = _tmp19_->str;
+#line 126 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+		gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp20_);
+#line 118 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+		_g_string_free0 (builder);
+#line 1454 "PhotoMetadata.c"
+	}
+}
+
+
+static gpointer _g_error_copy0 (gpointer self) {
+#line 131 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	return self ? g_error_copy (self) : NULL;
+#line 1462 "PhotoMetadata.c"
+}
+
+
+static void acd_see_keyword_transformer_on_error (ACDSeeKeywordTransformer* self, GMarkupParseContext* ctx, GError* _error_) {
+	GError* _tmp0_ = NULL;
+	GError* _tmp1_ = NULL;
+#line 130 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	g_return_if_fail (IS_ACD_SEE_KEYWORD_TRANSFORMER (self));
+#line 130 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	g_return_if_fail (ctx != NULL);
+#line 131 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	_tmp0_ = _error_;
+#line 131 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	_tmp1_ = _g_error_copy0 (_tmp0_);
+#line 131 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	_g_error_free0 (self->priv->error);
+#line 131 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	self->priv->error = _tmp1_;
+#line 1481 "PhotoMetadata.c"
+}
+
+
+static void acd_see_keyword_transformer_class_init (ACDSeeKeywordTransformerClass * klass) {
+#line 55 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	acd_see_keyword_transformer_parent_class = g_type_class_peek_parent (klass);
+#line 55 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	((KeywordTransformerClass *) klass)->finalize = acd_see_keyword_transformer_finalize;
+#line 55 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	g_type_class_add_private (klass, sizeof (ACDSeeKeywordTransformerPrivate));
+#line 55 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	((KeywordTransformerClass *) klass)->transform = acd_see_keyword_transformer_real_transform;
+#line 1494 "PhotoMetadata.c"
+}
+
+
+static void acd_see_keyword_transformer_instance_init (ACDSeeKeywordTransformer * self) {
+#line 55 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	self->priv = ACD_SEE_KEYWORD_TRANSFORMER_GET_PRIVATE (self);
+#line 1501 "PhotoMetadata.c"
+}
+
+
+static void acd_see_keyword_transformer_finalize (KeywordTransformer* obj) {
+	ACDSeeKeywordTransformer * self;
+#line 55 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_ACD_SEE_KEYWORD_TRANSFORMER, ACDSeeKeywordTransformer);
+#line 57 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	_g_error_free0 (self->priv->error);
+#line 58 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	_g_object_unref0 (self->priv->stack);
+#line 59 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	_g_object_unref0 (self->priv->result);
+#line 55 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	KEYWORD_TRANSFORMER_CLASS (acd_see_keyword_transformer_parent_class)->finalize (obj);
+#line 1517 "PhotoMetadata.c"
+}
+
+
+GType acd_see_keyword_transformer_get_type (void) {
+	static volatile gsize acd_see_keyword_transformer_type_id__volatile = 0;
+	if (g_once_init_enter (&acd_see_keyword_transformer_type_id__volatile)) {
+		static const GTypeInfo g_define_type_info = { sizeof (ACDSeeKeywordTransformerClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) acd_see_keyword_transformer_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (ACDSeeKeywordTransformer), 0, (GInstanceInitFunc) acd_see_keyword_transformer_instance_init, NULL };
+		GType acd_see_keyword_transformer_type_id;
+		acd_see_keyword_transformer_type_id = g_type_register_static (TYPE_KEYWORD_TRANSFORMER, "ACDSeeKeywordTransformer", &g_define_type_info, 0);
+		g_once_init_leave (&acd_see_keyword_transformer_type_id__volatile, acd_see_keyword_transformer_type_id);
+	}
+	return acd_see_keyword_transformer_type_id__volatile;
+}
+
+
+static gpointer _keyword_transformer_ref0 (gpointer self) {
+#line 154 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	return self ? keyword_transformer_ref (self) : NULL;
+#line 1536 "PhotoMetadata.c"
+}
+
+
+HierarchicalKeywordField* hierarchical_keyword_field_construct (GType object_type, const gchar* field_name, const gchar* path_separator, gboolean wants_leading_separator, gboolean is_writeable, KeywordTransformer* transformer) {
 	HierarchicalKeywordField* self = NULL;
 	const gchar* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
@@ -638,256 +1544,270 @@ HierarchicalKeywordField* hierarchical_keyword_field_construct (GType object_typ
 	gchar* _tmp3_ = NULL;
 	gboolean _tmp4_ = FALSE;
 	gboolean _tmp5_ = FALSE;
-#line 37 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	KeywordTransformer* _tmp6_ = NULL;
+	KeywordTransformer* _tmp7_ = NULL;
+#line 144 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (field_name != NULL, NULL);
-#line 37 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 144 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (path_separator != NULL, NULL);
-#line 37 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 144 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	g_return_val_if_fail (IS_KEYWORD_TRANSFORMER (transformer), NULL);
+#line 144 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	self = (HierarchicalKeywordField*) g_type_create_instance (object_type);
-#line 39 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 150 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0_ = field_name;
-#line 39 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 150 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 39 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 150 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_g_free0 (self->field_name);
-#line 39 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 150 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	self->field_name = _tmp1_;
-#line 40 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 151 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp2_ = path_separator;
-#line 40 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 151 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp3_ = g_strdup (_tmp2_);
-#line 40 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 151 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_g_free0 (self->path_separator);
-#line 40 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 151 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	self->path_separator = _tmp3_;
-#line 41 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 152 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp4_ = wants_leading_separator;
-#line 41 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 152 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	self->wants_leading_separator = _tmp4_;
-#line 42 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 153 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp5_ = is_writeable;
-#line 42 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 153 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	self->is_writeable = _tmp5_;
-#line 37 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 154 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	_tmp6_ = transformer;
+#line 154 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	_tmp7_ = _keyword_transformer_ref0 (_tmp6_);
+#line 154 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	_keyword_transformer_unref0 (self->transformer);
+#line 154 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	self->transformer = _tmp7_;
+#line 144 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return self;
-#line 674 "PhotoMetadata.c"
+#line 1592 "PhotoMetadata.c"
 }
 
 
-HierarchicalKeywordField* hierarchical_keyword_field_new (const gchar* field_name, const gchar* path_separator, gboolean wants_leading_separator, gboolean is_writeable) {
-#line 37 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-	return hierarchical_keyword_field_construct (TYPE_HIERARCHICAL_KEYWORD_FIELD, field_name, path_separator, wants_leading_separator, is_writeable);
-#line 681 "PhotoMetadata.c"
+HierarchicalKeywordField* hierarchical_keyword_field_new (const gchar* field_name, const gchar* path_separator, gboolean wants_leading_separator, gboolean is_writeable, KeywordTransformer* transformer) {
+#line 144 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	return hierarchical_keyword_field_construct (TYPE_HIERARCHICAL_KEYWORD_FIELD, field_name, path_separator, wants_leading_separator, is_writeable, transformer);
+#line 1599 "PhotoMetadata.c"
 }
 
 
 static void value_hierarchical_keyword_field_init (GValue* value) {
-#line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	value->data[0].v_pointer = NULL;
-#line 688 "PhotoMetadata.c"
+#line 1606 "PhotoMetadata.c"
 }
 
 
 static void value_hierarchical_keyword_field_free_value (GValue* value) {
-#line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (value->data[0].v_pointer) {
-#line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		hierarchical_keyword_field_unref (value->data[0].v_pointer);
-#line 697 "PhotoMetadata.c"
+#line 1615 "PhotoMetadata.c"
 	}
 }
 
 
 static void value_hierarchical_keyword_field_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (src_value->data[0].v_pointer) {
-#line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		dest_value->data[0].v_pointer = hierarchical_keyword_field_ref (src_value->data[0].v_pointer);
-#line 707 "PhotoMetadata.c"
+#line 1625 "PhotoMetadata.c"
 	} else {
-#line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 711 "PhotoMetadata.c"
+#line 1629 "PhotoMetadata.c"
 	}
 }
 
 
 static gpointer value_hierarchical_keyword_field_peek_pointer (const GValue* value) {
-#line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return value->data[0].v_pointer;
-#line 719 "PhotoMetadata.c"
+#line 1637 "PhotoMetadata.c"
 }
 
 
 static gchar* value_hierarchical_keyword_field_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (collect_values[0].v_pointer) {
-#line 726 "PhotoMetadata.c"
+#line 1644 "PhotoMetadata.c"
 		HierarchicalKeywordField* object;
 		object = collect_values[0].v_pointer;
-#line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		if (object->parent_instance.g_class == NULL) {
-#line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 733 "PhotoMetadata.c"
+#line 1651 "PhotoMetadata.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.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 737 "PhotoMetadata.c"
+#line 1655 "PhotoMetadata.c"
 		}
-#line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		value->data[0].v_pointer = hierarchical_keyword_field_ref (object);
-#line 741 "PhotoMetadata.c"
+#line 1659 "PhotoMetadata.c"
 	} else {
-#line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		value->data[0].v_pointer = NULL;
-#line 745 "PhotoMetadata.c"
+#line 1663 "PhotoMetadata.c"
 	}
-#line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return NULL;
-#line 749 "PhotoMetadata.c"
+#line 1667 "PhotoMetadata.c"
 }
 
 
 static gchar* value_hierarchical_keyword_field_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 	HierarchicalKeywordField** object_p;
 	object_p = collect_values[0].v_pointer;
-#line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (!object_p) {
-#line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 760 "PhotoMetadata.c"
+#line 1678 "PhotoMetadata.c"
 	}
-#line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (!value->data[0].v_pointer) {
-#line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		*object_p = NULL;
-#line 766 "PhotoMetadata.c"
+#line 1684 "PhotoMetadata.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		*object_p = value->data[0].v_pointer;
-#line 770 "PhotoMetadata.c"
+#line 1688 "PhotoMetadata.c"
 	} else {
-#line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		*object_p = hierarchical_keyword_field_ref (value->data[0].v_pointer);
-#line 774 "PhotoMetadata.c"
+#line 1692 "PhotoMetadata.c"
 	}
-#line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return NULL;
-#line 778 "PhotoMetadata.c"
+#line 1696 "PhotoMetadata.c"
 }
 
 
 GParamSpec* param_spec_hierarchical_keyword_field (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
 	ParamSpecHierarchicalKeywordField* spec;
-#line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, TYPE_HIERARCHICAL_KEYWORD_FIELD), NULL);
-#line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return G_PARAM_SPEC (spec);
-#line 792 "PhotoMetadata.c"
+#line 1710 "PhotoMetadata.c"
 }
 
 
 gpointer value_get_hierarchical_keyword_field (const GValue* value) {
-#line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_HIERARCHICAL_KEYWORD_FIELD), NULL);
-#line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return value->data[0].v_pointer;
-#line 801 "PhotoMetadata.c"
+#line 1719 "PhotoMetadata.c"
 }
 
 
 void value_set_hierarchical_keyword_field (GValue* value, gpointer v_object) {
 	HierarchicalKeywordField* old;
-#line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_HIERARCHICAL_KEYWORD_FIELD));
-#line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	old = value->data[0].v_pointer;
-#line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (v_object) {
-#line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_HIERARCHICAL_KEYWORD_FIELD));
-#line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		value->data[0].v_pointer = v_object;
-#line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		hierarchical_keyword_field_ref (value->data[0].v_pointer);
-#line 821 "PhotoMetadata.c"
+#line 1739 "PhotoMetadata.c"
 	} else {
-#line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		value->data[0].v_pointer = NULL;
-#line 825 "PhotoMetadata.c"
+#line 1743 "PhotoMetadata.c"
 	}
-#line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (old) {
-#line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		hierarchical_keyword_field_unref (old);
-#line 831 "PhotoMetadata.c"
+#line 1749 "PhotoMetadata.c"
 	}
 }
 
 
 void value_take_hierarchical_keyword_field (GValue* value, gpointer v_object) {
 	HierarchicalKeywordField* old;
-#line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_HIERARCHICAL_KEYWORD_FIELD));
-#line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	old = value->data[0].v_pointer;
-#line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (v_object) {
-#line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_HIERARCHICAL_KEYWORD_FIELD));
-#line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		value->data[0].v_pointer = v_object;
-#line 850 "PhotoMetadata.c"
+#line 1768 "PhotoMetadata.c"
 	} else {
-#line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		value->data[0].v_pointer = NULL;
-#line 854 "PhotoMetadata.c"
+#line 1772 "PhotoMetadata.c"
 	}
-#line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (old) {
-#line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		hierarchical_keyword_field_unref (old);
-#line 860 "PhotoMetadata.c"
+#line 1778 "PhotoMetadata.c"
 	}
 }
 
 
 static void hierarchical_keyword_field_class_init (HierarchicalKeywordFieldClass * klass) {
-#line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	hierarchical_keyword_field_parent_class = g_type_class_peek_parent (klass);
-#line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	((HierarchicalKeywordFieldClass *) klass)->finalize = hierarchical_keyword_field_finalize;
-#line 870 "PhotoMetadata.c"
+#line 1788 "PhotoMetadata.c"
 }
 
 
 static void hierarchical_keyword_field_instance_init (HierarchicalKeywordField * self) {
-#line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	self->ref_count = 1;
-#line 877 "PhotoMetadata.c"
+#line 1795 "PhotoMetadata.c"
 }
 
 
 static void hierarchical_keyword_field_finalize (HierarchicalKeywordField* obj) {
 	HierarchicalKeywordField * self;
-#line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_HIERARCHICAL_KEYWORD_FIELD, HierarchicalKeywordField);
-#line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_signal_handlers_destroy (self);
-#line 32 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 138 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_g_free0 (self->field_name);
-#line 33 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 139 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_g_free0 (self->path_separator);
-#line 891 "PhotoMetadata.c"
+#line 142 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	_keyword_transformer_unref0 (self->transformer);
+#line 1811 "PhotoMetadata.c"
 }
 
 
@@ -908,24 +1828,24 @@ GType hierarchical_keyword_field_get_type (void) {
 gpointer hierarchical_keyword_field_ref (gpointer instance) {
 	HierarchicalKeywordField* self;
 	self = instance;
-#line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_atomic_int_inc (&self->ref_count);
-#line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return instance;
-#line 916 "PhotoMetadata.c"
+#line 1836 "PhotoMetadata.c"
 }
 
 
 void hierarchical_keyword_field_unref (gpointer instance) {
 	HierarchicalKeywordField* self;
 	self = instance;
-#line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		HIERARCHICAL_KEYWORD_FIELD_GET_CLASS (self)->finalize (self);
-#line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 929 "PhotoMetadata.c"
+#line 1849 "PhotoMetadata.c"
 	}
 }
 
@@ -940,51 +1860,51 @@ PhotoPreview* photo_preview_construct (GType object_type, const gchar* name, Dim
 	gchar* _tmp5_ = NULL;
 	const gchar* _tmp6_ = NULL;
 	gchar* _tmp7_ = NULL;
-#line 53 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 165 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (name != NULL, NULL);
-#line 53 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 165 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (dimensions != NULL, NULL);
-#line 53 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 165 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (mime_type != NULL, NULL);
-#line 53 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 165 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (extension != NULL, NULL);
-#line 53 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 165 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	self = (PhotoPreview*) g_type_create_instance (object_type);
-#line 54 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 166 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0_ = name;
-#line 54 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 166 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 54 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 166 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_g_free0 (self->priv->name);
-#line 54 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 166 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	self->priv->name = _tmp1_;
-#line 55 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 167 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp2_ = *dimensions;
-#line 55 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 167 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	self->priv->dimensions = _tmp2_;
-#line 56 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 168 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp3_ = size;
-#line 56 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 168 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	self->priv->size = _tmp3_;
-#line 57 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 169 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp4_ = mime_type;
-#line 57 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 169 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp5_ = g_strdup (_tmp4_);
-#line 57 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 169 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_g_free0 (self->priv->mime_type);
-#line 57 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 169 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	self->priv->mime_type = _tmp5_;
-#line 58 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 170 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp6_ = extension;
-#line 58 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 170 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp7_ = g_strdup (_tmp6_);
-#line 58 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 170 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_g_free0 (self->priv->extension);
-#line 58 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 170 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	self->priv->extension = _tmp7_;
-#line 53 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 165 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return self;
-#line 988 "PhotoMetadata.c"
+#line 1908 "PhotoMetadata.c"
 }
 
 
@@ -992,46 +1912,46 @@ gchar* photo_preview_get_name (PhotoPreview* self) {
 	gchar* result = NULL;
 	const gchar* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
-#line 61 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 173 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (IS_PHOTO_PREVIEW (self), NULL);
-#line 62 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 174 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0_ = self->priv->name;
-#line 62 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 174 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 62 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 174 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	result = _tmp1_;
-#line 62 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 174 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 1006 "PhotoMetadata.c"
+#line 1926 "PhotoMetadata.c"
 }
 
 
 void photo_preview_get_pixel_dimensions (PhotoPreview* self, Dimensions* result) {
 	Dimensions _tmp0_ = {0};
-#line 65 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 177 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_if_fail (IS_PHOTO_PREVIEW (self));
-#line 66 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 178 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0_ = self->priv->dimensions;
-#line 66 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 178 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	*result = _tmp0_;
-#line 66 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 178 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return;
-#line 1020 "PhotoMetadata.c"
+#line 1940 "PhotoMetadata.c"
 }
 
 
 guint32 photo_preview_get_size (PhotoPreview* self) {
 	guint32 result = 0U;
 	guint32 _tmp0_ = 0U;
-#line 69 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 181 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (IS_PHOTO_PREVIEW (self), 0U);
-#line 70 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 182 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0_ = self->priv->size;
-#line 70 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 182 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	result = _tmp0_;
-#line 70 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 182 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 1035 "PhotoMetadata.c"
+#line 1955 "PhotoMetadata.c"
 }
 
 
@@ -1039,17 +1959,17 @@ gchar* photo_preview_get_mime_type (PhotoPreview* self) {
 	gchar* result = NULL;
 	const gchar* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
-#line 73 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 185 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (IS_PHOTO_PREVIEW (self), NULL);
-#line 74 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 186 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0_ = self->priv->mime_type;
-#line 74 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 186 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 74 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 186 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	result = _tmp1_;
-#line 74 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 186 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 1053 "PhotoMetadata.c"
+#line 1973 "PhotoMetadata.c"
 }
 
 
@@ -1057,42 +1977,42 @@ gchar* photo_preview_get_extension (PhotoPreview* self) {
 	gchar* result = NULL;
 	const gchar* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
-#line 77 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 189 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (IS_PHOTO_PREVIEW (self), NULL);
-#line 78 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 190 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0_ = self->priv->extension;
-#line 78 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 190 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 78 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 190 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	result = _tmp1_;
-#line 78 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 190 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 1071 "PhotoMetadata.c"
+#line 1991 "PhotoMetadata.c"
 }
 
 
 static guint8* photo_preview_real_flatten (PhotoPreview* self, int* result_length1, GError** error) {
-#line 81 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 193 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_critical ("Type `%s' does not implement abstract method `photo_preview_flatten'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
-#line 81 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 193 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return NULL;
-#line 1080 "PhotoMetadata.c"
+#line 2000 "PhotoMetadata.c"
 }
 
 
 guint8* photo_preview_flatten (PhotoPreview* self, int* result_length1, GError** error) {
-#line 81 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 193 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (IS_PHOTO_PREVIEW (self), NULL);
-#line 81 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 193 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return PHOTO_PREVIEW_GET_CLASS (self)->flatten (self, result_length1, error);
-#line 1089 "PhotoMetadata.c"
+#line 2009 "PhotoMetadata.c"
 }
 
 
 static guint8* _vala_array_dup4 (guint8* self, int length) {
-#line 89 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 201 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return g_memdup (self, length * sizeof (guint8));
-#line 1096 "PhotoMetadata.c"
+#line 2016 "PhotoMetadata.c"
 }
 
 
@@ -1104,21 +2024,21 @@ static GdkPixbuf* photo_preview_real_get_pixbuf (PhotoPreview* self, GError** er
 	gint flattened_length1 = 0;
 	gint _flattened_size_ = 0;
 	GError * _inner_error_ = NULL;
-#line 84 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 196 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp1_ = photo_preview_flatten (self, &_tmp0_, &_inner_error_);
-#line 84 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 196 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	flattened = _tmp1_;
-#line 84 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 196 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	flattened_length1 = _tmp0_;
-#line 84 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 196 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_flattened_size_ = flattened_length1;
-#line 84 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 196 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 84 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 196 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		g_propagate_error (error, _inner_error_);
-#line 84 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 196 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		return NULL;
-#line 1122 "PhotoMetadata.c"
+#line 2042 "PhotoMetadata.c"
 	}
 	{
 		GdkPixbuf* _tmp2_ = NULL;
@@ -1129,40 +2049,40 @@ static GdkPixbuf* photo_preview_real_get_pixbuf (PhotoPreview* self, GError** er
 		GdkPixbuf* _tmp6_ = NULL;
 		GdkPixbuf* _tmp7_ = NULL;
 		GdkPixbuf* _tmp8_ = NULL;
-#line 89 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 201 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp3_ = (flattened != NULL) ? _vala_array_dup4 (flattened, flattened_length1) : ((gpointer) flattened);
-#line 89 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 201 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp3__length1 = flattened_length1;
-#line 89 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 201 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp4_ = (GMemoryInputStream*) g_memory_input_stream_new_from_data (_tmp3_, _tmp3__length1, NULL);
-#line 89 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 201 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp5_ = _tmp4_;
-#line 89 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 201 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp6_ = gdk_pixbuf_new_from_stream (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, g_input_stream_get_type (), GInputStream), NULL, &_inner_error_);
-#line 89 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 201 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp7_ = _tmp6_;
-#line 89 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 201 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_g_object_unref0 (_tmp5_);
-#line 89 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 201 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp2_ = _tmp7_;
-#line 89 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 201 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1151 "PhotoMetadata.c"
+#line 2071 "PhotoMetadata.c"
 			goto __catch23_g_error;
 		}
-#line 89 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 201 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp8_ = _tmp2_;
-#line 89 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 201 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp2_ = NULL;
-#line 89 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 201 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		result = _tmp8_;
-#line 89 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 201 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_g_object_unref0 (_tmp2_);
-#line 89 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 201 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		flattened = (g_free (flattened), NULL);
-#line 89 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 201 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		return result;
-#line 1166 "PhotoMetadata.c"
+#line 2086 "PhotoMetadata.c"
 	}
 	goto __finally23;
 	__catch23_g_error:
@@ -1171,265 +2091,265 @@ static GdkPixbuf* photo_preview_real_get_pixbuf (PhotoPreview* self, GError** er
 		const gchar* _tmp9_ = NULL;
 		GError* _tmp10_ = NULL;
 		const gchar* _tmp11_ = NULL;
-#line 88 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 200 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		err = _inner_error_;
-#line 88 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 200 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_inner_error_ = NULL;
-#line 92 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 204 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp9_ = self->priv->name;
-#line 92 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 204 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp10_ = err;
-#line 92 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 204 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp11_ = _tmp10_->message;
-#line 92 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-		g_warning ("PhotoMetadata.vala:92: Unable to decode thumbnail for %s: %s", _tmp9_, _tmp11_);
-#line 94 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 204 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+		g_warning ("PhotoMetadata.vala:204: Unable to decode thumbnail for %s: %s", _tmp9_, _tmp11_);
+#line 206 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		result = NULL;
-#line 94 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 206 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_g_error_free0 (err);
-#line 94 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 206 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		flattened = (g_free (flattened), NULL);
-#line 94 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 206 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		return result;
-#line 1195 "PhotoMetadata.c"
+#line 2115 "PhotoMetadata.c"
 	}
 	__finally23:
-#line 88 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 200 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_propagate_error (error, _inner_error_);
-#line 88 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 200 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	flattened = (g_free (flattened), NULL);
-#line 88 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 200 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return NULL;
-#line 1204 "PhotoMetadata.c"
+#line 2124 "PhotoMetadata.c"
 }
 
 
 GdkPixbuf* photo_preview_get_pixbuf (PhotoPreview* self, GError** error) {
-#line 83 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 195 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (IS_PHOTO_PREVIEW (self), NULL);
-#line 83 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 195 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return PHOTO_PREVIEW_GET_CLASS (self)->get_pixbuf (self, error);
-#line 1213 "PhotoMetadata.c"
+#line 2133 "PhotoMetadata.c"
 }
 
 
 static void value_photo_preview_init (GValue* value) {
-#line 46 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	value->data[0].v_pointer = NULL;
-#line 1220 "PhotoMetadata.c"
+#line 2140 "PhotoMetadata.c"
 }
 
 
 static void value_photo_preview_free_value (GValue* value) {
-#line 46 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (value->data[0].v_pointer) {
-#line 46 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		photo_preview_unref (value->data[0].v_pointer);
-#line 1229 "PhotoMetadata.c"
+#line 2149 "PhotoMetadata.c"
 	}
 }
 
 
 static void value_photo_preview_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 46 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (src_value->data[0].v_pointer) {
-#line 46 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		dest_value->data[0].v_pointer = photo_preview_ref (src_value->data[0].v_pointer);
-#line 1239 "PhotoMetadata.c"
+#line 2159 "PhotoMetadata.c"
 	} else {
-#line 46 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 1243 "PhotoMetadata.c"
+#line 2163 "PhotoMetadata.c"
 	}
 }
 
 
 static gpointer value_photo_preview_peek_pointer (const GValue* value) {
-#line 46 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return value->data[0].v_pointer;
-#line 1251 "PhotoMetadata.c"
+#line 2171 "PhotoMetadata.c"
 }
 
 
 static gchar* value_photo_preview_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 46 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (collect_values[0].v_pointer) {
-#line 1258 "PhotoMetadata.c"
+#line 2178 "PhotoMetadata.c"
 		PhotoPreview* object;
 		object = collect_values[0].v_pointer;
-#line 46 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		if (object->parent_instance.g_class == NULL) {
-#line 46 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 1265 "PhotoMetadata.c"
+#line 2185 "PhotoMetadata.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 46 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 1269 "PhotoMetadata.c"
+#line 2189 "PhotoMetadata.c"
 		}
-#line 46 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		value->data[0].v_pointer = photo_preview_ref (object);
-#line 1273 "PhotoMetadata.c"
+#line 2193 "PhotoMetadata.c"
 	} else {
-#line 46 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		value->data[0].v_pointer = NULL;
-#line 1277 "PhotoMetadata.c"
+#line 2197 "PhotoMetadata.c"
 	}
-#line 46 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return NULL;
-#line 1281 "PhotoMetadata.c"
+#line 2201 "PhotoMetadata.c"
 }
 
 
 static gchar* value_photo_preview_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 	PhotoPreview** object_p;
 	object_p = collect_values[0].v_pointer;
-#line 46 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (!object_p) {
-#line 46 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 1292 "PhotoMetadata.c"
+#line 2212 "PhotoMetadata.c"
 	}
-#line 46 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (!value->data[0].v_pointer) {
-#line 46 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		*object_p = NULL;
-#line 1298 "PhotoMetadata.c"
+#line 2218 "PhotoMetadata.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 46 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		*object_p = value->data[0].v_pointer;
-#line 1302 "PhotoMetadata.c"
+#line 2222 "PhotoMetadata.c"
 	} else {
-#line 46 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		*object_p = photo_preview_ref (value->data[0].v_pointer);
-#line 1306 "PhotoMetadata.c"
+#line 2226 "PhotoMetadata.c"
 	}
-#line 46 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return NULL;
-#line 1310 "PhotoMetadata.c"
+#line 2230 "PhotoMetadata.c"
 }
 
 
 GParamSpec* param_spec_photo_preview (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
 	ParamSpecPhotoPreview* spec;
-#line 46 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, TYPE_PHOTO_PREVIEW), NULL);
-#line 46 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 46 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 46 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return G_PARAM_SPEC (spec);
-#line 1324 "PhotoMetadata.c"
+#line 2244 "PhotoMetadata.c"
 }
 
 
 gpointer value_get_photo_preview (const GValue* value) {
-#line 46 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PHOTO_PREVIEW), NULL);
-#line 46 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return value->data[0].v_pointer;
-#line 1333 "PhotoMetadata.c"
+#line 2253 "PhotoMetadata.c"
 }
 
 
 void value_set_photo_preview (GValue* value, gpointer v_object) {
 	PhotoPreview* old;
-#line 46 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PHOTO_PREVIEW));
-#line 46 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	old = value->data[0].v_pointer;
-#line 46 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (v_object) {
-#line 46 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_PHOTO_PREVIEW));
-#line 46 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 46 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		value->data[0].v_pointer = v_object;
-#line 46 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		photo_preview_ref (value->data[0].v_pointer);
-#line 1353 "PhotoMetadata.c"
+#line 2273 "PhotoMetadata.c"
 	} else {
-#line 46 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		value->data[0].v_pointer = NULL;
-#line 1357 "PhotoMetadata.c"
+#line 2277 "PhotoMetadata.c"
 	}
-#line 46 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (old) {
-#line 46 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		photo_preview_unref (old);
-#line 1363 "PhotoMetadata.c"
+#line 2283 "PhotoMetadata.c"
 	}
 }
 
 
 void value_take_photo_preview (GValue* value, gpointer v_object) {
 	PhotoPreview* old;
-#line 46 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PHOTO_PREVIEW));
-#line 46 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	old = value->data[0].v_pointer;
-#line 46 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (v_object) {
-#line 46 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_PHOTO_PREVIEW));
-#line 46 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 46 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		value->data[0].v_pointer = v_object;
-#line 1382 "PhotoMetadata.c"
+#line 2302 "PhotoMetadata.c"
 	} else {
-#line 46 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		value->data[0].v_pointer = NULL;
-#line 1386 "PhotoMetadata.c"
+#line 2306 "PhotoMetadata.c"
 	}
-#line 46 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (old) {
-#line 46 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		photo_preview_unref (old);
-#line 1392 "PhotoMetadata.c"
+#line 2312 "PhotoMetadata.c"
 	}
 }
 
 
 static void photo_preview_class_init (PhotoPreviewClass * klass) {
-#line 46 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	photo_preview_parent_class = g_type_class_peek_parent (klass);
-#line 46 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	((PhotoPreviewClass *) klass)->finalize = photo_preview_finalize;
-#line 46 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_type_class_add_private (klass, sizeof (PhotoPreviewPrivate));
-#line 46 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	((PhotoPreviewClass *) klass)->flatten = photo_preview_real_flatten;
-#line 46 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	((PhotoPreviewClass *) klass)->get_pixbuf = photo_preview_real_get_pixbuf;
-#line 1408 "PhotoMetadata.c"
+#line 2328 "PhotoMetadata.c"
 }
 
 
 static void photo_preview_instance_init (PhotoPreview * self) {
-#line 46 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	self->priv = PHOTO_PREVIEW_GET_PRIVATE (self);
-#line 46 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	self->ref_count = 1;
-#line 1417 "PhotoMetadata.c"
+#line 2337 "PhotoMetadata.c"
 }
 
 
 static void photo_preview_finalize (PhotoPreview* obj) {
 	PhotoPreview * self;
-#line 46 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PHOTO_PREVIEW, PhotoPreview);
-#line 46 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_signal_handlers_destroy (self);
-#line 47 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 159 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_g_free0 (self->priv->name);
-#line 50 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 162 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_g_free0 (self->priv->mime_type);
-#line 51 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 163 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_g_free0 (self->priv->extension);
-#line 1433 "PhotoMetadata.c"
+#line 2353 "PhotoMetadata.c"
 }
 
 
@@ -1450,24 +2370,24 @@ GType photo_preview_get_type (void) {
 gpointer photo_preview_ref (gpointer instance) {
 	PhotoPreview* self;
 	self = instance;
-#line 46 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_atomic_int_inc (&self->ref_count);
-#line 46 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return instance;
-#line 1458 "PhotoMetadata.c"
+#line 2378 "PhotoMetadata.c"
 }
 
 
 void photo_preview_unref (gpointer instance) {
 	PhotoPreview* self;
 	self = instance;
-#line 46 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 46 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		PHOTO_PREVIEW_GET_CLASS (self)->finalize (self);
-#line 46 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 1471 "PhotoMetadata.c"
+#line 2391 "PhotoMetadata.c"
 	}
 }
 
@@ -1486,18 +2406,18 @@ GType photo_metadata_set_option_get_type (void) {
 
 PhotoMetadata* photo_metadata_construct (GType object_type) {
 	PhotoMetadata* self = NULL;
-#line 139 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 251 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	self = (PhotoMetadata*) media_metadata_construct (object_type);
-#line 139 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 251 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return self;
-#line 1494 "PhotoMetadata.c"
+#line 2414 "PhotoMetadata.c"
 }
 
 
 PhotoMetadata* photo_metadata_new (void) {
-#line 139 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 251 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return photo_metadata_construct (TYPE_PHOTO_METADATA);
-#line 1501 "PhotoMetadata.c"
+#line 2421 "PhotoMetadata.c"
 }
 
 
@@ -1515,63 +2435,63 @@ static void photo_metadata_real_read_from_file (MediaMetadata* base, GFile* file
 	GFile* _tmp9_ = NULL;
 	gchar* _tmp10_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 142 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 254 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO_METADATA, PhotoMetadata);
-#line 142 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 254 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_if_fail (G_IS_FILE (file));
-#line 143 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 255 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0_ = gexiv2_metadata_new ();
-#line 143 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 255 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_g_object_unref0 (self->priv->exiv2);
-#line 143 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 255 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	self->priv->exiv2 = _tmp0_;
-#line 144 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 256 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_exif_data_unref0 (self->priv->exif);
-#line 144 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 256 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	self->priv->exif = NULL;
-#line 146 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 258 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp1_ = self->priv->exiv2;
-#line 146 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 258 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp2_ = file;
-#line 146 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 258 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp3_ = g_file_get_path (_tmp2_);
-#line 146 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 258 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp4_ = _tmp3_;
-#line 146 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 258 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	gexiv2_metadata_open_path (_tmp1_, _tmp4_, &_inner_error_);
-#line 146 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 258 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_g_free0 (_tmp4_);
-#line 146 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 258 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 146 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 258 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		g_propagate_error (error, _inner_error_);
-#line 146 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 258 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		return;
-#line 1551 "PhotoMetadata.c"
+#line 2471 "PhotoMetadata.c"
 	}
-#line 147 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 259 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp5_ = file;
-#line 147 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 259 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp6_ = g_file_get_path (_tmp5_);
-#line 147 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 259 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp7_ = _tmp6_;
-#line 147 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 259 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp8_ = exif_data_new_from_file (_tmp7_);
-#line 147 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 259 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_exif_data_unref0 (self->priv->exif);
-#line 147 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 259 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	self->priv->exif = _tmp8_;
-#line 147 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 259 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_g_free0 (_tmp7_);
-#line 148 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 260 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp9_ = file;
-#line 148 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 260 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp10_ = g_file_get_basename (_tmp9_);
-#line 148 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 260 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_g_free0 (self->priv->source_name);
-#line 148 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 260 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	self->priv->source_name = _tmp10_;
-#line 1575 "PhotoMetadata.c"
+#line 2495 "PhotoMetadata.c"
 }
 
 
@@ -1581,29 +2501,29 @@ void photo_metadata_write_to_file (PhotoMetadata* self, GFile* file, GError** er
 	gchar* _tmp2_ = NULL;
 	gchar* _tmp3_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 151 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 263 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_if_fail (IS_PHOTO_METADATA (self));
-#line 151 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 263 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_if_fail (G_IS_FILE (file));
-#line 152 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 264 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0_ = self->priv->exiv2;
-#line 152 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 264 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp1_ = file;
-#line 152 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 264 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp2_ = g_file_get_path (_tmp1_);
-#line 152 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 264 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp3_ = _tmp2_;
-#line 152 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 264 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	gexiv2_metadata_save_file (_tmp0_, _tmp3_, &_inner_error_);
-#line 152 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 264 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_g_free0 (_tmp3_);
-#line 152 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 264 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 152 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 264 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		g_propagate_error (error, _inner_error_);
-#line 152 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 264 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		return;
-#line 1607 "PhotoMetadata.c"
+#line 2527 "PhotoMetadata.c"
 	}
 }
 
@@ -1625,80 +2545,80 @@ void photo_metadata_read_from_buffer (PhotoMetadata* self, guint8* buffer, int b
 	gint _tmp11_ = 0;
 	gchar* _tmp12_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 155 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 267 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_if_fail (IS_PHOTO_METADATA (self));
-#line 156 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 268 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0_ = length;
-#line 156 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 268 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp0_ <= 0) {
-#line 1635 "PhotoMetadata.c"
+#line 2555 "PhotoMetadata.c"
 		guint8* _tmp1_ = NULL;
 		gint _tmp1__length1 = 0;
-#line 157 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 269 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp1_ = buffer;
-#line 157 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 269 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp1__length1 = buffer_length1;
-#line 157 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 269 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		length = _tmp1__length1;
-#line 1644 "PhotoMetadata.c"
+#line 2564 "PhotoMetadata.c"
 	}
-#line 159 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 271 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp2_ = buffer;
-#line 159 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 271 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp2__length1 = buffer_length1;
-#line 159 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 271 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp3_ = length;
-#line 159 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 271 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_vala_assert (_tmp2__length1 >= _tmp3_, "buffer.length >= length");
-#line 161 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 273 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp4_ = gexiv2_metadata_new ();
-#line 161 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 273 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_g_object_unref0 (self->priv->exiv2);
-#line 161 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 273 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	self->priv->exiv2 = _tmp4_;
-#line 162 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 274 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_exif_data_unref0 (self->priv->exif);
-#line 162 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 274 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	self->priv->exif = NULL;
-#line 164 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 276 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp5_ = self->priv->exiv2;
-#line 164 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 276 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp6_ = buffer;
-#line 164 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 276 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp6__length1 = buffer_length1;
-#line 164 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 276 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp7_ = length;
-#line 164 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 276 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	gexiv2_metadata_open_buf (_tmp5_, _tmp6_, (glong) _tmp7_, &_inner_error_);
-#line 164 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 276 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 164 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 276 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		g_propagate_error (error, _inner_error_);
-#line 164 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 276 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		return;
-#line 1680 "PhotoMetadata.c"
+#line 2600 "PhotoMetadata.c"
 	}
-#line 165 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 277 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp8_ = buffer;
-#line 165 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 277 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp8__length1 = buffer_length1;
-#line 165 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 277 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp9_ = length;
-#line 165 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 277 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp10_ = exif_data_new_from_data (_tmp8_, (gsize) _tmp9_);
-#line 165 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 277 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_exif_data_unref0 (self->priv->exif);
-#line 165 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 277 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	self->priv->exif = _tmp10_;
-#line 166 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 278 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp11_ = length;
-#line 166 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 278 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp12_ = g_strdup_printf ("<memory buffer %d bytes>", _tmp11_);
-#line 166 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 278 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_g_free0 (self->priv->source_name);
-#line 166 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 278 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	self->priv->source_name = _tmp12_;
-#line 1702 "PhotoMetadata.c"
+#line 2622 "PhotoMetadata.c"
 }
 
 
@@ -1719,80 +2639,80 @@ void photo_metadata_read_from_app1_segment (PhotoMetadata* self, guint8* buffer,
 	gint _tmp11_ = 0;
 	gchar* _tmp12_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 169 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 281 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_if_fail (IS_PHOTO_METADATA (self));
-#line 170 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 282 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0_ = length;
-#line 170 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 282 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp0_ <= 0) {
-#line 1729 "PhotoMetadata.c"
+#line 2649 "PhotoMetadata.c"
 		guint8* _tmp1_ = NULL;
 		gint _tmp1__length1 = 0;
-#line 171 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 283 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp1_ = buffer;
-#line 171 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 283 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp1__length1 = buffer_length1;
-#line 171 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 283 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		length = _tmp1__length1;
-#line 1738 "PhotoMetadata.c"
+#line 2658 "PhotoMetadata.c"
 	}
-#line 173 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 285 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp2_ = buffer;
-#line 173 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 285 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp2__length1 = buffer_length1;
-#line 173 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 285 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp3_ = length;
-#line 173 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 285 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_vala_assert (_tmp2__length1 >= _tmp3_, "buffer.length >= length");
-#line 175 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 287 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp4_ = gexiv2_metadata_new ();
-#line 175 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 287 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_g_object_unref0 (self->priv->exiv2);
-#line 175 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 287 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	self->priv->exiv2 = _tmp4_;
-#line 176 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 288 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_exif_data_unref0 (self->priv->exif);
-#line 176 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 288 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	self->priv->exif = NULL;
-#line 178 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 290 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp5_ = self->priv->exiv2;
-#line 178 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 290 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp6_ = buffer;
-#line 178 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 290 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp6__length1 = buffer_length1;
-#line 178 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 290 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp7_ = length;
-#line 178 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 290 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	gexiv2_metadata_from_app1_segment (_tmp5_, _tmp6_, (glong) _tmp7_, &_inner_error_);
-#line 178 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 290 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 178 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 290 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		g_propagate_error (error, _inner_error_);
-#line 178 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 290 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		return;
-#line 1774 "PhotoMetadata.c"
+#line 2694 "PhotoMetadata.c"
 	}
-#line 179 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 291 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp8_ = buffer;
-#line 179 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 291 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp8__length1 = buffer_length1;
-#line 179 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 291 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp9_ = length;
-#line 179 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 291 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp10_ = exif_data_new_from_data (_tmp8_, (gsize) _tmp9_);
-#line 179 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 291 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_exif_data_unref0 (self->priv->exif);
-#line 179 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 291 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	self->priv->exif = _tmp10_;
-#line 180 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 292 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp11_ = length;
-#line 180 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 292 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp12_ = g_strdup_printf ("<app1 segment %d bytes>", _tmp11_);
-#line 180 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 292 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_g_free0 (self->priv->source_name);
-#line 180 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 292 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	self->priv->source_name = _tmp12_;
-#line 1796 "PhotoMetadata.c"
+#line 2716 "PhotoMetadata.c"
 }
 
 
@@ -1804,119 +2724,119 @@ MetadataDomain photo_metadata_get_tag_domain (const gchar* tag) {
 	gboolean _tmp3_ = FALSE;
 	const gchar* _tmp4_ = NULL;
 	gboolean _tmp5_ = FALSE;
-#line 183 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 295 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (tag != NULL, 0);
-#line 184 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 296 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0_ = tag;
-#line 184 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 296 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp1_ = gexiv2_metadata_is_exif_tag (_tmp0_);
-#line 184 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 296 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp1_) {
-#line 185 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 297 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		result = METADATA_DOMAIN_EXIF;
-#line 185 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 297 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		return result;
-#line 1820 "PhotoMetadata.c"
+#line 2740 "PhotoMetadata.c"
 	}
-#line 187 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 299 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp2_ = tag;
-#line 187 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 299 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp3_ = gexiv2_metadata_is_xmp_tag (_tmp2_);
-#line 187 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 299 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp3_) {
-#line 188 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 300 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		result = METADATA_DOMAIN_XMP;
-#line 188 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 300 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		return result;
-#line 1832 "PhotoMetadata.c"
+#line 2752 "PhotoMetadata.c"
 	}
-#line 190 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 302 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp4_ = tag;
-#line 190 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 302 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp5_ = gexiv2_metadata_is_iptc_tag (_tmp4_);
-#line 190 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 302 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp5_) {
-#line 191 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 303 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		result = METADATA_DOMAIN_IPTC;
-#line 191 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 303 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		return result;
-#line 1844 "PhotoMetadata.c"
+#line 2764 "PhotoMetadata.c"
 	}
-#line 193 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 305 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	result = METADATA_DOMAIN_UNKNOWN;
-#line 193 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 305 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 1850 "PhotoMetadata.c"
+#line 2770 "PhotoMetadata.c"
 }
 
 
 gboolean photo_metadata_has_domain (PhotoMetadata* self, MetadataDomain domain) {
 	gboolean result = FALSE;
 	MetadataDomain _tmp0_ = 0;
-#line 196 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 308 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (IS_PHOTO_METADATA (self), FALSE);
-#line 197 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 309 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0_ = domain;
-#line 197 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 309 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	switch (_tmp0_) {
-#line 197 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 309 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		case METADATA_DOMAIN_EXIF:
-#line 1865 "PhotoMetadata.c"
+#line 2785 "PhotoMetadata.c"
 		{
 			GExiv2Metadata* _tmp1_ = NULL;
 			gboolean _tmp2_ = FALSE;
-#line 199 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 311 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tmp1_ = self->priv->exiv2;
-#line 199 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 311 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tmp2_ = gexiv2_metadata_has_exif (_tmp1_);
-#line 199 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 311 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			result = _tmp2_;
-#line 199 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 311 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			return result;
-#line 1877 "PhotoMetadata.c"
+#line 2797 "PhotoMetadata.c"
 		}
-#line 197 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 309 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		case METADATA_DOMAIN_XMP:
-#line 1881 "PhotoMetadata.c"
+#line 2801 "PhotoMetadata.c"
 		{
 			GExiv2Metadata* _tmp3_ = NULL;
 			gboolean _tmp4_ = FALSE;
-#line 202 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 314 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tmp3_ = self->priv->exiv2;
-#line 202 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 314 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tmp4_ = gexiv2_metadata_has_xmp (_tmp3_);
-#line 202 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 314 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			result = _tmp4_;
-#line 202 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 314 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			return result;
-#line 1893 "PhotoMetadata.c"
+#line 2813 "PhotoMetadata.c"
 		}
-#line 197 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 309 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		case METADATA_DOMAIN_IPTC:
-#line 1897 "PhotoMetadata.c"
+#line 2817 "PhotoMetadata.c"
 		{
 			GExiv2Metadata* _tmp5_ = NULL;
 			gboolean _tmp6_ = FALSE;
-#line 205 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 317 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tmp5_ = self->priv->exiv2;
-#line 205 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 317 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tmp6_ = gexiv2_metadata_has_iptc (_tmp5_);
-#line 205 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 317 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			result = _tmp6_;
-#line 205 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 317 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			return result;
-#line 1909 "PhotoMetadata.c"
+#line 2829 "PhotoMetadata.c"
 		}
 		default:
-#line 197 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 309 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		case METADATA_DOMAIN_UNKNOWN:
-#line 1914 "PhotoMetadata.c"
+#line 2834 "PhotoMetadata.c"
 		{
-#line 209 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 321 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			result = FALSE;
-#line 209 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 321 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			return result;
-#line 1920 "PhotoMetadata.c"
+#line 2840 "PhotoMetadata.c"
 		}
 	}
 }
@@ -1925,115 +2845,115 @@ gboolean photo_metadata_has_domain (PhotoMetadata* self, MetadataDomain domain)
 gboolean photo_metadata_has_exif (PhotoMetadata* self) {
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
-#line 213 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 325 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (IS_PHOTO_METADATA (self), FALSE);
-#line 214 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 326 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0_ = photo_metadata_has_domain (self, METADATA_DOMAIN_EXIF);
-#line 214 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 326 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	result = _tmp0_;
-#line 214 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 326 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 1937 "PhotoMetadata.c"
+#line 2857 "PhotoMetadata.c"
 }
 
 
 gboolean photo_metadata_has_xmp (PhotoMetadata* self) {
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
-#line 217 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 329 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (IS_PHOTO_METADATA (self), FALSE);
-#line 218 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 330 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0_ = photo_metadata_has_domain (self, METADATA_DOMAIN_XMP);
-#line 218 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 330 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	result = _tmp0_;
-#line 218 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 330 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 1952 "PhotoMetadata.c"
+#line 2872 "PhotoMetadata.c"
 }
 
 
 gboolean photo_metadata_has_iptc (PhotoMetadata* self) {
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
-#line 221 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 333 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (IS_PHOTO_METADATA (self), FALSE);
-#line 222 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 334 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0_ = photo_metadata_has_domain (self, METADATA_DOMAIN_IPTC);
-#line 222 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 334 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	result = _tmp0_;
-#line 222 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 334 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 1967 "PhotoMetadata.c"
+#line 2887 "PhotoMetadata.c"
 }
 
 
 gboolean photo_metadata_can_write_to_domain (PhotoMetadata* self, MetadataDomain domain) {
 	gboolean result = FALSE;
 	MetadataDomain _tmp0_ = 0;
-#line 225 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 337 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (IS_PHOTO_METADATA (self), FALSE);
-#line 226 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 338 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0_ = domain;
-#line 226 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 338 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	switch (_tmp0_) {
-#line 226 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 338 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		case METADATA_DOMAIN_EXIF:
-#line 1982 "PhotoMetadata.c"
+#line 2902 "PhotoMetadata.c"
 		{
 			GExiv2Metadata* _tmp1_ = NULL;
 			gboolean _tmp2_ = FALSE;
-#line 228 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 340 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tmp1_ = self->priv->exiv2;
-#line 228 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 340 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tmp2_ = gexiv2_metadata_get_supports_exif (_tmp1_);
-#line 228 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 340 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			result = _tmp2_;
-#line 228 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 340 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			return result;
-#line 1994 "PhotoMetadata.c"
+#line 2914 "PhotoMetadata.c"
 		}
-#line 226 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 338 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		case METADATA_DOMAIN_XMP:
-#line 1998 "PhotoMetadata.c"
+#line 2918 "PhotoMetadata.c"
 		{
 			GExiv2Metadata* _tmp3_ = NULL;
 			gboolean _tmp4_ = FALSE;
-#line 231 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 343 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tmp3_ = self->priv->exiv2;
-#line 231 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 343 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tmp4_ = gexiv2_metadata_get_supports_xmp (_tmp3_);
-#line 231 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 343 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			result = _tmp4_;
-#line 231 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 343 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			return result;
-#line 2010 "PhotoMetadata.c"
+#line 2930 "PhotoMetadata.c"
 		}
-#line 226 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 338 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		case METADATA_DOMAIN_IPTC:
-#line 2014 "PhotoMetadata.c"
+#line 2934 "PhotoMetadata.c"
 		{
 			GExiv2Metadata* _tmp5_ = NULL;
 			gboolean _tmp6_ = FALSE;
-#line 234 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 346 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tmp5_ = self->priv->exiv2;
-#line 234 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 346 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tmp6_ = gexiv2_metadata_get_supports_iptc (_tmp5_);
-#line 234 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 346 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			result = _tmp6_;
-#line 234 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 346 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			return result;
-#line 2026 "PhotoMetadata.c"
+#line 2946 "PhotoMetadata.c"
 		}
 		default:
-#line 226 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 338 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		case METADATA_DOMAIN_UNKNOWN:
-#line 2031 "PhotoMetadata.c"
+#line 2951 "PhotoMetadata.c"
 		{
-#line 238 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 350 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			result = FALSE;
-#line 238 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 350 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			return result;
-#line 2037 "PhotoMetadata.c"
+#line 2957 "PhotoMetadata.c"
 		}
 	}
 }
@@ -2042,45 +2962,45 @@ gboolean photo_metadata_can_write_to_domain (PhotoMetadata* self, MetadataDomain
 gboolean photo_metadata_can_write_exif (PhotoMetadata* self) {
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
-#line 242 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 354 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (IS_PHOTO_METADATA (self), FALSE);
-#line 243 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 355 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0_ = photo_metadata_can_write_to_domain (self, METADATA_DOMAIN_EXIF);
-#line 243 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 355 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	result = _tmp0_;
-#line 243 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 355 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 2054 "PhotoMetadata.c"
+#line 2974 "PhotoMetadata.c"
 }
 
 
 gboolean photo_metadata_can_write_xmp (PhotoMetadata* self) {
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
-#line 246 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 358 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (IS_PHOTO_METADATA (self), FALSE);
-#line 247 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 359 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0_ = photo_metadata_can_write_to_domain (self, METADATA_DOMAIN_XMP);
-#line 247 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 359 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	result = _tmp0_;
-#line 247 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 359 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 2069 "PhotoMetadata.c"
+#line 2989 "PhotoMetadata.c"
 }
 
 
 gboolean photo_metadata_can_write_iptc (PhotoMetadata* self) {
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
-#line 250 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 362 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (IS_PHOTO_METADATA (self), FALSE);
-#line 251 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 363 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0_ = photo_metadata_can_write_to_domain (self, METADATA_DOMAIN_IPTC);
-#line 251 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 363 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	result = _tmp0_;
-#line 251 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 363 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 2084 "PhotoMetadata.c"
+#line 3004 "PhotoMetadata.c"
 }
 
 
@@ -2089,21 +3009,21 @@ gboolean photo_metadata_has_tag (PhotoMetadata* self, const gchar* tag) {
 	GExiv2Metadata* _tmp0_ = NULL;
 	const gchar* _tmp1_ = NULL;
 	gboolean _tmp2_ = FALSE;
-#line 254 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 366 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (IS_PHOTO_METADATA (self), FALSE);
-#line 254 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 366 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (tag != NULL, FALSE);
-#line 255 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 367 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0_ = self->priv->exiv2;
-#line 255 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 367 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp1_ = tag;
-#line 255 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 367 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp2_ = gexiv2_metadata_has_tag (_tmp0_, _tmp1_);
-#line 255 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 367 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	result = _tmp2_;
-#line 255 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 367 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 2107 "PhotoMetadata.c"
+#line 3027 "PhotoMetadata.c"
 }
 
 
@@ -2111,69 +3031,69 @@ static GeeSet* photo_metadata_create_string_set (PhotoMetadata* self, GCompareDa
 	GeeSet* result = NULL;
 	GCompareDataFunc _tmp0_ = NULL;
 	void* _tmp0__target = NULL;
-#line 258 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 370 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL);
-#line 260 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 372 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0_ = compare_func;
-#line 260 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 372 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0__target = compare_func_target;
-#line 260 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 372 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp0_ == NULL) {
-#line 2123 "PhotoMetadata.c"
+#line 3043 "PhotoMetadata.c"
 		GeeHashSet* _tmp1_ = NULL;
-#line 261 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 373 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp1_ = gee_hash_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, NULL, NULL, NULL, NULL, NULL, NULL);
-#line 261 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 373 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_SET, GeeSet);
-#line 261 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 373 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		(compare_func_target_destroy_notify == NULL) ? NULL : (compare_func_target_destroy_notify (compare_func_target), NULL);
-#line 261 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 373 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		compare_func = NULL;
-#line 261 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 373 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		compare_func_target = NULL;
-#line 261 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 373 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		compare_func_target_destroy_notify = NULL;
-#line 261 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 373 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		return result;
-#line 2139 "PhotoMetadata.c"
+#line 3059 "PhotoMetadata.c"
 	} else {
 		GCompareDataFunc _tmp2_ = NULL;
 		void* _tmp2__target = NULL;
 		GDestroyNotify _tmp2__target_destroy_notify = NULL;
 		GeeTreeSet* _tmp3_ = NULL;
-#line 263 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 375 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp2_ = compare_func;
-#line 263 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 375 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp2__target = compare_func_target;
-#line 263 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 375 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp2__target_destroy_notify = compare_func_target_destroy_notify;
-#line 263 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 375 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		compare_func_target_destroy_notify = NULL;
-#line 263 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 375 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp3_ = gee_tree_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, _tmp2_, _tmp2__target, _tmp2__target_destroy_notify);
-#line 263 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 375 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		result = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_SET, GeeSet);
-#line 263 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 375 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		(compare_func_target_destroy_notify == NULL) ? NULL : (compare_func_target_destroy_notify (compare_func_target), NULL);
-#line 263 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 375 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		compare_func = NULL;
-#line 263 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 375 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		compare_func_target = NULL;
-#line 263 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 375 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		compare_func_target_destroy_notify = NULL;
-#line 263 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 375 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		return result;
-#line 2167 "PhotoMetadata.c"
+#line 3087 "PhotoMetadata.c"
 	}
-#line 258 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 370 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	(compare_func_target_destroy_notify == NULL) ? NULL : (compare_func_target_destroy_notify (compare_func_target), NULL);
-#line 258 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 370 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	compare_func = NULL;
-#line 258 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 370 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	compare_func_target = NULL;
-#line 258 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 370 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	compare_func_target_destroy_notify = NULL;
-#line 2177 "PhotoMetadata.c"
+#line 3097 "PhotoMetadata.c"
 }
 
 
@@ -2193,203 +3113,196 @@ GeeCollection* photo_metadata_get_tags (PhotoMetadata* self, MetadataDomain doma
 	GeeSet* _tmp14_ = NULL;
 	gchar** _tmp15_ = NULL;
 	gint _tmp15__length1 = 0;
-#line 266 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 378 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL);
-#line 268 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 380 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	tags = NULL;
-#line 268 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 380 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	tags_length1 = 0;
-#line 268 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 380 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tags_size_ = tags_length1;
-#line 269 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 381 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0_ = domain;
-#line 269 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 381 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	switch (_tmp0_) {
-#line 269 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 381 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		case METADATA_DOMAIN_EXIF:
-#line 2211 "PhotoMetadata.c"
+#line 3131 "PhotoMetadata.c"
 		{
 			GExiv2Metadata* _tmp1_ = NULL;
 			gchar** _tmp2_ = NULL;
 			gchar** _tmp3_ = NULL;
-#line 271 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 383 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tmp1_ = self->priv->exiv2;
-#line 271 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 383 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tmp3_ = _tmp2_ = gexiv2_metadata_get_exif_tags (_tmp1_);
-#line 271 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 383 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			tags = (_vala_array_free (tags, tags_length1, (GDestroyNotify) g_free), NULL);
-#line 271 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 383 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			tags = _tmp3_;
-#line 271 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 383 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			tags_length1 = _vala_array_length (_tmp2_);
-#line 271 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 383 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tags_size_ = tags_length1;
-#line 272 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 384 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			break;
-#line 2230 "PhotoMetadata.c"
+#line 3150 "PhotoMetadata.c"
 		}
-#line 269 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 381 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		case METADATA_DOMAIN_XMP:
-#line 2234 "PhotoMetadata.c"
+#line 3154 "PhotoMetadata.c"
 		{
 			GExiv2Metadata* _tmp4_ = NULL;
 			gchar** _tmp5_ = NULL;
 			gchar** _tmp6_ = NULL;
-#line 275 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 387 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tmp4_ = self->priv->exiv2;
-#line 275 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 387 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tmp6_ = _tmp5_ = gexiv2_metadata_get_xmp_tags (_tmp4_);
-#line 275 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 387 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			tags = (_vala_array_free (tags, tags_length1, (GDestroyNotify) g_free), NULL);
-#line 275 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 387 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			tags = _tmp6_;
-#line 275 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 387 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			tags_length1 = _vala_array_length (_tmp5_);
-#line 275 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 387 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tags_size_ = tags_length1;
-#line 276 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 388 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			break;
-#line 2253 "PhotoMetadata.c"
+#line 3173 "PhotoMetadata.c"
 		}
-#line 269 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 381 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		case METADATA_DOMAIN_IPTC:
-#line 2257 "PhotoMetadata.c"
+#line 3177 "PhotoMetadata.c"
 		{
 			GExiv2Metadata* _tmp7_ = NULL;
 			gchar** _tmp8_ = NULL;
 			gchar** _tmp9_ = NULL;
-#line 279 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 391 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tmp7_ = self->priv->exiv2;
-#line 279 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 391 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tmp9_ = _tmp8_ = gexiv2_metadata_get_iptc_tags (_tmp7_);
-#line 279 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 391 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			tags = (_vala_array_free (tags, tags_length1, (GDestroyNotify) g_free), NULL);
-#line 279 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 391 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			tags = _tmp9_;
-#line 279 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 391 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			tags_length1 = _vala_array_length (_tmp8_);
-#line 279 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 391 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tags_size_ = tags_length1;
-#line 280 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 392 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			break;
-#line 2276 "PhotoMetadata.c"
+#line 3196 "PhotoMetadata.c"
 		}
 		default:
-#line 269 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 381 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		break;
-#line 2281 "PhotoMetadata.c"
+#line 3201 "PhotoMetadata.c"
 	}
-#line 283 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 395 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp11_ = tags;
-#line 283 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 395 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp11__length1 = tags_length1;
-#line 283 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 395 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp11_ == NULL) {
-#line 283 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 395 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp10_ = TRUE;
-#line 2291 "PhotoMetadata.c"
+#line 3211 "PhotoMetadata.c"
 	} else {
 		gchar** _tmp12_ = NULL;
 		gint _tmp12__length1 = 0;
-#line 283 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 395 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp12_ = tags;
-#line 283 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 395 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp12__length1 = tags_length1;
-#line 283 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 395 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp10_ = _tmp12__length1 == 0;
-#line 2301 "PhotoMetadata.c"
+#line 3221 "PhotoMetadata.c"
 	}
-#line 283 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 395 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp10_) {
-#line 284 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 396 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		result = NULL;
-#line 284 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 396 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		tags = (_vala_array_free (tags, tags_length1, (GDestroyNotify) g_free), NULL);
-#line 284 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 396 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		(compare_func_target_destroy_notify == NULL) ? NULL : (compare_func_target_destroy_notify (compare_func_target), NULL);
-#line 284 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 396 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		compare_func = NULL;
-#line 284 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 396 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		compare_func_target = NULL;
-#line 284 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 396 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		compare_func_target_destroy_notify = NULL;
-#line 284 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 396 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		return result;
-#line 2319 "PhotoMetadata.c"
+#line 3239 "PhotoMetadata.c"
 	}
-#line 286 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 398 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp13_ = compare_func;
-#line 286 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 398 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp13__target = compare_func_target;
-#line 286 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 398 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp13__target_destroy_notify = compare_func_target_destroy_notify;
-#line 286 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 398 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	compare_func_target_destroy_notify = NULL;
-#line 286 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 398 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp14_ = photo_metadata_create_string_set (self, _tmp13_, _tmp13__target, _tmp13__target_destroy_notify);
-#line 286 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 398 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	collection = G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 287 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 399 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp15_ = tags;
-#line 287 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 399 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp15__length1 = tags_length1;
-#line 2337 "PhotoMetadata.c"
+#line 3257 "PhotoMetadata.c"
 	{
 		gchar** tag_collection = NULL;
 		gint tag_collection_length1 = 0;
 		gint _tag_collection_size_ = 0;
 		gint tag_it = 0;
-#line 287 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 399 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		tag_collection = _tmp15_;
-#line 287 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 399 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		tag_collection_length1 = _tmp15__length1;
-#line 287 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 399 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		for (tag_it = 0; tag_it < _tmp15__length1; tag_it = tag_it + 1) {
-#line 2349 "PhotoMetadata.c"
+#line 3269 "PhotoMetadata.c"
 			gchar* _tmp16_ = NULL;
 			gchar* tag = NULL;
-#line 287 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 399 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tmp16_ = g_strdup (tag_collection[tag_it]);
-#line 287 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 399 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			tag = _tmp16_;
-#line 2356 "PhotoMetadata.c"
+#line 3276 "PhotoMetadata.c"
 			{
 				GeeCollection* _tmp17_ = NULL;
 				const gchar* _tmp18_ = NULL;
-#line 288 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 400 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp17_ = collection;
-#line 288 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 400 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp18_ = tag;
-#line 288 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 400 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				gee_collection_add (_tmp17_, _tmp18_);
-#line 287 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 399 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_g_free0 (tag);
-#line 2368 "PhotoMetadata.c"
+#line 3288 "PhotoMetadata.c"
 			}
 		}
 	}
-#line 290 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 402 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	result = collection;
-#line 290 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 402 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	tags = (_vala_array_free (tags, tags_length1, (GDestroyNotify) g_free), NULL);
-#line 290 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 402 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	(compare_func_target_destroy_notify == NULL) ? NULL : (compare_func_target_destroy_notify (compare_func_target), NULL);
-#line 290 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 402 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	compare_func = NULL;
-#line 290 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 402 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	compare_func_target = NULL;
-#line 290 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 402 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	compare_func_target_destroy_notify = NULL;
-#line 290 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 402 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 2386 "PhotoMetadata.c"
-}
-
-
-static gpointer _g_object_ref0 (gpointer self) {
-#line 309 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-	return self ? g_object_ref (self) : NULL;
-#line 2393 "PhotoMetadata.c"
+#line 3306 "PhotoMetadata.c"
 }
 
 
@@ -2417,180 +3330,180 @@ GeeCollection* photo_metadata_get_all_tags (PhotoMetadata* self, GCompareDataFun
 	gint _tmp28_ = 0;
 	gint _tmp29_ = 0;
 	GeeCollection* _tmp31_ = NULL;
-#line 293 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 405 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL);
-#line 295 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 407 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0_ = compare_func;
-#line 295 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 407 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0__target = compare_func_target;
-#line 295 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 407 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0__target_destroy_notify = compare_func_target_destroy_notify;
-#line 295 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 407 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	compare_func_target_destroy_notify = NULL;
-#line 295 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 407 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp1_ = photo_metadata_create_string_set (self, _tmp0_, _tmp0__target, _tmp0__target_destroy_notify);
-#line 295 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 407 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	all_tags = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 297 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 409 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp2_ = photo_metadata_get_tags (self, METADATA_DOMAIN_EXIF, NULL, NULL, NULL);
-#line 297 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 409 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	exif_tags = _tmp2_;
-#line 298 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 410 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp4_ = exif_tags;
-#line 298 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 410 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp4_ != NULL) {
-#line 2443 "PhotoMetadata.c"
+#line 3356 "PhotoMetadata.c"
 		GeeCollection* _tmp5_ = NULL;
 		gint _tmp6_ = 0;
 		gint _tmp7_ = 0;
-#line 298 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 410 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp5_ = exif_tags;
-#line 298 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 410 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp6_ = gee_collection_get_size (_tmp5_);
-#line 298 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 410 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp7_ = _tmp6_;
-#line 298 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 410 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp3_ = _tmp7_ > 0;
-#line 2455 "PhotoMetadata.c"
+#line 3368 "PhotoMetadata.c"
 	} else {
-#line 298 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 410 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp3_ = FALSE;
-#line 2459 "PhotoMetadata.c"
+#line 3372 "PhotoMetadata.c"
 	}
-#line 298 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 410 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp3_) {
-#line 2463 "PhotoMetadata.c"
+#line 3376 "PhotoMetadata.c"
 		GeeCollection* _tmp8_ = NULL;
 		GeeCollection* _tmp9_ = NULL;
-#line 299 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 411 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp8_ = all_tags;
-#line 299 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 411 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp9_ = exif_tags;
-#line 299 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 411 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		gee_collection_add_all (_tmp8_, _tmp9_);
-#line 2472 "PhotoMetadata.c"
+#line 3385 "PhotoMetadata.c"
 	}
-#line 301 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 413 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp10_ = photo_metadata_get_tags (self, METADATA_DOMAIN_XMP, NULL, NULL, NULL);
-#line 301 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 413 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	xmp_tags = _tmp10_;
-#line 302 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 414 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp12_ = xmp_tags;
-#line 302 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 414 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp12_ != NULL) {
-#line 2482 "PhotoMetadata.c"
+#line 3395 "PhotoMetadata.c"
 		GeeCollection* _tmp13_ = NULL;
 		gint _tmp14_ = 0;
 		gint _tmp15_ = 0;
-#line 302 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 414 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp13_ = xmp_tags;
-#line 302 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 414 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp14_ = gee_collection_get_size (_tmp13_);
-#line 302 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 414 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp15_ = _tmp14_;
-#line 302 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 414 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp11_ = _tmp15_ > 0;
-#line 2494 "PhotoMetadata.c"
+#line 3407 "PhotoMetadata.c"
 	} else {
-#line 302 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 414 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp11_ = FALSE;
-#line 2498 "PhotoMetadata.c"
+#line 3411 "PhotoMetadata.c"
 	}
-#line 302 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 414 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp11_) {
-#line 2502 "PhotoMetadata.c"
+#line 3415 "PhotoMetadata.c"
 		GeeCollection* _tmp16_ = NULL;
 		GeeCollection* _tmp17_ = NULL;
-#line 303 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 415 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp16_ = all_tags;
-#line 303 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 415 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp17_ = xmp_tags;
-#line 303 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 415 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		gee_collection_add_all (_tmp16_, _tmp17_);
-#line 2511 "PhotoMetadata.c"
+#line 3424 "PhotoMetadata.c"
 	}
-#line 305 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 417 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp18_ = photo_metadata_get_tags (self, METADATA_DOMAIN_IPTC, NULL, NULL, NULL);
-#line 305 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 417 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	iptc_tags = _tmp18_;
-#line 306 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 418 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp20_ = iptc_tags;
-#line 306 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 418 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp20_ != NULL) {
-#line 2521 "PhotoMetadata.c"
+#line 3434 "PhotoMetadata.c"
 		GeeCollection* _tmp21_ = NULL;
 		gint _tmp22_ = 0;
 		gint _tmp23_ = 0;
-#line 306 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 418 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp21_ = iptc_tags;
-#line 306 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 418 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp22_ = gee_collection_get_size (_tmp21_);
-#line 306 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 418 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp23_ = _tmp22_;
-#line 306 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 418 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp19_ = _tmp23_ > 0;
-#line 2533 "PhotoMetadata.c"
+#line 3446 "PhotoMetadata.c"
 	} else {
-#line 306 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 418 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp19_ = FALSE;
-#line 2537 "PhotoMetadata.c"
+#line 3450 "PhotoMetadata.c"
 	}
-#line 306 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 418 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp19_) {
-#line 2541 "PhotoMetadata.c"
+#line 3454 "PhotoMetadata.c"
 		GeeCollection* _tmp24_ = NULL;
 		GeeCollection* _tmp25_ = NULL;
-#line 307 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 419 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp24_ = all_tags;
-#line 307 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 419 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp25_ = iptc_tags;
-#line 307 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 419 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		gee_collection_add_all (_tmp24_, _tmp25_);
-#line 2550 "PhotoMetadata.c"
+#line 3463 "PhotoMetadata.c"
 	}
-#line 309 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 421 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp27_ = all_tags;
-#line 309 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 421 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp28_ = gee_collection_get_size (_tmp27_);
-#line 309 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 421 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp29_ = _tmp28_;
-#line 309 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 421 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp29_ > 0) {
-#line 2560 "PhotoMetadata.c"
+#line 3473 "PhotoMetadata.c"
 		GeeCollection* _tmp30_ = NULL;
-#line 309 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 421 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp30_ = all_tags;
-#line 309 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 421 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp26_ = _tmp30_;
-#line 2566 "PhotoMetadata.c"
+#line 3479 "PhotoMetadata.c"
 	} else {
-#line 309 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 421 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp26_ = NULL;
-#line 2570 "PhotoMetadata.c"
+#line 3483 "PhotoMetadata.c"
 	}
-#line 309 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 421 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp31_ = _g_object_ref0 (_tmp26_);
-#line 309 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 421 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	result = _tmp31_;
-#line 309 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 421 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_g_object_unref0 (iptc_tags);
-#line 309 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 421 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_g_object_unref0 (xmp_tags);
-#line 309 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 421 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_g_object_unref0 (exif_tags);
-#line 309 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 421 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_g_object_unref0 (all_tags);
-#line 309 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 421 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	(compare_func_target_destroy_notify == NULL) ? NULL : (compare_func_target_destroy_notify (compare_func_target), NULL);
-#line 309 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 421 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	compare_func = NULL;
-#line 309 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 421 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	compare_func_target = NULL;
-#line 309 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 421 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	compare_func_target_destroy_notify = NULL;
-#line 309 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 421 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 2594 "PhotoMetadata.c"
+#line 3507 "PhotoMetadata.c"
 }
 
 
@@ -2599,21 +3512,21 @@ gchar* photo_metadata_get_tag_label (PhotoMetadata* self, const gchar* tag) {
 	const gchar* _tmp0_ = NULL;
 	const gchar* _tmp1_ = NULL;
 	gchar* _tmp2_ = NULL;
-#line 312 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 424 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL);
-#line 312 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 424 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (tag != NULL, NULL);
-#line 313 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 425 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0_ = tag;
-#line 313 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 425 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp1_ = gexiv2_metadata_get_tag_label (_tmp0_);
-#line 313 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 425 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp2_ = g_strdup (_tmp1_);
-#line 313 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 425 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	result = _tmp2_;
-#line 313 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 425 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 2617 "PhotoMetadata.c"
+#line 3530 "PhotoMetadata.c"
 }
 
 
@@ -2622,21 +3535,21 @@ gchar* photo_metadata_get_tag_description (PhotoMetadata* self, const gchar* tag
 	const gchar* _tmp0_ = NULL;
 	const gchar* _tmp1_ = NULL;
 	gchar* _tmp2_ = NULL;
-#line 316 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 428 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL);
-#line 316 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 428 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (tag != NULL, NULL);
-#line 317 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 429 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0_ = tag;
-#line 317 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 429 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp1_ = gexiv2_metadata_get_tag_description (_tmp0_);
-#line 317 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 429 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp2_ = g_strdup (_tmp1_);
-#line 317 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 429 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	result = _tmp2_;
-#line 317 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 429 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 2640 "PhotoMetadata.c"
+#line 3553 "PhotoMetadata.c"
 }
 
 
@@ -2649,31 +3562,31 @@ gchar* photo_metadata_get_string (PhotoMetadata* self, const gchar* tag, Prepare
 	PrepareInputTextOptions _tmp4_ = 0;
 	gchar* _tmp5_ = NULL;
 	gchar* _tmp6_ = NULL;
-#line 320 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 432 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL);
-#line 320 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 432 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (tag != NULL, NULL);
-#line 321 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 433 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0_ = self->priv->exiv2;
-#line 321 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 433 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp1_ = tag;
-#line 321 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 433 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp2_ = gexiv2_metadata_get_tag_string (_tmp0_, _tmp1_);
-#line 321 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 433 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp3_ = _tmp2_;
-#line 321 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 433 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp4_ = options;
-#line 321 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 433 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp5_ = prepare_input_text (_tmp3_, _tmp4_, DEFAULT_USER_TEXT_INPUT_LENGTH);
-#line 321 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 433 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp6_ = _tmp5_;
-#line 321 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 433 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_g_free0 (_tmp3_);
-#line 321 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 433 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	result = _tmp6_;
-#line 321 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 433 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 2677 "PhotoMetadata.c"
+#line 3590 "PhotoMetadata.c"
 }
 
 
@@ -2686,31 +3599,31 @@ gchar* photo_metadata_get_string_interpreted (PhotoMetadata* self, const gchar*
 	PrepareInputTextOptions _tmp4_ = 0;
 	gchar* _tmp5_ = NULL;
 	gchar* _tmp6_ = NULL;
-#line 324 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 436 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL);
-#line 324 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 436 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (tag != NULL, NULL);
-#line 325 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 437 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0_ = self->priv->exiv2;
-#line 325 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 437 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp1_ = tag;
-#line 325 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 437 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp2_ = gexiv2_metadata_get_tag_interpreted_string (_tmp0_, _tmp1_);
-#line 325 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 437 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp3_ = _tmp2_;
-#line 325 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 437 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp4_ = options;
-#line 325 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 437 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp5_ = prepare_input_text (_tmp3_, _tmp4_, DEFAULT_USER_TEXT_INPUT_LENGTH);
-#line 325 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 437 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp6_ = _tmp5_;
-#line 325 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 437 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_g_free0 (_tmp3_);
-#line 325 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 437 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	result = _tmp6_;
-#line 325 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 437 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 2714 "PhotoMetadata.c"
+#line 3627 "PhotoMetadata.c"
 }
 
 
@@ -2718,68 +3631,68 @@ gchar* photo_metadata_get_first_string (PhotoMetadata* self, gchar** tags, int t
 	gchar* result = NULL;
 	gchar** _tmp0_ = NULL;
 	gint _tmp0__length1 = 0;
-#line 328 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 440 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL);
-#line 329 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 441 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0_ = tags;
-#line 329 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 441 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0__length1 = tags_length1;
-#line 2728 "PhotoMetadata.c"
+#line 3641 "PhotoMetadata.c"
 	{
 		gchar** tag_collection = NULL;
 		gint tag_collection_length1 = 0;
 		gint _tag_collection_size_ = 0;
 		gint tag_it = 0;
-#line 329 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 441 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		tag_collection = _tmp0_;
-#line 329 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 441 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		tag_collection_length1 = _tmp0__length1;
-#line 329 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 441 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		for (tag_it = 0; tag_it < _tmp0__length1; tag_it = tag_it + 1) {
-#line 2740 "PhotoMetadata.c"
+#line 3653 "PhotoMetadata.c"
 			gchar* _tmp1_ = NULL;
 			gchar* tag = NULL;
-#line 329 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 441 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tmp1_ = g_strdup (tag_collection[tag_it]);
-#line 329 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 441 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			tag = _tmp1_;
-#line 2747 "PhotoMetadata.c"
+#line 3660 "PhotoMetadata.c"
 			{
 				gchar* value = NULL;
 				const gchar* _tmp2_ = NULL;
 				gchar* _tmp3_ = NULL;
 				const gchar* _tmp4_ = NULL;
-#line 330 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 442 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp2_ = tag;
-#line 330 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 442 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp3_ = photo_metadata_get_string (self, _tmp2_, PHOTO_METADATA_PREPARE_STRING_OPTIONS);
-#line 330 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 442 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				value = _tmp3_;
-#line 331 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 443 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp4_ = value;
-#line 331 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 443 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				if (_tmp4_ != NULL) {
-#line 332 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 444 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					result = value;
-#line 332 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 444 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_g_free0 (tag);
-#line 332 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 444 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					return result;
-#line 2769 "PhotoMetadata.c"
+#line 3682 "PhotoMetadata.c"
 				}
-#line 329 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 441 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_g_free0 (value);
-#line 329 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 441 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_g_free0 (tag);
-#line 2775 "PhotoMetadata.c"
+#line 3688 "PhotoMetadata.c"
 			}
 		}
 	}
-#line 335 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 447 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	result = NULL;
-#line 335 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 447 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 2783 "PhotoMetadata.c"
+#line 3696 "PhotoMetadata.c"
 }
 
 
@@ -2787,68 +3700,68 @@ gchar* photo_metadata_get_first_string_interpreted (PhotoMetadata* self, gchar**
 	gchar* result = NULL;
 	gchar** _tmp0_ = NULL;
 	gint _tmp0__length1 = 0;
-#line 338 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 450 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL);
-#line 339 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 451 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0_ = tags;
-#line 339 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 451 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0__length1 = tags_length1;
-#line 2797 "PhotoMetadata.c"
+#line 3710 "PhotoMetadata.c"
 	{
 		gchar** tag_collection = NULL;
 		gint tag_collection_length1 = 0;
 		gint _tag_collection_size_ = 0;
 		gint tag_it = 0;
-#line 339 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 451 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		tag_collection = _tmp0_;
-#line 339 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 451 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		tag_collection_length1 = _tmp0__length1;
-#line 339 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 451 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		for (tag_it = 0; tag_it < _tmp0__length1; tag_it = tag_it + 1) {
-#line 2809 "PhotoMetadata.c"
+#line 3722 "PhotoMetadata.c"
 			gchar* _tmp1_ = NULL;
 			gchar* tag = NULL;
-#line 339 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 451 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tmp1_ = g_strdup (tag_collection[tag_it]);
-#line 339 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 451 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			tag = _tmp1_;
-#line 2816 "PhotoMetadata.c"
+#line 3729 "PhotoMetadata.c"
 			{
 				gchar* value = NULL;
 				const gchar* _tmp2_ = NULL;
 				gchar* _tmp3_ = NULL;
 				const gchar* _tmp4_ = NULL;
-#line 340 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 452 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp2_ = tag;
-#line 340 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 452 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp3_ = photo_metadata_get_string_interpreted (self, _tmp2_, PHOTO_METADATA_PREPARE_STRING_OPTIONS);
-#line 340 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 452 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				value = _tmp3_;
-#line 341 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 453 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp4_ = value;
-#line 341 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 453 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				if (_tmp4_ != NULL) {
-#line 342 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 454 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					result = value;
-#line 342 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 454 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_g_free0 (tag);
-#line 342 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 454 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					return result;
-#line 2838 "PhotoMetadata.c"
+#line 3751 "PhotoMetadata.c"
 				}
-#line 339 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 451 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_g_free0 (value);
-#line 339 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 451 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_g_free0 (tag);
-#line 2844 "PhotoMetadata.c"
+#line 3757 "PhotoMetadata.c"
 			}
 		}
 	}
-#line 345 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 457 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	result = NULL;
-#line 345 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 457 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 2852 "PhotoMetadata.c"
+#line 3765 "PhotoMetadata.c"
 }
 
 
@@ -2875,180 +3788,180 @@ GeeList* photo_metadata_get_string_multiple (PhotoMetadata* self, const gchar* t
 	gint _tmp24_ = 0;
 	gint _tmp25_ = 0;
 	GeeList* _tmp27_ = NULL;
-#line 354 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 466 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL);
-#line 354 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 466 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (tag != NULL, NULL);
-#line 355 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 467 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0_ = self->priv->exiv2;
-#line 355 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 467 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp1_ = tag;
-#line 355 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 467 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp3_ = _tmp2_ = gexiv2_metadata_get_tag_multiple (_tmp0_, _tmp1_);
-#line 355 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 467 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	values = _tmp3_;
-#line 355 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 467 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	values_length1 = _vala_array_length (_tmp2_);
-#line 355 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 467 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_values_size_ = values_length1;
-#line 356 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 468 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp5_ = values;
-#line 356 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 468 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp5__length1 = values_length1;
-#line 356 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 468 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp5_ == NULL) {
-#line 356 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 468 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp4_ = TRUE;
-#line 2903 "PhotoMetadata.c"
+#line 3816 "PhotoMetadata.c"
 	} else {
 		gchar** _tmp6_ = NULL;
 		gint _tmp6__length1 = 0;
-#line 356 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 468 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp6_ = values;
-#line 356 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 468 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp6__length1 = values_length1;
-#line 356 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 468 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp4_ = _tmp6__length1 == 0;
-#line 2913 "PhotoMetadata.c"
+#line 3826 "PhotoMetadata.c"
 	}
-#line 356 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 468 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp4_) {
-#line 357 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 469 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		result = NULL;
-#line 357 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 469 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		values = (_vala_array_free (values, values_length1, (GDestroyNotify) g_free), NULL);
-#line 357 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 469 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		return result;
-#line 2923 "PhotoMetadata.c"
+#line 3836 "PhotoMetadata.c"
 	}
-#line 359 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 471 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp7_ = gee_array_list_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, NULL, NULL, NULL);
-#line 359 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 471 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	list = G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_LIST, GeeList);
-#line 361 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 473 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp8_ = gee_hash_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, NULL, NULL, NULL, NULL, NULL, NULL);
-#line 361 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 473 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	collection = _tmp8_;
-#line 362 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 474 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp9_ = values;
-#line 362 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 474 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp9__length1 = values_length1;
-#line 2937 "PhotoMetadata.c"
+#line 3850 "PhotoMetadata.c"
 	{
 		gchar** value_collection = NULL;
 		gint value_collection_length1 = 0;
 		gint _value_collection_size_ = 0;
 		gint value_it = 0;
-#line 362 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 474 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		value_collection = _tmp9_;
-#line 362 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 474 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		value_collection_length1 = _tmp9__length1;
-#line 362 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 474 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		for (value_it = 0; value_it < _tmp9__length1; value_it = value_it + 1) {
-#line 2949 "PhotoMetadata.c"
+#line 3862 "PhotoMetadata.c"
 			gchar* _tmp10_ = NULL;
 			gchar* value = NULL;
-#line 362 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 474 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tmp10_ = g_strdup (value_collection[value_it]);
-#line 362 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 474 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			value = _tmp10_;
-#line 2956 "PhotoMetadata.c"
+#line 3869 "PhotoMetadata.c"
 			{
 				gchar* prepped = NULL;
 				const gchar* _tmp11_ = NULL;
 				gchar* _tmp12_ = NULL;
 				gboolean _tmp13_ = FALSE;
 				const gchar* _tmp14_ = NULL;
-#line 363 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 475 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp11_ = value;
-#line 363 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 475 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp12_ = prepare_input_text (_tmp11_, PHOTO_METADATA_PREPARE_STRING_OPTIONS, DEFAULT_USER_TEXT_INPUT_LENGTH);
-#line 363 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 475 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				prepped = _tmp12_;
-#line 366 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 478 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp14_ = prepped;
-#line 366 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 478 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				if (_tmp14_ != NULL) {
-#line 2973 "PhotoMetadata.c"
+#line 3886 "PhotoMetadata.c"
 					GeeHashSet* _tmp15_ = NULL;
 					const gchar* _tmp16_ = NULL;
 					gboolean _tmp17_ = FALSE;
-#line 366 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 478 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_tmp15_ = collection;
-#line 366 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 478 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_tmp16_ = prepped;
-#line 366 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 478 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_tmp17_ = gee_abstract_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp16_);
-#line 366 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 478 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_tmp13_ = !_tmp17_;
-#line 2985 "PhotoMetadata.c"
+#line 3898 "PhotoMetadata.c"
 				} else {
-#line 366 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 478 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_tmp13_ = FALSE;
-#line 2989 "PhotoMetadata.c"
+#line 3902 "PhotoMetadata.c"
 				}
-#line 366 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 478 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				if (_tmp13_) {
-#line 2993 "PhotoMetadata.c"
+#line 3906 "PhotoMetadata.c"
 					GeeList* _tmp18_ = NULL;
 					const gchar* _tmp19_ = NULL;
 					GeeHashSet* _tmp20_ = NULL;
 					const gchar* _tmp21_ = NULL;
-#line 367 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 479 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_tmp18_ = list;
-#line 367 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 479 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_tmp19_ = prepped;
-#line 367 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 479 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_COLLECTION, GeeCollection), _tmp19_);
-#line 368 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 480 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_tmp20_ = collection;
-#line 368 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 480 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_tmp21_ = prepped;
-#line 368 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 480 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp21_);
-#line 3010 "PhotoMetadata.c"
+#line 3923 "PhotoMetadata.c"
 				}
-#line 362 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 474 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_g_free0 (prepped);
-#line 362 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 474 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_g_free0 (value);
-#line 3016 "PhotoMetadata.c"
+#line 3929 "PhotoMetadata.c"
 			}
 		}
 	}
-#line 372 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 484 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp23_ = list;
-#line 372 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 484 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp24_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 372 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 484 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp25_ = _tmp24_;
-#line 372 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 484 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp25_ > 0) {
-#line 3028 "PhotoMetadata.c"
+#line 3941 "PhotoMetadata.c"
 		GeeList* _tmp26_ = NULL;
-#line 372 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 484 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp26_ = list;
-#line 372 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 484 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp22_ = _tmp26_;
-#line 3034 "PhotoMetadata.c"
+#line 3947 "PhotoMetadata.c"
 	} else {
-#line 372 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 484 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp22_ = NULL;
-#line 3038 "PhotoMetadata.c"
+#line 3951 "PhotoMetadata.c"
 	}
-#line 372 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 484 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp27_ = _g_object_ref0 (_tmp22_);
-#line 372 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 484 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	result = _tmp27_;
-#line 372 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 484 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_g_object_unref0 (collection);
-#line 372 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 484 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_g_object_unref0 (list);
-#line 372 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 484 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	values = (_vala_array_free (values, values_length1, (GDestroyNotify) g_free), NULL);
-#line 372 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 484 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 3052 "PhotoMetadata.c"
+#line 3965 "PhotoMetadata.c"
 }
 
 
@@ -3056,89 +3969,89 @@ GeeList* photo_metadata_get_first_string_multiple (PhotoMetadata* self, gchar**
 	GeeList* result = NULL;
 	gchar** _tmp0_ = NULL;
 	gint _tmp0__length1 = 0;
-#line 381 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 493 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL);
-#line 382 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 494 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0_ = tags;
-#line 382 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 494 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0__length1 = tags_length1;
-#line 3066 "PhotoMetadata.c"
+#line 3979 "PhotoMetadata.c"
 	{
 		gchar** tag_collection = NULL;
 		gint tag_collection_length1 = 0;
 		gint _tag_collection_size_ = 0;
 		gint tag_it = 0;
-#line 382 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 494 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		tag_collection = _tmp0_;
-#line 382 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 494 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		tag_collection_length1 = _tmp0__length1;
-#line 382 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 494 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		for (tag_it = 0; tag_it < _tmp0__length1; tag_it = tag_it + 1) {
-#line 3078 "PhotoMetadata.c"
+#line 3991 "PhotoMetadata.c"
 			gchar* _tmp1_ = NULL;
 			gchar* tag = NULL;
-#line 382 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 494 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tmp1_ = g_strdup (tag_collection[tag_it]);
-#line 382 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 494 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			tag = _tmp1_;
-#line 3085 "PhotoMetadata.c"
+#line 3998 "PhotoMetadata.c"
 			{
 				GeeList* values = NULL;
 				const gchar* _tmp2_ = NULL;
 				GeeList* _tmp3_ = NULL;
 				gboolean _tmp4_ = FALSE;
 				GeeList* _tmp5_ = NULL;
-#line 383 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 495 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp2_ = tag;
-#line 383 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 495 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp3_ = photo_metadata_get_string_multiple (self, _tmp2_);
-#line 383 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 495 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				values = _tmp3_;
-#line 384 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 496 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp5_ = values;
-#line 384 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 496 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				if (_tmp5_ != NULL) {
-#line 3102 "PhotoMetadata.c"
+#line 4015 "PhotoMetadata.c"
 					GeeList* _tmp6_ = NULL;
 					gint _tmp7_ = 0;
 					gint _tmp8_ = 0;
-#line 384 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 496 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_tmp6_ = values;
-#line 384 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 496 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_tmp7_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 384 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 496 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_tmp8_ = _tmp7_;
-#line 384 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 496 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_tmp4_ = _tmp8_ > 0;
-#line 3114 "PhotoMetadata.c"
+#line 4027 "PhotoMetadata.c"
 				} else {
-#line 384 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 496 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_tmp4_ = FALSE;
-#line 3118 "PhotoMetadata.c"
+#line 4031 "PhotoMetadata.c"
 				}
-#line 384 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 496 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				if (_tmp4_) {
-#line 385 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 497 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					result = values;
-#line 385 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 497 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_g_free0 (tag);
-#line 385 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 497 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					return result;
-#line 3128 "PhotoMetadata.c"
+#line 4041 "PhotoMetadata.c"
 				}
-#line 382 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 494 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_g_object_unref0 (values);
-#line 382 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 494 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_g_free0 (tag);
-#line 3134 "PhotoMetadata.c"
+#line 4047 "PhotoMetadata.c"
 			}
 		}
 	}
-#line 388 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 500 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	result = NULL;
-#line 388 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 500 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 3142 "PhotoMetadata.c"
+#line 4055 "PhotoMetadata.c"
 }
 
 
@@ -3152,67 +4065,67 @@ void photo_metadata_set_string (PhotoMetadata* self, const gchar* tag, const gch
 	const gchar* _tmp7_ = NULL;
 	const gchar* _tmp8_ = NULL;
 	gboolean _tmp9_ = FALSE;
-#line 391 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 503 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_if_fail (IS_PHOTO_METADATA (self));
-#line 391 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 503 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_if_fail (tag != NULL);
-#line 391 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 503 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_if_fail (value != NULL);
-#line 392 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 504 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0_ = value;
-#line 392 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 504 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp1_ = options;
-#line 392 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 504 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp2_ = prepare_input_text (_tmp0_, _tmp1_, DEFAULT_USER_TEXT_INPUT_LENGTH);
-#line 392 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 504 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	prepped = _tmp2_;
-#line 393 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 505 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp3_ = prepped;
-#line 393 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 505 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp3_ == NULL) {
-#line 3174 "PhotoMetadata.c"
+#line 4087 "PhotoMetadata.c"
 		const gchar* _tmp4_ = NULL;
 		const gchar* _tmp5_ = NULL;
-#line 394 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 506 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp4_ = tag;
-#line 394 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 506 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp5_ = value;
-#line 394 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-		g_warning ("PhotoMetadata.vala:394: Not setting tag %s to string %s: invalid UTF-8", _tmp4_, _tmp5_);
-#line 396 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 506 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+		g_warning ("PhotoMetadata.vala:506: Not setting tag %s to string %s: invalid UTF-8", _tmp4_, _tmp5_);
+#line 508 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_g_free0 (prepped);
-#line 396 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 508 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		return;
-#line 3187 "PhotoMetadata.c"
+#line 4100 "PhotoMetadata.c"
 	}
-#line 399 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 511 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp6_ = self->priv->exiv2;
-#line 399 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 511 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp7_ = tag;
-#line 399 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 511 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp8_ = prepped;
-#line 399 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 511 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp9_ = gexiv2_metadata_set_tag_string (_tmp6_, _tmp7_, _tmp8_);
-#line 399 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 511 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (!_tmp9_) {
-#line 3199 "PhotoMetadata.c"
+#line 4112 "PhotoMetadata.c"
 		const gchar* _tmp10_ = NULL;
 		const gchar* _tmp11_ = NULL;
 		const gchar* _tmp12_ = NULL;
-#line 400 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 512 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp10_ = tag;
-#line 400 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 512 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp11_ = value;
-#line 400 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 512 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp12_ = self->priv->source_name;
-#line 400 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-		g_warning ("PhotoMetadata.vala:400: Unable to set tag %s to string %s from source " \
+#line 512 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+		g_warning ("PhotoMetadata.vala:512: Unable to set tag %s to string %s from source " \
 "%s", _tmp10_, _tmp11_, _tmp12_);
-#line 3211 "PhotoMetadata.c"
+#line 4124 "PhotoMetadata.c"
 	}
-#line 391 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 503 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_g_free0 (prepped);
-#line 3215 "PhotoMetadata.c"
+#line 4128 "PhotoMetadata.c"
 }
 
 
@@ -3223,118 +4136,118 @@ static void photo_metadata_set_all_generic (PhotoMetadata* self, gchar** tags, i
 	gboolean _tmp9_ = FALSE;
 	gboolean _tmp10_ = FALSE;
 	PhotoMetadataSetOption _tmp11_ = 0;
-#line 405 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 517 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_if_fail (IS_PHOTO_METADATA (self));
-#line 406 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 518 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	written = FALSE;
-#line 407 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 519 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0_ = tags;
-#line 407 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 519 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0__length1 = tags_length1;
-#line 3234 "PhotoMetadata.c"
+#line 4147 "PhotoMetadata.c"
 	{
 		gchar** tag_collection = NULL;
 		gint tag_collection_length1 = 0;
 		gint _tag_collection_size_ = 0;
 		gint tag_it = 0;
-#line 407 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 519 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		tag_collection = _tmp0_;
-#line 407 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 519 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		tag_collection_length1 = _tmp0__length1;
-#line 407 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 519 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		for (tag_it = 0; tag_it < _tmp0__length1; tag_it = tag_it + 1) {
-#line 3246 "PhotoMetadata.c"
+#line 4159 "PhotoMetadata.c"
 			gchar* _tmp1_ = NULL;
 			gchar* tag = NULL;
-#line 407 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 519 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tmp1_ = g_strdup (tag_collection[tag_it]);
-#line 407 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 519 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			tag = _tmp1_;
-#line 3253 "PhotoMetadata.c"
+#line 4166 "PhotoMetadata.c"
 			{
 				gboolean _tmp2_ = FALSE;
 				PhotoMetadataSetOption _tmp3_ = 0;
-#line 408 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 520 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp3_ = option;
-#line 408 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 520 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				if (_tmp3_ == PHOTO_METADATA_SET_OPTION_ALL_DOMAINS) {
-#line 408 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 520 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_tmp2_ = TRUE;
-#line 3263 "PhotoMetadata.c"
+#line 4176 "PhotoMetadata.c"
 				} else {
 					const gchar* _tmp4_ = NULL;
 					MetadataDomain _tmp5_ = 0;
 					gboolean _tmp6_ = FALSE;
-#line 408 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 520 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_tmp4_ = tag;
-#line 408 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 520 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_tmp5_ = photo_metadata_get_tag_domain (_tmp4_);
-#line 408 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 520 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_tmp6_ = photo_metadata_has_domain (self, _tmp5_);
-#line 408 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 520 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_tmp2_ = _tmp6_;
-#line 3276 "PhotoMetadata.c"
+#line 4189 "PhotoMetadata.c"
 				}
-#line 408 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 520 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				if (_tmp2_) {
-#line 3280 "PhotoMetadata.c"
+#line 4193 "PhotoMetadata.c"
 					PhotoMetadataSetGenericValue _tmp7_ = NULL;
 					void* _tmp7__target = NULL;
 					const gchar* _tmp8_ = NULL;
-#line 409 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 521 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_tmp7_ = setter;
-#line 409 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 521 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_tmp7__target = setter_target;
-#line 409 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 521 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_tmp8_ = tag;
-#line 409 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 521 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_tmp7_ (_tmp8_, _tmp7__target);
-#line 410 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 522 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					written = TRUE;
-#line 3294 "PhotoMetadata.c"
+#line 4207 "PhotoMetadata.c"
 				}
-#line 407 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 519 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_g_free0 (tag);
-#line 3298 "PhotoMetadata.c"
+#line 4211 "PhotoMetadata.c"
 			}
 		}
 	}
-#line 414 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 526 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp11_ = option;
-#line 414 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 526 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp11_ == PHOTO_METADATA_SET_OPTION_AT_LEAST_DEFAULT_DOMAIN) {
-#line 3306 "PhotoMetadata.c"
+#line 4219 "PhotoMetadata.c"
 		gboolean _tmp12_ = FALSE;
-#line 414 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 526 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp12_ = written;
-#line 414 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 526 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp10_ = !_tmp12_;
-#line 3312 "PhotoMetadata.c"
+#line 4225 "PhotoMetadata.c"
 	} else {
-#line 414 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 526 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp10_ = FALSE;
-#line 3316 "PhotoMetadata.c"
+#line 4229 "PhotoMetadata.c"
 	}
-#line 414 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 526 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp10_) {
-#line 3320 "PhotoMetadata.c"
+#line 4233 "PhotoMetadata.c"
 		gchar** _tmp13_ = NULL;
 		gint _tmp13__length1 = 0;
-#line 414 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 526 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp13_ = tags;
-#line 414 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 526 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp13__length1 = tags_length1;
-#line 414 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 526 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp9_ = _tmp13__length1 > 0;
-#line 3329 "PhotoMetadata.c"
+#line 4242 "PhotoMetadata.c"
 	} else {
-#line 414 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 526 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp9_ = FALSE;
-#line 3333 "PhotoMetadata.c"
+#line 4246 "PhotoMetadata.c"
 	}
-#line 414 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 526 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp9_) {
-#line 3337 "PhotoMetadata.c"
+#line 4250 "PhotoMetadata.c"
 		MetadataDomain default_domain = 0;
 		gchar** _tmp14_ = NULL;
 		gint _tmp14__length1 = 0;
@@ -3345,41 +4258,41 @@ static void photo_metadata_set_all_generic (PhotoMetadata* self, gchar** tags, i
 		gchar** _tmp18_ = NULL;
 		gint _tmp18__length1 = 0;
 		const gchar* _tmp19_ = NULL;
-#line 415 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 527 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp14_ = tags;
-#line 415 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 527 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp14__length1 = tags_length1;
-#line 415 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 527 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp15_ = _tmp14_[0];
-#line 415 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 527 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp16_ = photo_metadata_get_tag_domain (_tmp15_);
-#line 415 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 527 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		default_domain = _tmp16_;
-#line 418 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 530 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp17_ = setter;
-#line 418 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 530 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp17__target = setter_target;
-#line 418 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 530 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp18_ = tags;
-#line 418 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 530 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp18__length1 = tags_length1;
-#line 418 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 530 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp19_ = _tmp18_[0];
-#line 418 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 530 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp17_ (_tmp19_, _tmp17__target);
-#line 3370 "PhotoMetadata.c"
+#line 4283 "PhotoMetadata.c"
 		{
 			gint ctr = 0;
-#line 421 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 533 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			ctr = 1;
-#line 3375 "PhotoMetadata.c"
+#line 4288 "PhotoMetadata.c"
 			{
 				gboolean _tmp20_ = FALSE;
-#line 421 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 533 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp20_ = TRUE;
-#line 421 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 533 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				while (TRUE) {
-#line 3382 "PhotoMetadata.c"
+#line 4295 "PhotoMetadata.c"
 					gint _tmp22_ = 0;
 					gchar** _tmp23_ = NULL;
 					gint _tmp23__length1 = 0;
@@ -3389,66 +4302,66 @@ static void photo_metadata_set_all_generic (PhotoMetadata* self, gchar** tags, i
 					const gchar* _tmp26_ = NULL;
 					MetadataDomain _tmp27_ = 0;
 					MetadataDomain _tmp28_ = 0;
-#line 421 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 533 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					if (!_tmp20_) {
-#line 3394 "PhotoMetadata.c"
+#line 4307 "PhotoMetadata.c"
 						gint _tmp21_ = 0;
-#line 421 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 533 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 						_tmp21_ = ctr;
-#line 421 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 533 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 						ctr = _tmp21_ + 1;
-#line 3400 "PhotoMetadata.c"
+#line 4313 "PhotoMetadata.c"
 					}
-#line 421 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 533 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_tmp20_ = FALSE;
-#line 421 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 533 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_tmp22_ = ctr;
-#line 421 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 533 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_tmp23_ = tags;
-#line 421 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 533 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_tmp23__length1 = tags_length1;
-#line 421 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 533 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					if (!(_tmp22_ < _tmp23__length1)) {
-#line 421 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 533 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 						break;
-#line 3414 "PhotoMetadata.c"
+#line 4327 "PhotoMetadata.c"
 					}
-#line 422 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 534 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_tmp24_ = tags;
-#line 422 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 534 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_tmp24__length1 = tags_length1;
-#line 422 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 534 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_tmp25_ = ctr;
-#line 422 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 534 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_tmp26_ = _tmp24_[_tmp25_];
-#line 422 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 534 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_tmp27_ = photo_metadata_get_tag_domain (_tmp26_);
-#line 422 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 534 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_tmp28_ = default_domain;
-#line 422 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 534 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					if (_tmp27_ == _tmp28_) {
-#line 3430 "PhotoMetadata.c"
+#line 4343 "PhotoMetadata.c"
 						PhotoMetadataSetGenericValue _tmp29_ = NULL;
 						void* _tmp29__target = NULL;
 						gchar** _tmp30_ = NULL;
 						gint _tmp30__length1 = 0;
 						gint _tmp31_ = 0;
 						const gchar* _tmp32_ = NULL;
-#line 423 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 535 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 						_tmp29_ = setter;
-#line 423 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 535 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 						_tmp29__target = setter_target;
-#line 423 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 535 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 						_tmp30_ = tags;
-#line 423 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 535 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 						_tmp30__length1 = tags_length1;
-#line 423 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 535 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 						_tmp31_ = ctr;
-#line 423 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 535 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 						_tmp32_ = _tmp30_[_tmp31_];
-#line 423 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 535 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 						_tmp29_ (_tmp32_, _tmp29__target);
-#line 3451 "PhotoMetadata.c"
+#line 4364 "PhotoMetadata.c"
 					}
 				}
 			}
@@ -3458,30 +4371,30 @@ static void photo_metadata_set_all_generic (PhotoMetadata* self, gchar** tags, i
 
 
 static Block1Data* block1_data_ref (Block1Data* _data1_) {
-#line 428 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 540 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_atomic_int_inc (&_data1_->_ref_count_);
-#line 428 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 540 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return _data1_;
-#line 3465 "PhotoMetadata.c"
+#line 4378 "PhotoMetadata.c"
 }
 
 
 static void block1_data_unref (void * _userdata_) {
 	Block1Data* _data1_;
 	_data1_ = (Block1Data*) _userdata_;
-#line 428 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 540 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (g_atomic_int_dec_and_test (&_data1_->_ref_count_)) {
-#line 3474 "PhotoMetadata.c"
+#line 4387 "PhotoMetadata.c"
 		PhotoMetadata* self;
-#line 428 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 540 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		self = _data1_->self;
-#line 428 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 540 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_g_free0 (_data1_->value);
-#line 428 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 540 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_media_metadata_unref0 (self);
-#line 428 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 540 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		g_slice_free (Block1Data, _data1_);
-#line 3484 "PhotoMetadata.c"
+#line 4397 "PhotoMetadata.c"
 	}
 }
 
@@ -3490,24 +4403,24 @@ static void __lambda5_ (Block1Data* _data1_, const gchar* tag) {
 	PhotoMetadata* self;
 	const gchar* _tmp0_ = NULL;
 	const gchar* _tmp1_ = NULL;
-#line 429 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 541 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	self = _data1_->self;
-#line 429 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 541 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_if_fail (tag != NULL);
-#line 429 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 541 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0_ = tag;
-#line 429 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 541 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp1_ = _data1_->value;
-#line 429 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 541 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	photo_metadata_set_string (self, _tmp0_, _tmp1_, PHOTO_METADATA_PREPARE_STRING_OPTIONS);
-#line 3503 "PhotoMetadata.c"
+#line 4416 "PhotoMetadata.c"
 }
 
 
 static void ___lambda5__photo_metadata_set_generic_value (const gchar* tag, gpointer self) {
-#line 429 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 541 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	__lambda5_ (self, tag);
-#line 3510 "PhotoMetadata.c"
+#line 4423 "PhotoMetadata.c"
 }
 
 
@@ -3518,71 +4431,71 @@ void photo_metadata_set_all_string (PhotoMetadata* self, gchar** tags, int tags_
 	gchar** _tmp2_ = NULL;
 	gint _tmp2__length1 = 0;
 	PhotoMetadataSetOption _tmp3_ = 0;
-#line 428 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 540 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_if_fail (IS_PHOTO_METADATA (self));
-#line 428 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 540 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_if_fail (value != NULL);
-#line 428 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 540 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_data1_ = g_slice_new0 (Block1Data);
-#line 428 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 540 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_data1_->_ref_count_ = 1;
-#line 428 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 540 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_data1_->self = media_metadata_ref (self);
-#line 428 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 540 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0_ = value;
-#line 428 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 540 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 428 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 540 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_g_free0 (_data1_->value);
-#line 428 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 540 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_data1_->value = _tmp1_;
-#line 429 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 541 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp2_ = tags;
-#line 429 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 541 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp2__length1 = tags_length1;
-#line 429 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 541 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp3_ = option;
-#line 429 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 541 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	photo_metadata_set_all_generic (self, _tmp2_, _tmp2__length1, _tmp3_, ___lambda5__photo_metadata_set_generic_value, _data1_);
-#line 428 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 540 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	block1_data_unref (_data1_);
-#line 428 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 540 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_data1_ = NULL;
-#line 3551 "PhotoMetadata.c"
+#line 4464 "PhotoMetadata.c"
 }
 
 
 static void _vala_array_add45 (gchar*** array, int* length, int* size, gchar* value) {
-#line 437 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 549 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if ((*length) == (*size)) {
-#line 437 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 549 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 437 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 549 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		*array = g_renew (gchar*, *array, (*size) + 1);
-#line 3562 "PhotoMetadata.c"
+#line 4475 "PhotoMetadata.c"
 	}
-#line 437 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 549 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	(*array)[(*length)++] = value;
-#line 437 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 549 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	(*array)[*length] = NULL;
-#line 3568 "PhotoMetadata.c"
+#line 4481 "PhotoMetadata.c"
 }
 
 
 static void _vala_array_add46 (gchar*** array, int* length, int* size, gchar* value) {
-#line 449 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 561 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if ((*length) == (*size)) {
-#line 449 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 561 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 449 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 561 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		*array = g_renew (gchar*, *array, (*size) + 1);
-#line 3579 "PhotoMetadata.c"
+#line 4492 "PhotoMetadata.c"
 	}
-#line 449 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 561 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	(*array)[(*length)++] = value;
-#line 449 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 561 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	(*array)[*length] = NULL;
-#line 3585 "PhotoMetadata.c"
+#line 4498 "PhotoMetadata.c"
 }
 
 
@@ -3600,34 +4513,34 @@ void photo_metadata_set_string_multiple (PhotoMetadata* self, const gchar* tag,
 	gchar** _tmp19_ = NULL;
 	gint _tmp19__length1 = 0;
 	gboolean _tmp20_ = FALSE;
-#line 432 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 544 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_if_fail (IS_PHOTO_METADATA (self));
-#line 432 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 544 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_if_fail (tag != NULL);
-#line 432 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 544 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_if_fail (GEE_IS_COLLECTION (collection));
-#line 433 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 545 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0_ = g_new0 (gchar*, 0 + 1);
-#line 433 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 545 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	values = _tmp0_;
-#line 433 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 545 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	values_length1 = 0;
-#line 433 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 545 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_values_size_ = values_length1;
-#line 3617 "PhotoMetadata.c"
+#line 4530 "PhotoMetadata.c"
 	{
 		GeeIterator* _value_it = NULL;
 		GeeCollection* _tmp1_ = NULL;
 		GeeIterator* _tmp2_ = NULL;
-#line 434 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 546 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp1_ = collection;
-#line 434 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 546 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp2_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 434 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 546 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_value_it = _tmp2_;
-#line 434 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 546 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		while (TRUE) {
-#line 3630 "PhotoMetadata.c"
+#line 4543 "PhotoMetadata.c"
 			GeeIterator* _tmp3_ = NULL;
 			gboolean _tmp4_ = FALSE;
 			gchar* value = NULL;
@@ -3637,148 +4550,148 @@ void photo_metadata_set_string_multiple (PhotoMetadata* self, const gchar* tag,
 			const gchar* _tmp7_ = NULL;
 			gchar* _tmp8_ = NULL;
 			const gchar* _tmp9_ = NULL;
-#line 434 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 546 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tmp3_ = _value_it;
-#line 434 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 546 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tmp4_ = gee_iterator_next (_tmp3_);
-#line 434 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 546 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			if (!_tmp4_) {
-#line 434 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 546 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				break;
-#line 3648 "PhotoMetadata.c"
+#line 4561 "PhotoMetadata.c"
 			}
-#line 434 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 546 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tmp5_ = _value_it;
-#line 434 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 546 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tmp6_ = gee_iterator_get (_tmp5_);
-#line 434 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 546 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			value = (gchar*) _tmp6_;
-#line 435 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 547 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tmp7_ = value;
-#line 435 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 547 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tmp8_ = prepare_input_text (_tmp7_, PHOTO_METADATA_PREPARE_STRING_OPTIONS, -1);
-#line 435 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 547 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			prepped = _tmp8_;
-#line 436 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 548 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tmp9_ = prepped;
-#line 436 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 548 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			if (_tmp9_ != NULL) {
-#line 3666 "PhotoMetadata.c"
+#line 4579 "PhotoMetadata.c"
 				gchar** _tmp10_ = NULL;
 				gint _tmp10__length1 = 0;
 				const gchar* _tmp11_ = NULL;
 				gchar* _tmp12_ = NULL;
-#line 437 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 549 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp10_ = values;
-#line 437 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 549 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp10__length1 = values_length1;
-#line 437 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 549 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp11_ = prepped;
-#line 437 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 549 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp12_ = g_strdup (_tmp11_);
-#line 437 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 549 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_vala_array_add45 (&values, &values_length1, &_values_size_, _tmp12_);
-#line 3681 "PhotoMetadata.c"
+#line 4594 "PhotoMetadata.c"
 			} else {
 				const gchar* _tmp13_ = NULL;
 				const gchar* _tmp14_ = NULL;
-#line 439 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 551 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp13_ = value;
-#line 439 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 551 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp14_ = tag;
-#line 439 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-				g_warning ("PhotoMetadata.vala:439: Unable to set string %s to %s: invalid UTF-8", _tmp13_, _tmp14_);
-#line 3691 "PhotoMetadata.c"
+#line 551 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+				g_warning ("PhotoMetadata.vala:551: Unable to set string %s to %s: invalid UTF-8", _tmp13_, _tmp14_);
+#line 4604 "PhotoMetadata.c"
 			}
-#line 434 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 546 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_g_free0 (prepped);
-#line 434 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 546 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_g_free0 (value);
-#line 3697 "PhotoMetadata.c"
+#line 4610 "PhotoMetadata.c"
 		}
-#line 434 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 546 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_g_object_unref0 (_value_it);
-#line 3701 "PhotoMetadata.c"
+#line 4614 "PhotoMetadata.c"
 	}
-#line 442 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 554 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp15_ = values;
-#line 442 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 554 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp15__length1 = values_length1;
-#line 442 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 554 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp15__length1 == 0) {
-#line 443 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 555 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		values = (_vala_array_free (values, values_length1, (GDestroyNotify) g_free), NULL);
-#line 443 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 555 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		return;
-#line 3713 "PhotoMetadata.c"
+#line 4626 "PhotoMetadata.c"
 	}
-#line 449 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 561 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp16_ = values;
-#line 449 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 561 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp16__length1 = values_length1;
-#line 449 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 561 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_vala_array_add46 (&values, &values_length1, &_values_size_, NULL);
-#line 451 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 563 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp17_ = self->priv->exiv2;
-#line 451 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 563 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp18_ = tag;
-#line 451 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 563 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp19_ = values;
-#line 451 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 563 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp19__length1 = values_length1;
-#line 451 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 563 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp20_ = gexiv2_metadata_set_tag_multiple (_tmp17_, _tmp18_, _tmp19_);
-#line 451 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 563 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (!_tmp20_) {
-#line 3733 "PhotoMetadata.c"
+#line 4646 "PhotoMetadata.c"
 		gchar** _tmp21_ = NULL;
 		gint _tmp21__length1 = 0;
 		const gchar* _tmp22_ = NULL;
 		const gchar* _tmp23_ = NULL;
-#line 452 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 564 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp21_ = values;
-#line 452 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 564 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp21__length1 = values_length1;
-#line 452 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 564 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp22_ = tag;
-#line 452 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 564 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp23_ = self->priv->source_name;
-#line 452 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-		g_warning ("PhotoMetadata.vala:452: Unable to set %d strings to tag %s from source" \
+#line 564 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+		g_warning ("PhotoMetadata.vala:564: Unable to set %d strings to tag %s from source" \
 " %s", _tmp21__length1, _tmp22_, _tmp23_);
-#line 3748 "PhotoMetadata.c"
+#line 4661 "PhotoMetadata.c"
 	}
-#line 432 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 544 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	values = (_vala_array_free (values, values_length1, (GDestroyNotify) g_free), NULL);
-#line 3752 "PhotoMetadata.c"
+#line 4665 "PhotoMetadata.c"
 }
 
 
 static Block2Data* block2_data_ref (Block2Data* _data2_) {
-#line 455 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 567 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_atomic_int_inc (&_data2_->_ref_count_);
-#line 455 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 567 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return _data2_;
-#line 3761 "PhotoMetadata.c"
+#line 4674 "PhotoMetadata.c"
 }
 
 
 static void block2_data_unref (void * _userdata_) {
 	Block2Data* _data2_;
 	_data2_ = (Block2Data*) _userdata_;
-#line 455 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 567 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (g_atomic_int_dec_and_test (&_data2_->_ref_count_)) {
-#line 3770 "PhotoMetadata.c"
+#line 4683 "PhotoMetadata.c"
 		PhotoMetadata* self;
-#line 455 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 567 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		self = _data2_->self;
-#line 455 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 567 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_g_object_unref0 (_data2_->values);
-#line 455 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 567 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_media_metadata_unref0 (self);
-#line 455 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 567 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		g_slice_free (Block2Data, _data2_);
-#line 3780 "PhotoMetadata.c"
+#line 4693 "PhotoMetadata.c"
 	}
 }
 
@@ -3787,24 +4700,24 @@ static void __lambda6_ (Block2Data* _data2_, const gchar* tag) {
 	PhotoMetadata* self;
 	const gchar* _tmp0_ = NULL;
 	GeeCollection* _tmp1_ = NULL;
-#line 456 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 568 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	self = _data2_->self;
-#line 456 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 568 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_if_fail (tag != NULL);
-#line 456 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 568 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0_ = tag;
-#line 456 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 568 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp1_ = _data2_->values;
-#line 456 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 568 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	photo_metadata_set_string_multiple (self, _tmp0_, _tmp1_);
-#line 3799 "PhotoMetadata.c"
+#line 4712 "PhotoMetadata.c"
 }
 
 
 static void ___lambda6__photo_metadata_set_generic_value (const gchar* tag, gpointer self) {
-#line 456 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 568 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	__lambda6_ (self, tag);
-#line 3806 "PhotoMetadata.c"
+#line 4719 "PhotoMetadata.c"
 }
 
 
@@ -3815,37 +4728,37 @@ void photo_metadata_set_all_string_multiple (PhotoMetadata* self, gchar** tags,
 	gchar** _tmp2_ = NULL;
 	gint _tmp2__length1 = 0;
 	PhotoMetadataSetOption _tmp3_ = 0;
-#line 455 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 567 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_if_fail (IS_PHOTO_METADATA (self));
-#line 455 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 567 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_if_fail (GEE_IS_COLLECTION (values));
-#line 455 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 567 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_data2_ = g_slice_new0 (Block2Data);
-#line 455 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 567 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_data2_->_ref_count_ = 1;
-#line 455 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 567 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_data2_->self = media_metadata_ref (self);
-#line 455 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 567 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0_ = values;
-#line 455 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 567 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 455 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 567 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_g_object_unref0 (_data2_->values);
-#line 455 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 567 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_data2_->values = _tmp1_;
-#line 456 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 568 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp2_ = tags;
-#line 456 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 568 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp2__length1 = tags_length1;
-#line 456 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 568 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp3_ = option;
-#line 456 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 568 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	photo_metadata_set_all_generic (self, _tmp2_, _tmp2__length1, _tmp3_, ___lambda6__photo_metadata_set_generic_value, _data2_);
-#line 455 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 567 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	block2_data_unref (_data2_);
-#line 455 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 567 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_data2_ = NULL;
-#line 3847 "PhotoMetadata.c"
+#line 4760 "PhotoMetadata.c"
 }
 
 
@@ -3857,49 +4770,49 @@ gboolean photo_metadata_get_long (PhotoMetadata* self, const gchar* tag, glong*
 	GExiv2Metadata* _tmp2_ = NULL;
 	const gchar* _tmp3_ = NULL;
 	glong _tmp4_ = 0L;
-#line 459 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 571 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (IS_PHOTO_METADATA (self), FALSE);
-#line 459 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 571 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (tag != NULL, FALSE);
-#line 460 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 572 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0_ = tag;
-#line 460 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 572 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp1_ = photo_metadata_has_tag (self, _tmp0_);
-#line 460 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 572 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (!_tmp1_) {
-#line 461 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 573 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_vala_value = (glong) 0;
-#line 463 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 575 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		result = FALSE;
-#line 463 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 575 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		if (value) {
-#line 463 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 575 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			*value = _vala_value;
-#line 3877 "PhotoMetadata.c"
+#line 4790 "PhotoMetadata.c"
 		}
-#line 463 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 575 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		return result;
-#line 3881 "PhotoMetadata.c"
+#line 4794 "PhotoMetadata.c"
 	}
-#line 466 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 578 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp2_ = self->priv->exiv2;
-#line 466 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 578 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp3_ = tag;
-#line 466 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 578 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp4_ = gexiv2_metadata_get_tag_long (_tmp2_, _tmp3_);
-#line 466 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 578 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_vala_value = _tmp4_;
-#line 468 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 580 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	result = TRUE;
-#line 468 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 580 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (value) {
-#line 468 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 580 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		*value = _vala_value;
-#line 3897 "PhotoMetadata.c"
+#line 4810 "PhotoMetadata.c"
 	}
-#line 468 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 580 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 3901 "PhotoMetadata.c"
+#line 4814 "PhotoMetadata.c"
 }
 
 
@@ -3908,77 +4821,77 @@ gboolean photo_metadata_get_first_long (PhotoMetadata* self, gchar** tags, int t
 	gboolean result = FALSE;
 	gchar** _tmp0_ = NULL;
 	gint _tmp0__length1 = 0;
-#line 471 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 583 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (IS_PHOTO_METADATA (self), FALSE);
-#line 472 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 584 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0_ = tags;
-#line 472 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 584 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0__length1 = tags_length1;
-#line 3916 "PhotoMetadata.c"
+#line 4829 "PhotoMetadata.c"
 	{
 		gchar** tag_collection = NULL;
 		gint tag_collection_length1 = 0;
 		gint _tag_collection_size_ = 0;
 		gint tag_it = 0;
-#line 472 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 584 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		tag_collection = _tmp0_;
-#line 472 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 584 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		tag_collection_length1 = _tmp0__length1;
-#line 472 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 584 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		for (tag_it = 0; tag_it < _tmp0__length1; tag_it = tag_it + 1) {
-#line 3928 "PhotoMetadata.c"
+#line 4841 "PhotoMetadata.c"
 			gchar* _tmp1_ = NULL;
 			gchar* tag = NULL;
-#line 472 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 584 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tmp1_ = g_strdup (tag_collection[tag_it]);
-#line 472 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 584 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			tag = _tmp1_;
-#line 3935 "PhotoMetadata.c"
+#line 4848 "PhotoMetadata.c"
 			{
 				const gchar* _tmp2_ = NULL;
 				glong _tmp3_ = 0L;
 				gboolean _tmp4_ = FALSE;
-#line 473 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 585 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp2_ = tag;
-#line 473 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 585 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp4_ = photo_metadata_get_long (self, _tmp2_, &_tmp3_);
-#line 473 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 585 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_vala_value = _tmp3_;
-#line 473 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 585 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				if (_tmp4_) {
-#line 474 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 586 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					result = TRUE;
-#line 474 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 586 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_g_free0 (tag);
-#line 474 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 586 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					if (value) {
-#line 474 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 586 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 						*value = _vala_value;
-#line 3956 "PhotoMetadata.c"
+#line 4869 "PhotoMetadata.c"
 					}
-#line 474 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 586 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					return result;
-#line 3960 "PhotoMetadata.c"
+#line 4873 "PhotoMetadata.c"
 				}
-#line 472 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 584 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_g_free0 (tag);
-#line 3964 "PhotoMetadata.c"
+#line 4877 "PhotoMetadata.c"
 			}
 		}
 	}
-#line 477 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 589 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_vala_value = (glong) 0;
-#line 479 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 591 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	result = FALSE;
-#line 479 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 591 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (value) {
-#line 479 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 591 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		*value = _vala_value;
-#line 3976 "PhotoMetadata.c"
+#line 4889 "PhotoMetadata.c"
 	}
-#line 479 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 591 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 3980 "PhotoMetadata.c"
+#line 4893 "PhotoMetadata.c"
 }
 
 
@@ -3987,61 +4900,61 @@ void photo_metadata_set_long (PhotoMetadata* self, const gchar* tag, glong value
 	const gchar* _tmp1_ = NULL;
 	glong _tmp2_ = 0L;
 	gboolean _tmp3_ = FALSE;
-#line 482 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 594 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_if_fail (IS_PHOTO_METADATA (self));
-#line 482 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 594 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_if_fail (tag != NULL);
-#line 483 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 595 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0_ = self->priv->exiv2;
-#line 483 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 595 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp1_ = tag;
-#line 483 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 595 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp2_ = value;
-#line 483 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 595 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp3_ = gexiv2_metadata_set_tag_long (_tmp0_, _tmp1_, _tmp2_);
-#line 483 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 595 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (!_tmp3_) {
-#line 4003 "PhotoMetadata.c"
+#line 4916 "PhotoMetadata.c"
 		const gchar* _tmp4_ = NULL;
 		glong _tmp5_ = 0L;
 		const gchar* _tmp6_ = NULL;
-#line 484 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 596 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp4_ = tag;
-#line 484 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 596 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp5_ = value;
-#line 484 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 596 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp6_ = self->priv->source_name;
-#line 484 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-		g_warning ("PhotoMetadata.vala:484: Unable to set tag %s to long %ld from source %" \
+#line 596 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+		g_warning ("PhotoMetadata.vala:596: Unable to set tag %s to long %ld from source %" \
 "s", _tmp4_, _tmp5_, _tmp6_);
-#line 4015 "PhotoMetadata.c"
+#line 4928 "PhotoMetadata.c"
 	}
 }
 
 
 static Block3Data* block3_data_ref (Block3Data* _data3_) {
-#line 487 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 599 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_atomic_int_inc (&_data3_->_ref_count_);
-#line 487 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 599 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return _data3_;
-#line 4025 "PhotoMetadata.c"
+#line 4938 "PhotoMetadata.c"
 }
 
 
 static void block3_data_unref (void * _userdata_) {
 	Block3Data* _data3_;
 	_data3_ = (Block3Data*) _userdata_;
-#line 487 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 599 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (g_atomic_int_dec_and_test (&_data3_->_ref_count_)) {
-#line 4034 "PhotoMetadata.c"
+#line 4947 "PhotoMetadata.c"
 		PhotoMetadata* self;
-#line 487 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 599 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		self = _data3_->self;
-#line 487 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 599 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_media_metadata_unref0 (self);
-#line 487 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 599 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		g_slice_free (Block3Data, _data3_);
-#line 4042 "PhotoMetadata.c"
+#line 4955 "PhotoMetadata.c"
 	}
 }
 
@@ -4050,24 +4963,24 @@ static void __lambda7_ (Block3Data* _data3_, const gchar* tag) {
 	PhotoMetadata* self;
 	const gchar* _tmp0_ = NULL;
 	glong _tmp1_ = 0L;
-#line 488 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 600 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	self = _data3_->self;
-#line 488 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 600 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_if_fail (tag != NULL);
-#line 488 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 600 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0_ = tag;
-#line 488 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 600 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp1_ = _data3_->value;
-#line 488 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 600 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	photo_metadata_set_long (self, _tmp0_, _tmp1_);
-#line 4061 "PhotoMetadata.c"
+#line 4974 "PhotoMetadata.c"
 }
 
 
 static void ___lambda7__photo_metadata_set_generic_value (const gchar* tag, gpointer self) {
-#line 488 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 600 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	__lambda7_ (self, tag);
-#line 4068 "PhotoMetadata.c"
+#line 4981 "PhotoMetadata.c"
 }
 
 
@@ -4077,31 +4990,31 @@ void photo_metadata_set_all_long (PhotoMetadata* self, gchar** tags, int tags_le
 	gchar** _tmp1_ = NULL;
 	gint _tmp1__length1 = 0;
 	PhotoMetadataSetOption _tmp2_ = 0;
-#line 487 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 599 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_if_fail (IS_PHOTO_METADATA (self));
-#line 487 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 599 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_data3_ = g_slice_new0 (Block3Data);
-#line 487 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 599 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_data3_->_ref_count_ = 1;
-#line 487 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 599 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_data3_->self = media_metadata_ref (self);
-#line 487 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 599 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0_ = value;
-#line 487 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 599 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_data3_->value = _tmp0_;
-#line 488 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 600 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp1_ = tags;
-#line 488 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 600 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp1__length1 = tags_length1;
-#line 488 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 600 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp2_ = option;
-#line 488 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 600 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	photo_metadata_set_all_generic (self, _tmp1_, _tmp1__length1, _tmp2_, ___lambda7__photo_metadata_set_generic_value, _data3_);
-#line 487 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 599 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	block3_data_unref (_data3_);
-#line 487 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 599 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_data3_ = NULL;
-#line 4102 "PhotoMetadata.c"
+#line 5015 "PhotoMetadata.c"
 }
 
 
@@ -4116,35 +5029,35 @@ gboolean photo_metadata_get_rational (PhotoMetadata* self, const gchar* tag, Met
 	gint _tmp2_ = 0;
 	gint _tmp3_ = 0;
 	gboolean _tmp4_ = FALSE;
-#line 491 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 603 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (IS_PHOTO_METADATA (self), FALSE);
-#line 491 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 603 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (tag != NULL, FALSE);
-#line 493 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 605 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0_ = self->priv->exiv2;
-#line 493 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 605 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp1_ = tag;
-#line 493 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 605 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp4_ = gexiv2_metadata_get_exif_tag_rational (_tmp0_, _tmp1_, &_tmp2_, &_tmp3_);
-#line 493 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 605 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	numerator = _tmp2_;
-#line 493 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 605 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	denominator = _tmp3_;
-#line 493 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 605 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_result_ = _tmp4_;
-#line 495 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 607 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	metadata_rational_init (&_vala_rational, numerator, denominator);
-#line 497 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 609 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	result = _result_;
-#line 497 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 609 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (rational) {
-#line 497 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 609 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		*rational = _vala_rational;
-#line 4141 "PhotoMetadata.c"
+#line 5054 "PhotoMetadata.c"
 	}
-#line 497 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 609 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 4145 "PhotoMetadata.c"
+#line 5058 "PhotoMetadata.c"
 }
 
 
@@ -4153,77 +5066,77 @@ gboolean photo_metadata_get_first_rational (PhotoMetadata* self, gchar** tags, i
 	gboolean result = FALSE;
 	gchar** _tmp0_ = NULL;
 	gint _tmp0__length1 = 0;
-#line 500 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 612 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (IS_PHOTO_METADATA (self), FALSE);
-#line 501 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 613 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0_ = tags;
-#line 501 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 613 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0__length1 = tags_length1;
-#line 4160 "PhotoMetadata.c"
+#line 5073 "PhotoMetadata.c"
 	{
 		gchar** tag_collection = NULL;
 		gint tag_collection_length1 = 0;
 		gint _tag_collection_size_ = 0;
 		gint tag_it = 0;
-#line 501 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 613 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		tag_collection = _tmp0_;
-#line 501 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 613 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		tag_collection_length1 = _tmp0__length1;
-#line 501 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 613 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		for (tag_it = 0; tag_it < _tmp0__length1; tag_it = tag_it + 1) {
-#line 4172 "PhotoMetadata.c"
+#line 5085 "PhotoMetadata.c"
 			gchar* _tmp1_ = NULL;
 			gchar* tag = NULL;
-#line 501 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 613 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tmp1_ = g_strdup (tag_collection[tag_it]);
-#line 501 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 613 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			tag = _tmp1_;
-#line 4179 "PhotoMetadata.c"
+#line 5092 "PhotoMetadata.c"
 			{
 				const gchar* _tmp2_ = NULL;
 				MetadataRational _tmp3_ = {0};
 				gboolean _tmp4_ = FALSE;
-#line 502 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 614 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp2_ = tag;
-#line 502 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 614 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp4_ = photo_metadata_get_rational (self, _tmp2_, &_tmp3_);
-#line 502 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 614 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_vala_rational = _tmp3_;
-#line 502 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 614 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				if (_tmp4_) {
-#line 503 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 615 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					result = TRUE;
-#line 503 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 615 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_g_free0 (tag);
-#line 503 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 615 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					if (rational) {
-#line 503 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 615 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 						*rational = _vala_rational;
-#line 4200 "PhotoMetadata.c"
+#line 5113 "PhotoMetadata.c"
 					}
-#line 503 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 615 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					return result;
-#line 4204 "PhotoMetadata.c"
+#line 5117 "PhotoMetadata.c"
 				}
-#line 501 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 613 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_g_free0 (tag);
-#line 4208 "PhotoMetadata.c"
+#line 5121 "PhotoMetadata.c"
 			}
 		}
 	}
-#line 506 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 618 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	metadata_rational_init (&_vala_rational, 0, 0);
-#line 508 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 620 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	result = FALSE;
-#line 508 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 620 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (rational) {
-#line 508 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 620 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		*rational = _vala_rational;
-#line 4220 "PhotoMetadata.c"
+#line 5133 "PhotoMetadata.c"
 	}
-#line 508 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 620 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 4224 "PhotoMetadata.c"
+#line 5137 "PhotoMetadata.c"
 }
 
 
@@ -4235,74 +5148,74 @@ void photo_metadata_set_rational (PhotoMetadata* self, const gchar* tag, Metadat
 	MetadataRational _tmp4_ = {0};
 	gint _tmp5_ = 0;
 	gboolean _tmp6_ = FALSE;
-#line 511 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 623 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_if_fail (IS_PHOTO_METADATA (self));
-#line 511 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 623 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_if_fail (tag != NULL);
-#line 511 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 623 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_if_fail (rational != NULL);
-#line 512 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 624 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0_ = self->priv->exiv2;
-#line 512 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 624 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp1_ = tag;
-#line 512 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 624 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp2_ = *rational;
-#line 512 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 624 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp3_ = _tmp2_.numerator;
-#line 512 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 624 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp4_ = *rational;
-#line 512 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 624 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp5_ = _tmp4_.denominator;
-#line 512 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 624 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp6_ = gexiv2_metadata_set_exif_tag_rational (_tmp0_, _tmp1_, _tmp3_, _tmp5_);
-#line 512 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 624 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (!_tmp6_) {
-#line 4258 "PhotoMetadata.c"
+#line 5171 "PhotoMetadata.c"
 		const gchar* _tmp7_ = NULL;
 		gchar* _tmp8_ = NULL;
 		gchar* _tmp9_ = NULL;
 		const gchar* _tmp10_ = NULL;
-#line 513 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 625 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp7_ = tag;
-#line 513 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 625 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp8_ = metadata_rational_to_string (rational);
-#line 513 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 625 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp9_ = _tmp8_;
-#line 513 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 625 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp10_ = self->priv->source_name;
-#line 513 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-		g_warning ("PhotoMetadata.vala:513: Unable to set tag %s to rational %s from sourc" \
+#line 625 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+		g_warning ("PhotoMetadata.vala:625: Unable to set tag %s to rational %s from sourc" \
 "e %s", _tmp7_, _tmp9_, _tmp10_);
-#line 513 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 625 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_g_free0 (_tmp9_);
-#line 4275 "PhotoMetadata.c"
+#line 5188 "PhotoMetadata.c"
 	}
 }
 
 
 static Block4Data* block4_data_ref (Block4Data* _data4_) {
-#line 518 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 630 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_atomic_int_inc (&_data4_->_ref_count_);
-#line 518 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 630 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return _data4_;
-#line 4285 "PhotoMetadata.c"
+#line 5198 "PhotoMetadata.c"
 }
 
 
 static void block4_data_unref (void * _userdata_) {
 	Block4Data* _data4_;
 	_data4_ = (Block4Data*) _userdata_;
-#line 518 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 630 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (g_atomic_int_dec_and_test (&_data4_->_ref_count_)) {
-#line 4294 "PhotoMetadata.c"
+#line 5207 "PhotoMetadata.c"
 		PhotoMetadata* self;
-#line 518 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 630 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		self = _data4_->self;
-#line 518 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 630 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_media_metadata_unref0 (self);
-#line 518 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 630 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		g_slice_free (Block4Data, _data4_);
-#line 4302 "PhotoMetadata.c"
+#line 5215 "PhotoMetadata.c"
 	}
 }
 
@@ -4311,24 +5224,24 @@ static void __lambda8_ (Block4Data* _data4_, const gchar* tag) {
 	PhotoMetadata* self;
 	const gchar* _tmp0_ = NULL;
 	MetadataRational _tmp1_ = {0};
-#line 519 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 631 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	self = _data4_->self;
-#line 519 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 631 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_if_fail (tag != NULL);
-#line 519 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 631 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0_ = tag;
-#line 519 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 631 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp1_ = _data4_->rational;
-#line 519 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 631 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	photo_metadata_set_rational (self, _tmp0_, &_tmp1_);
-#line 4321 "PhotoMetadata.c"
+#line 5234 "PhotoMetadata.c"
 }
 
 
 static void ___lambda8__photo_metadata_set_generic_value (const gchar* tag, gpointer self) {
-#line 519 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 631 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	__lambda8_ (self, tag);
-#line 4328 "PhotoMetadata.c"
+#line 5241 "PhotoMetadata.c"
 }
 
 
@@ -4338,33 +5251,33 @@ void photo_metadata_set_all_rational (PhotoMetadata* self, gchar** tags, int tag
 	gchar** _tmp1_ = NULL;
 	gint _tmp1__length1 = 0;
 	PhotoMetadataSetOption _tmp2_ = 0;
-#line 518 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 630 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_if_fail (IS_PHOTO_METADATA (self));
-#line 518 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 630 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_if_fail (rational != NULL);
-#line 518 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 630 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_data4_ = g_slice_new0 (Block4Data);
-#line 518 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 630 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_data4_->_ref_count_ = 1;
-#line 518 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 630 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_data4_->self = media_metadata_ref (self);
-#line 518 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 630 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0_ = *rational;
-#line 518 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 630 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_data4_->rational = _tmp0_;
-#line 519 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 631 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp1_ = tags;
-#line 519 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 631 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp1__length1 = tags_length1;
-#line 519 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 631 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp2_ = option;
-#line 519 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 631 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	photo_metadata_set_all_generic (self, _tmp1_, _tmp1__length1, _tmp2_, ___lambda8__photo_metadata_set_generic_value, _data4_);
-#line 518 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 630 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	block4_data_unref (_data4_);
-#line 518 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 630 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_data4_ = NULL;
-#line 4364 "PhotoMetadata.c"
+#line 5277 "PhotoMetadata.c"
 }
 
 
@@ -4375,115 +5288,115 @@ MetadataDateTime* photo_metadata_get_date_time (PhotoMetadata* self, const gchar
 	gchar* _tmp1_ = NULL;
 	const gchar* _tmp2_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 522 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 634 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL);
-#line 522 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 634 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (tag != NULL, NULL);
-#line 523 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 635 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0_ = tag;
-#line 523 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 635 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp1_ = photo_metadata_get_string (self, _tmp0_, PHOTO_METADATA_PREPARE_STRING_OPTIONS);
-#line 523 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 635 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	value = _tmp1_;
-#line 524 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 636 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp2_ = value;
-#line 524 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 636 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp2_ == NULL) {
-#line 525 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 637 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		result = NULL;
-#line 525 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 637 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_g_free0 (value);
-#line 525 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 637 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		return result;
-#line 4395 "PhotoMetadata.c"
+#line 5308 "PhotoMetadata.c"
 	}
 	{
 		const gchar* _tmp3_ = NULL;
 		MetadataDomain _tmp4_ = 0;
-#line 528 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 640 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp3_ = tag;
-#line 528 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 640 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp4_ = photo_metadata_get_tag_domain (_tmp3_);
-#line 528 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 640 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		switch (_tmp4_) {
-#line 528 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 640 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			case METADATA_DOMAIN_XMP:
-#line 4408 "PhotoMetadata.c"
+#line 5321 "PhotoMetadata.c"
 			{
 				MetadataDateTime* _tmp5_ = NULL;
 				const gchar* _tmp6_ = NULL;
 				MetadataDateTime* _tmp7_ = NULL;
 				MetadataDateTime* _tmp8_ = NULL;
-#line 530 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 642 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp6_ = value;
-#line 530 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 642 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp7_ = metadata_date_time_new_from_xmp (_tmp6_, &_inner_error_);
-#line 530 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 642 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp5_ = _tmp7_;
-#line 530 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 642 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 4422 "PhotoMetadata.c"
+#line 5335 "PhotoMetadata.c"
 					goto __catch24_g_error;
 				}
-#line 530 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 642 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp8_ = _tmp5_;
-#line 530 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 642 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp5_ = NULL;
-#line 530 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 642 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				result = _tmp8_;
-#line 530 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 642 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_metadata_date_time_unref0 (_tmp5_);
-#line 530 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 642 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_g_free0 (value);
-#line 530 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 642 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				return result;
-#line 4437 "PhotoMetadata.c"
+#line 5350 "PhotoMetadata.c"
 			}
-#line 528 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 640 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			case METADATA_DOMAIN_IPTC:
-#line 4441 "PhotoMetadata.c"
+#line 5354 "PhotoMetadata.c"
 			{
-#line 535 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 647 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				result = NULL;
-#line 535 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 647 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_g_free0 (value);
-#line 535 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 647 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				return result;
-#line 4449 "PhotoMetadata.c"
+#line 5362 "PhotoMetadata.c"
 			}
 			default:
-#line 528 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 640 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			case METADATA_DOMAIN_EXIF:
-#line 4454 "PhotoMetadata.c"
+#line 5367 "PhotoMetadata.c"
 			{
 				MetadataDateTime* _tmp9_ = NULL;
 				const gchar* _tmp10_ = NULL;
 				MetadataDateTime* _tmp11_ = NULL;
 				MetadataDateTime* _tmp12_ = NULL;
-#line 539 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 651 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp10_ = value;
-#line 539 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 651 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp11_ = metadata_date_time_new_from_exif (_tmp10_, &_inner_error_);
-#line 539 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 651 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp9_ = _tmp11_;
-#line 539 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 651 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 4468 "PhotoMetadata.c"
+#line 5381 "PhotoMetadata.c"
 					goto __catch24_g_error;
 				}
-#line 539 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 651 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp12_ = _tmp9_;
-#line 539 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 651 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp9_ = NULL;
-#line 539 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 651 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				result = _tmp12_;
-#line 539 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 651 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_metadata_date_time_unref0 (_tmp9_);
-#line 539 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 651 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_g_free0 (value);
-#line 539 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 651 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				return result;
-#line 4483 "PhotoMetadata.c"
+#line 5396 "PhotoMetadata.c"
 			}
 		}
 	}
@@ -4495,40 +5408,40 @@ MetadataDateTime* photo_metadata_get_date_time (PhotoMetadata* self, const gchar
 		const gchar* _tmp14_ = NULL;
 		GError* _tmp15_ = NULL;
 		const gchar* _tmp16_ = NULL;
-#line 527 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 639 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		err = _inner_error_;
-#line 527 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 639 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_inner_error_ = NULL;
-#line 542 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 654 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp13_ = tag;
-#line 542 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 654 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp14_ = self->priv->source_name;
-#line 542 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 654 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp15_ = err;
-#line 542 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 654 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp16_ = _tmp15_->message;
-#line 542 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-		g_warning ("PhotoMetadata.vala:542: Unable to read date/time %s from source %s: %s", _tmp13_, _tmp14_, _tmp16_);
-#line 544 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 654 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+		g_warning ("PhotoMetadata.vala:654: Unable to read date/time %s from source %s: %s", _tmp13_, _tmp14_, _tmp16_);
+#line 656 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		result = NULL;
-#line 544 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 656 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_g_error_free0 (err);
-#line 544 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 656 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_g_free0 (value);
-#line 544 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 656 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		return result;
-#line 4517 "PhotoMetadata.c"
+#line 5430 "PhotoMetadata.c"
 	}
 	__finally24:
-#line 527 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 639 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_g_free0 (value);
-#line 527 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 639 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 527 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 639 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_clear_error (&_inner_error_);
-#line 527 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 639 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return NULL;
-#line 4528 "PhotoMetadata.c"
+#line 5441 "PhotoMetadata.c"
 }
 
 
@@ -4536,197 +5449,197 @@ MetadataDateTime* photo_metadata_get_first_date_time (PhotoMetadata* self, gchar
 	MetadataDateTime* result = NULL;
 	gchar** _tmp0_ = NULL;
 	gint _tmp0__length1 = 0;
-#line 548 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 660 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL);
-#line 549 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 661 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0_ = tags;
-#line 549 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 661 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0__length1 = tags_length1;
-#line 4542 "PhotoMetadata.c"
+#line 5455 "PhotoMetadata.c"
 	{
 		gchar** tag_collection = NULL;
 		gint tag_collection_length1 = 0;
 		gint _tag_collection_size_ = 0;
 		gint tag_it = 0;
-#line 549 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 661 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		tag_collection = _tmp0_;
-#line 549 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 661 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		tag_collection_length1 = _tmp0__length1;
-#line 549 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 661 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		for (tag_it = 0; tag_it < _tmp0__length1; tag_it = tag_it + 1) {
-#line 4554 "PhotoMetadata.c"
+#line 5467 "PhotoMetadata.c"
 			gchar* _tmp1_ = NULL;
 			gchar* tag = NULL;
-#line 549 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 661 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tmp1_ = g_strdup (tag_collection[tag_it]);
-#line 549 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 661 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			tag = _tmp1_;
-#line 4561 "PhotoMetadata.c"
+#line 5474 "PhotoMetadata.c"
 			{
 				MetadataDateTime* date_time = NULL;
 				const gchar* _tmp2_ = NULL;
 				MetadataDateTime* _tmp3_ = NULL;
 				MetadataDateTime* _tmp4_ = NULL;
-#line 550 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 662 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp2_ = tag;
-#line 550 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 662 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp3_ = photo_metadata_get_date_time (self, _tmp2_);
-#line 550 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 662 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				date_time = _tmp3_;
-#line 551 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 663 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp4_ = date_time;
-#line 551 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 663 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				if (_tmp4_ != NULL) {
-#line 552 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 664 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					result = date_time;
-#line 552 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 664 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_g_free0 (tag);
-#line 552 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 664 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					return result;
-#line 4583 "PhotoMetadata.c"
+#line 5496 "PhotoMetadata.c"
 				}
-#line 549 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 661 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_metadata_date_time_unref0 (date_time);
-#line 549 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 661 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_g_free0 (tag);
-#line 4589 "PhotoMetadata.c"
+#line 5502 "PhotoMetadata.c"
 			}
 		}
 	}
-#line 555 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 667 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	result = NULL;
-#line 555 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 667 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 4597 "PhotoMetadata.c"
+#line 5510 "PhotoMetadata.c"
 }
 
 
 void photo_metadata_set_date_time (PhotoMetadata* self, const gchar* tag, MetadataDateTime* date_time) {
 	const gchar* _tmp0_ = NULL;
 	MetadataDomain _tmp1_ = 0;
-#line 558 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 670 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_if_fail (IS_PHOTO_METADATA (self));
-#line 558 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 670 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_if_fail (tag != NULL);
-#line 558 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 670 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_if_fail (IS_METADATA_DATE_TIME (date_time));
-#line 559 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 671 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0_ = tag;
-#line 559 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 671 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp1_ = photo_metadata_get_tag_domain (_tmp0_);
-#line 559 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 671 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	switch (_tmp1_) {
-#line 559 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 671 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		case METADATA_DOMAIN_EXIF:
-#line 4618 "PhotoMetadata.c"
+#line 5531 "PhotoMetadata.c"
 		{
 			const gchar* _tmp2_ = NULL;
 			MetadataDateTime* _tmp3_ = NULL;
 			gchar* _tmp4_ = NULL;
 			gchar* _tmp5_ = NULL;
-#line 561 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 673 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tmp2_ = tag;
-#line 561 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 673 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tmp3_ = date_time;
-#line 561 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 673 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tmp4_ = metadata_date_time_get_exif_label (_tmp3_);
-#line 561 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 673 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tmp5_ = _tmp4_;
-#line 561 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 673 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			photo_metadata_set_string (self, _tmp2_, _tmp5_, PHOTO_METADATA_PREPARE_STRING_OPTIONS);
-#line 561 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 673 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_g_free0 (_tmp5_);
-#line 562 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 674 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			break;
-#line 4638 "PhotoMetadata.c"
+#line 5551 "PhotoMetadata.c"
 		}
-#line 559 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 671 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		case METADATA_DOMAIN_XMP:
-#line 4642 "PhotoMetadata.c"
+#line 5555 "PhotoMetadata.c"
 		{
 			const gchar* _tmp6_ = NULL;
 			MetadataDateTime* _tmp7_ = NULL;
 			gchar* _tmp8_ = NULL;
 			gchar* _tmp9_ = NULL;
-#line 565 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 677 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tmp6_ = tag;
-#line 565 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 677 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tmp7_ = date_time;
-#line 565 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 677 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tmp8_ = metadata_date_time_get_xmp_label (_tmp7_);
-#line 565 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 677 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tmp9_ = _tmp8_;
-#line 565 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 677 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			photo_metadata_set_string (self, _tmp6_, _tmp9_, PHOTO_METADATA_PREPARE_STRING_OPTIONS);
-#line 565 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 677 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_g_free0 (_tmp9_);
-#line 566 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 678 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			break;
-#line 4662 "PhotoMetadata.c"
+#line 5575 "PhotoMetadata.c"
 		}
 		default:
-#line 559 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 671 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		case METADATA_DOMAIN_IPTC:
-#line 4667 "PhotoMetadata.c"
+#line 5580 "PhotoMetadata.c"
 		{
 			const gchar* _tmp10_ = NULL;
 			const gchar* _tmp11_ = NULL;
 			const gchar* _tmp12_ = NULL;
 			MetadataDomain _tmp13_ = 0;
 			GEnumValue* _tmp14_;
-#line 571 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 683 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tmp10_ = tag;
-#line 571 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 683 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tmp11_ = self->priv->source_name;
-#line 571 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 683 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tmp12_ = tag;
-#line 571 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 683 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tmp13_ = photo_metadata_get_tag_domain (_tmp12_);
-#line 572 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 684 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tmp14_ = g_enum_get_value (g_type_class_ref (TYPE_METADATA_DOMAIN), _tmp13_);
-#line 571 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-			g_warning ("PhotoMetadata.vala:571: Cannot set date/time for %s from source %s: un" \
+#line 683 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+			g_warning ("PhotoMetadata.vala:683: Cannot set date/time for %s from source %s: un" \
 "supported metadata domain %s", _tmp10_, _tmp11_, (_tmp14_ != NULL) ? _tmp14_->value_name : NULL);
-#line 573 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 685 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			break;
-#line 4688 "PhotoMetadata.c"
+#line 5601 "PhotoMetadata.c"
 		}
 	}
 }
 
 
 static gpointer _metadata_date_time_ref0 (gpointer self) {
-#line 577 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 689 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return self ? metadata_date_time_ref (self) : NULL;
-#line 4697 "PhotoMetadata.c"
+#line 5610 "PhotoMetadata.c"
 }
 
 
 static Block5Data* block5_data_ref (Block5Data* _data5_) {
-#line 577 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 689 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_atomic_int_inc (&_data5_->_ref_count_);
-#line 577 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 689 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return _data5_;
-#line 4706 "PhotoMetadata.c"
+#line 5619 "PhotoMetadata.c"
 }
 
 
 static void block5_data_unref (void * _userdata_) {
 	Block5Data* _data5_;
 	_data5_ = (Block5Data*) _userdata_;
-#line 577 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 689 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (g_atomic_int_dec_and_test (&_data5_->_ref_count_)) {
-#line 4715 "PhotoMetadata.c"
+#line 5628 "PhotoMetadata.c"
 		PhotoMetadata* self;
-#line 577 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 689 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		self = _data5_->self;
-#line 577 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 689 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_metadata_date_time_unref0 (_data5_->date_time);
-#line 577 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 689 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_media_metadata_unref0 (self);
-#line 577 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 689 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		g_slice_free (Block5Data, _data5_);
-#line 4725 "PhotoMetadata.c"
+#line 5638 "PhotoMetadata.c"
 	}
 }
 
@@ -4735,24 +5648,24 @@ static void __lambda9_ (Block5Data* _data5_, const gchar* tag) {
 	PhotoMetadata* self;
 	const gchar* _tmp0_ = NULL;
 	MetadataDateTime* _tmp1_ = NULL;
-#line 578 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 690 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	self = _data5_->self;
-#line 578 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 690 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_if_fail (tag != NULL);
-#line 578 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 690 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0_ = tag;
-#line 578 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 690 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp1_ = _data5_->date_time;
-#line 578 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 690 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	photo_metadata_set_date_time (self, _tmp0_, _tmp1_);
-#line 4744 "PhotoMetadata.c"
+#line 5657 "PhotoMetadata.c"
 }
 
 
 static void ___lambda9__photo_metadata_set_generic_value (const gchar* tag, gpointer self) {
-#line 578 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 690 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	__lambda9_ (self, tag);
-#line 4751 "PhotoMetadata.c"
+#line 5664 "PhotoMetadata.c"
 }
 
 
@@ -4763,37 +5676,37 @@ void photo_metadata_set_all_date_time (PhotoMetadata* self, gchar** tags, int ta
 	gchar** _tmp2_ = NULL;
 	gint _tmp2__length1 = 0;
 	PhotoMetadataSetOption _tmp3_ = 0;
-#line 577 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 689 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_if_fail (IS_PHOTO_METADATA (self));
-#line 577 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 689 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_if_fail (IS_METADATA_DATE_TIME (date_time));
-#line 577 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 689 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_data5_ = g_slice_new0 (Block5Data);
-#line 577 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 689 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_data5_->_ref_count_ = 1;
-#line 577 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 689 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_data5_->self = media_metadata_ref (self);
-#line 577 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 689 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0_ = date_time;
-#line 577 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 689 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp1_ = _metadata_date_time_ref0 (_tmp0_);
-#line 577 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 689 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_metadata_date_time_unref0 (_data5_->date_time);
-#line 577 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 689 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_data5_->date_time = _tmp1_;
-#line 578 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 690 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp2_ = tags;
-#line 578 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 690 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp2__length1 = tags_length1;
-#line 578 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 690 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp3_ = option;
-#line 578 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 690 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	photo_metadata_set_all_generic (self, _tmp2_, _tmp2__length1, _tmp3_, ___lambda9__photo_metadata_set_generic_value, _data5_);
-#line 577 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 689 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	block5_data_unref (_data5_);
-#line 577 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 689 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_data5_ = NULL;
-#line 4792 "PhotoMetadata.c"
+#line 5705 "PhotoMetadata.c"
 }
 
 
@@ -4821,93 +5734,93 @@ guint8* photo_metadata_flatten_exif (PhotoMetadata* self, gboolean include_previ
 	guint _tmp24_ = 0U;
 	guint8* _tmp25_ = NULL;
 	gint _tmp25__length1 = 0;
-#line 582 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 694 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL);
-#line 583 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 695 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0_ = self->priv->exif;
-#line 583 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 695 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp0_ == NULL) {
-#line 4826 "PhotoMetadata.c"
+#line 5739 "PhotoMetadata.c"
 		guint8* _tmp1_ = NULL;
 		gint _tmp1__length1 = 0;
-#line 584 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 696 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp1_ = NULL;
-#line 584 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 696 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp1__length1 = 0;
-#line 584 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 696 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		if (result_length1) {
-#line 584 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 696 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			*result_length1 = _tmp1__length1;
-#line 4837 "PhotoMetadata.c"
+#line 5750 "PhotoMetadata.c"
 		}
-#line 584 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 696 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		result = _tmp1_;
-#line 584 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 696 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		return result;
-#line 4843 "PhotoMetadata.c"
+#line 5756 "PhotoMetadata.c"
 	}
-#line 588 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 700 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp2_ = self->priv->exif;
-#line 588 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 700 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp3_ = _tmp2_->data;
-#line 588 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 700 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	thumbnail = _tmp3_;
-#line 589 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 701 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp4_ = self->priv->exif;
-#line 589 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 701 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp5_ = _tmp4_->size;
-#line 589 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 701 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	thumbnail_size = _tmp5_;
-#line 590 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 702 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp6_ = include_preview;
-#line 590 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 702 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (!_tmp6_) {
-#line 4861 "PhotoMetadata.c"
+#line 5774 "PhotoMetadata.c"
 		ExifData* _tmp7_ = NULL;
 		ExifData* _tmp8_ = NULL;
-#line 591 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 703 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp7_ = self->priv->exif;
-#line 591 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 703 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp7_->data = NULL;
-#line 592 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 704 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp8_ = self->priv->exif;
-#line 592 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 704 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp8_->size = (guint) 0;
-#line 4872 "PhotoMetadata.c"
+#line 5785 "PhotoMetadata.c"
 	}
-#line 595 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 707 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	flattened = NULL;
-#line 595 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 707 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	flattened_length1 = 0;
-#line 595 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 707 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_flattened_size_ = flattened_length1;
-#line 598 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 710 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	saved_data = NULL;
-#line 599 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 711 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	saved_size = (guint) 0;
-#line 600 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 712 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp9_ = self->priv->exif;
-#line 600 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 712 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	exif_data_save_data (_tmp9_, &saved_data, &saved_size);
-#line 601 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 713 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp11_ = saved_size;
-#line 601 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 713 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp11_ > ((guint) 0)) {
-#line 4892 "PhotoMetadata.c"
+#line 5805 "PhotoMetadata.c"
 		guchar* _tmp12_ = NULL;
-#line 601 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 713 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp12_ = saved_data;
-#line 601 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 713 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp10_ = _tmp12_ != NULL;
-#line 4898 "PhotoMetadata.c"
+#line 5811 "PhotoMetadata.c"
 	} else {
-#line 601 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 713 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp10_ = FALSE;
-#line 4902 "PhotoMetadata.c"
+#line 5815 "PhotoMetadata.c"
 	}
-#line 601 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 713 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp10_) {
-#line 4906 "PhotoMetadata.c"
+#line 5819 "PhotoMetadata.c"
 		guint _tmp13_ = 0U;
 		guint8* _tmp14_ = NULL;
 		guint8* _tmp15_ = NULL;
@@ -4917,74 +5830,74 @@ guint8* photo_metadata_flatten_exif (PhotoMetadata* self, gboolean include_previ
 		ExifMem* _tmp18_ = NULL;
 		ExifMem* _tmp19_ = NULL;
 		guchar* _tmp20_ = NULL;
-#line 602 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 714 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp13_ = saved_size;
-#line 602 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 714 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp14_ = g_new0 (guint8, _tmp13_);
-#line 602 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 714 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		flattened = (g_free (flattened), NULL);
-#line 602 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 714 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		flattened = _tmp14_;
-#line 602 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 714 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		flattened_length1 = _tmp13_;
-#line 602 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 714 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_flattened_size_ = flattened_length1;
-#line 603 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 715 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp15_ = flattened;
-#line 603 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 715 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp15__length1 = flattened_length1;
-#line 603 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 715 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp16_ = saved_data;
-#line 603 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 715 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp17_ = saved_size;
-#line 603 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 715 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		memcpy (_tmp15_, _tmp16_, (gsize) _tmp17_);
-#line 605 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 717 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp18_ = exif_mem_new_default ();
-#line 605 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 717 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp19_ = _tmp18_;
-#line 605 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 717 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp20_ = saved_data;
-#line 605 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 717 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		exif_mem_free (_tmp19_, _tmp20_);
-#line 605 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 717 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_exif_mem_unref0 (_tmp19_);
-#line 4948 "PhotoMetadata.c"
+#line 5861 "PhotoMetadata.c"
 	}
-#line 609 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 721 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp21_ = self->priv->exif;
-#line 609 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 721 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp22_ = thumbnail;
-#line 609 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 721 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp21_->data = _tmp22_;
-#line 610 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 722 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp23_ = self->priv->exif;
-#line 610 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 722 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp24_ = thumbnail_size;
-#line 610 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 722 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp23_->size = _tmp24_;
-#line 612 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 724 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp25_ = flattened;
-#line 612 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 724 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp25__length1 = flattened_length1;
-#line 612 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 724 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (result_length1) {
-#line 612 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 724 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		*result_length1 = _tmp25__length1;
-#line 4970 "PhotoMetadata.c"
+#line 5883 "PhotoMetadata.c"
 	}
-#line 612 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 724 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	result = _tmp25_;
-#line 612 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 724 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 4976 "PhotoMetadata.c"
+#line 5889 "PhotoMetadata.c"
 }
 
 
 static guint8* _vala_array_dup5 (guint8* self, int length) {
-#line 618 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 730 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return g_memdup (self, length * sizeof (guint8));
-#line 4983 "PhotoMetadata.c"
+#line 5896 "PhotoMetadata.c"
 }
 
 
@@ -5004,66 +5917,66 @@ guint8* photo_metadata_flatten_exif_preview (PhotoMetadata* self, int* result_le
 	gint _tmp6__length1 = 0;
 	guint8* _tmp7_ = NULL;
 	gint _tmp7__length1 = 0;
-#line 616 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 728 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL);
-#line 618 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 730 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp1_ = self->priv->exiv2;
-#line 618 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 730 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp4_ = gexiv2_metadata_get_exif_thumbnail (_tmp1_, &_tmp2_, &_tmp3_);
-#line 618 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 730 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	buffer = (g_free (buffer), NULL);
-#line 618 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 730 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	buffer = _tmp2_;
-#line 618 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 730 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	buffer_length1 = _tmp3_;
-#line 618 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 730 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_buffer_size_ = buffer_length1;
-#line 618 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 730 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp4_) {
-#line 5019 "PhotoMetadata.c"
+#line 5932 "PhotoMetadata.c"
 		guchar* _tmp5_ = NULL;
 		gint _tmp5__length1 = 0;
-#line 618 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 730 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp5_ = buffer;
-#line 618 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 730 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp5__length1 = buffer_length1;
-#line 618 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 730 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp0_ = _tmp5_;
-#line 618 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 730 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp0__length1 = _tmp5__length1;
-#line 618 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 730 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		__tmp0__size_ = _tmp0__length1;
-#line 5032 "PhotoMetadata.c"
+#line 5945 "PhotoMetadata.c"
 	} else {
-#line 618 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 730 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp0_ = NULL;
-#line 618 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 730 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp0__length1 = 0;
-#line 618 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 730 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		__tmp0__size_ = _tmp0__length1;
-#line 5040 "PhotoMetadata.c"
+#line 5953 "PhotoMetadata.c"
 	}
-#line 618 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 730 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp6_ = (_tmp0_ != NULL) ? _vala_array_dup5 (_tmp0_, _tmp0__length1) : ((gpointer) _tmp0_);
-#line 618 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 730 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp6__length1 = _tmp0__length1;
-#line 618 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 730 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp7_ = _tmp6_;
-#line 618 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 730 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp7__length1 = _tmp6__length1;
-#line 618 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 730 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (result_length1) {
-#line 618 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 730 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		*result_length1 = _tmp7__length1;
-#line 5054 "PhotoMetadata.c"
+#line 5967 "PhotoMetadata.c"
 	}
-#line 618 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 730 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	result = _tmp7_;
-#line 618 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 730 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	buffer = (g_free (buffer), NULL);
-#line 618 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 730 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 5062 "PhotoMetadata.c"
+#line 5975 "PhotoMetadata.c"
 }
 
 
@@ -5078,44 +5991,44 @@ guint photo_metadata_get_preview_count (PhotoMetadata* self) {
 	gint _tmp3_ = 0;
 	GExiv2PreviewProperties** _tmp4_ = NULL;
 	gint _tmp4__length1 = 0;
-#line 621 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 733 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (IS_PHOTO_METADATA (self), 0U);
-#line 622 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 734 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0_ = self->priv->exiv2;
-#line 622 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 734 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp2_ = _tmp1_ = gexiv2_metadata_get_preview_properties (_tmp0_);
-#line 622 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 734 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	props = _tmp2_;
-#line 622 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 734 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	props_length1 = _vala_array_length (_tmp1_);
-#line 622 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 734 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_props_size_ = props_length1;
-#line 624 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 736 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp4_ = props;
-#line 624 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 736 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp4__length1 = props_length1;
-#line 624 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 736 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp4_ != NULL) {
-#line 5095 "PhotoMetadata.c"
+#line 6008 "PhotoMetadata.c"
 		GExiv2PreviewProperties** _tmp5_ = NULL;
 		gint _tmp5__length1 = 0;
-#line 624 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 736 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp5_ = props;
-#line 624 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 736 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp5__length1 = props_length1;
-#line 624 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 736 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp3_ = _tmp5__length1;
-#line 5104 "PhotoMetadata.c"
+#line 6017 "PhotoMetadata.c"
 	} else {
-#line 624 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 736 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp3_ = 0;
-#line 5108 "PhotoMetadata.c"
+#line 6021 "PhotoMetadata.c"
 	}
-#line 624 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 736 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	result = (guint) _tmp3_;
-#line 624 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 736 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 5114 "PhotoMetadata.c"
+#line 6027 "PhotoMetadata.c"
 }
 
 
@@ -5137,112 +6050,112 @@ PhotoPreview* photo_metadata_get_preview (PhotoMetadata* self, guint number) {
 	guint _tmp10_ = 0U;
 	GExiv2PreviewProperties* _tmp11_ = NULL;
 	PhotoMetadataInternalPhotoPreview* _tmp12_ = NULL;
-#line 628 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 740 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL);
-#line 629 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 741 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0_ = self->priv->exiv2;
-#line 629 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 741 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp2_ = _tmp1_ = gexiv2_metadata_get_preview_properties (_tmp0_);
-#line 629 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 741 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	props = _tmp2_;
-#line 629 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 741 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	props_length1 = _vala_array_length (_tmp1_);
-#line 629 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 741 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_props_size_ = props_length1;
-#line 630 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 742 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp4_ = props;
-#line 630 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 742 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp4__length1 = props_length1;
-#line 630 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 742 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp4_ == NULL) {
-#line 630 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 742 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp3_ = TRUE;
-#line 5156 "PhotoMetadata.c"
+#line 6069 "PhotoMetadata.c"
 	} else {
 		GExiv2PreviewProperties** _tmp5_ = NULL;
 		gint _tmp5__length1 = 0;
 		guint _tmp6_ = 0U;
-#line 630 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 742 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp5_ = props;
-#line 630 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 742 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp5__length1 = props_length1;
-#line 630 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 742 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp6_ = number;
-#line 630 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 742 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp3_ = ((guint) _tmp5__length1) <= _tmp6_;
-#line 5169 "PhotoMetadata.c"
+#line 6082 "PhotoMetadata.c"
 	}
-#line 630 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 742 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp3_) {
-#line 631 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 743 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		result = NULL;
-#line 631 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 743 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		return result;
-#line 5177 "PhotoMetadata.c"
+#line 6090 "PhotoMetadata.c"
 	}
-#line 633 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 745 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp7_ = self->priv->source_name;
-#line 633 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 745 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp8_ = number;
-#line 633 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 745 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp9_ = props;
-#line 633 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 745 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp9__length1 = props_length1;
-#line 633 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 745 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp10_ = number;
-#line 633 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 745 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp11_ = _tmp9_[_tmp10_];
-#line 633 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 745 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp12_ = photo_metadata_internal_photo_preview_new (self, _tmp7_, _tmp8_, _tmp11_);
-#line 633 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 745 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_PHOTO_PREVIEW, PhotoPreview);
-#line 633 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 745 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 5197 "PhotoMetadata.c"
+#line 6110 "PhotoMetadata.c"
 }
 
 
 void photo_metadata_remove_exif_thumbnail (PhotoMetadata* self) {
 	GExiv2Metadata* _tmp0_ = NULL;
 	ExifData* _tmp1_ = NULL;
-#line 636 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 748 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_if_fail (IS_PHOTO_METADATA (self));
-#line 637 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 749 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0_ = self->priv->exiv2;
-#line 637 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 749 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	gexiv2_metadata_erase_exif_thumbnail (_tmp0_);
-#line 638 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 750 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp1_ = self->priv->exif;
-#line 638 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 750 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp1_ != NULL) {
-#line 5214 "PhotoMetadata.c"
+#line 6127 "PhotoMetadata.c"
 		ExifMem* _tmp2_ = NULL;
 		ExifMem* _tmp3_ = NULL;
 		ExifData* _tmp4_ = NULL;
 		guchar* _tmp5_ = NULL;
 		ExifData* _tmp6_ = NULL;
 		ExifData* _tmp7_ = NULL;
-#line 639 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 751 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp2_ = exif_mem_new_default ();
-#line 639 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 751 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp3_ = _tmp2_;
-#line 639 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 751 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp4_ = self->priv->exif;
-#line 639 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 751 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp5_ = _tmp4_->data;
-#line 639 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 751 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		exif_mem_free (_tmp3_, _tmp5_);
-#line 639 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 751 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_exif_mem_unref0 (_tmp3_);
-#line 640 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 752 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp6_ = self->priv->exif;
-#line 640 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 752 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp6_->data = NULL;
-#line 641 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 753 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp7_ = self->priv->exif;
-#line 641 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 753 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp7_->size = (guint) 0;
-#line 5241 "PhotoMetadata.c"
+#line 6154 "PhotoMetadata.c"
 	}
 }
 
@@ -5250,58 +6163,58 @@ void photo_metadata_remove_exif_thumbnail (PhotoMetadata* self) {
 void photo_metadata_remove_tag (PhotoMetadata* self, const gchar* tag) {
 	GExiv2Metadata* _tmp0_ = NULL;
 	const gchar* _tmp1_ = NULL;
-#line 645 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 757 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_if_fail (IS_PHOTO_METADATA (self));
-#line 645 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 757 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_if_fail (tag != NULL);
-#line 646 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 758 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0_ = self->priv->exiv2;
-#line 646 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 758 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp1_ = tag;
-#line 646 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 758 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	gexiv2_metadata_clear_tag (_tmp0_, _tmp1_);
-#line 5259 "PhotoMetadata.c"
+#line 6172 "PhotoMetadata.c"
 }
 
 
 void photo_metadata_remove_tags (PhotoMetadata* self, gchar** tags, int tags_length1) {
 	gchar** _tmp0_ = NULL;
 	gint _tmp0__length1 = 0;
-#line 649 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 761 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_if_fail (IS_PHOTO_METADATA (self));
-#line 650 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 762 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0_ = tags;
-#line 650 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 762 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0__length1 = tags_length1;
-#line 5272 "PhotoMetadata.c"
+#line 6185 "PhotoMetadata.c"
 	{
 		gchar** tag_collection = NULL;
 		gint tag_collection_length1 = 0;
 		gint _tag_collection_size_ = 0;
 		gint tag_it = 0;
-#line 650 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 762 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		tag_collection = _tmp0_;
-#line 650 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 762 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		tag_collection_length1 = _tmp0__length1;
-#line 650 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 762 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		for (tag_it = 0; tag_it < _tmp0__length1; tag_it = tag_it + 1) {
-#line 5284 "PhotoMetadata.c"
+#line 6197 "PhotoMetadata.c"
 			gchar* _tmp1_ = NULL;
 			gchar* tag = NULL;
-#line 650 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 762 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tmp1_ = g_strdup (tag_collection[tag_it]);
-#line 650 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 762 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			tag = _tmp1_;
-#line 5291 "PhotoMetadata.c"
+#line 6204 "PhotoMetadata.c"
 			{
 				const gchar* _tmp2_ = NULL;
-#line 651 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 763 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp2_ = tag;
-#line 651 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 763 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				photo_metadata_remove_tag (self, _tmp2_);
-#line 650 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 762 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_g_free0 (tag);
-#line 5300 "PhotoMetadata.c"
+#line 6213 "PhotoMetadata.c"
 			}
 		}
 	}
@@ -5310,68 +6223,68 @@ void photo_metadata_remove_tags (PhotoMetadata* self, gchar** tags, int tags_len
 
 void photo_metadata_clear_domain (PhotoMetadata* self, MetadataDomain domain) {
 	MetadataDomain _tmp0_ = 0;
-#line 654 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 766 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_if_fail (IS_PHOTO_METADATA (self));
-#line 655 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 767 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0_ = domain;
-#line 655 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 767 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	switch (_tmp0_) {
-#line 655 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 767 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		case METADATA_DOMAIN_EXIF:
-#line 5317 "PhotoMetadata.c"
+#line 6230 "PhotoMetadata.c"
 		{
 			GExiv2Metadata* _tmp1_ = NULL;
-#line 657 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 769 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tmp1_ = self->priv->exiv2;
-#line 657 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 769 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			gexiv2_metadata_clear_exif (_tmp1_);
-#line 658 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 770 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			break;
-#line 5326 "PhotoMetadata.c"
+#line 6239 "PhotoMetadata.c"
 		}
-#line 655 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 767 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		case METADATA_DOMAIN_XMP:
-#line 5330 "PhotoMetadata.c"
+#line 6243 "PhotoMetadata.c"
 		{
 			GExiv2Metadata* _tmp2_ = NULL;
-#line 661 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 773 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tmp2_ = self->priv->exiv2;
-#line 661 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 773 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			gexiv2_metadata_clear_xmp (_tmp2_);
-#line 662 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 774 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			break;
-#line 5339 "PhotoMetadata.c"
+#line 6252 "PhotoMetadata.c"
 		}
-#line 655 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 767 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		case METADATA_DOMAIN_IPTC:
-#line 5343 "PhotoMetadata.c"
+#line 6256 "PhotoMetadata.c"
 		{
 			GExiv2Metadata* _tmp3_ = NULL;
-#line 665 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 777 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tmp3_ = self->priv->exiv2;
-#line 665 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 777 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			gexiv2_metadata_clear_iptc (_tmp3_);
-#line 666 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 778 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			break;
-#line 5352 "PhotoMetadata.c"
+#line 6265 "PhotoMetadata.c"
 		}
 		default:
-#line 655 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 767 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		break;
-#line 5357 "PhotoMetadata.c"
+#line 6270 "PhotoMetadata.c"
 	}
 }
 
 
 void photo_metadata_clear (PhotoMetadata* self) {
 	GExiv2Metadata* _tmp0_ = NULL;
-#line 670 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 782 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_if_fail (IS_PHOTO_METADATA (self));
-#line 671 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 783 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0_ = self->priv->exiv2;
-#line 671 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 783 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	gexiv2_metadata_clear (_tmp0_);
-#line 5370 "PhotoMetadata.c"
+#line 6283 "PhotoMetadata.c"
 }
 
 
@@ -5380,58 +6293,58 @@ MetadataDateTime* photo_metadata_get_modification_date_time (PhotoMetadata* self
 	gchar** _tmp0_ = NULL;
 	gint _tmp0__length1 = 0;
 	MetadataDateTime* _tmp1_ = NULL;
-#line 680 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 793 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL);
-#line 681 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 794 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0_ = photo_metadata_DATE_TIME_TAGS;
-#line 681 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 794 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0__length1 = photo_metadata_DATE_TIME_TAGS_length1;
-#line 681 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 794 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp1_ = photo_metadata_get_first_date_time (self, _tmp0_, _tmp0__length1);
-#line 681 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 794 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	result = _tmp1_;
-#line 681 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 794 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 5391 "PhotoMetadata.c"
+#line 6304 "PhotoMetadata.c"
 }
 
 
 void photo_metadata_set_modification_date_time (PhotoMetadata* self, MetadataDateTime* date_time, PhotoMetadataSetOption option) {
 	MetadataDateTime* _tmp0_ = NULL;
-#line 684 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 797 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_if_fail (IS_PHOTO_METADATA (self));
-#line 684 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 797 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_if_fail ((date_time == NULL) || IS_METADATA_DATE_TIME (date_time));
-#line 686 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 799 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0_ = date_time;
-#line 686 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 799 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp0_ != NULL) {
-#line 5405 "PhotoMetadata.c"
+#line 6318 "PhotoMetadata.c"
 		gchar** _tmp1_ = NULL;
 		gint _tmp1__length1 = 0;
 		MetadataDateTime* _tmp2_ = NULL;
 		PhotoMetadataSetOption _tmp3_ = 0;
-#line 687 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 800 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp1_ = photo_metadata_DATE_TIME_TAGS;
-#line 687 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 800 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp1__length1 = photo_metadata_DATE_TIME_TAGS_length1;
-#line 687 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 800 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp2_ = date_time;
-#line 687 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 800 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp3_ = option;
-#line 687 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 800 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		photo_metadata_set_all_date_time (self, _tmp1_, _tmp1__length1, _tmp2_, _tmp3_);
-#line 5420 "PhotoMetadata.c"
+#line 6333 "PhotoMetadata.c"
 	} else {
 		gchar** _tmp4_ = NULL;
 		gint _tmp4__length1 = 0;
-#line 689 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 802 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp4_ = photo_metadata_DATE_TIME_TAGS;
-#line 689 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 802 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp4__length1 = photo_metadata_DATE_TIME_TAGS_length1;
-#line 689 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 802 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		photo_metadata_remove_tags (self, _tmp4_, _tmp4__length1);
-#line 5430 "PhotoMetadata.c"
+#line 6343 "PhotoMetadata.c"
 	}
 }
 
@@ -5441,58 +6354,58 @@ MetadataDateTime* photo_metadata_get_exposure_date_time (PhotoMetadata* self) {
 	gchar** _tmp0_ = NULL;
 	gint _tmp0__length1 = 0;
 	MetadataDateTime* _tmp1_ = NULL;
-#line 701 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 814 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL);
-#line 702 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 815 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0_ = photo_metadata_EXPOSURE_DATE_TIME_TAGS;
-#line 702 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 815 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0__length1 = photo_metadata_EXPOSURE_DATE_TIME_TAGS_length1;
-#line 702 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 815 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp1_ = photo_metadata_get_first_date_time (self, _tmp0_, _tmp0__length1);
-#line 702 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 815 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	result = _tmp1_;
-#line 702 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 815 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 5452 "PhotoMetadata.c"
+#line 6365 "PhotoMetadata.c"
 }
 
 
 void photo_metadata_set_exposure_date_time (PhotoMetadata* self, MetadataDateTime* date_time, PhotoMetadataSetOption option) {
 	MetadataDateTime* _tmp0_ = NULL;
-#line 705 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 818 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_if_fail (IS_PHOTO_METADATA (self));
-#line 705 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 818 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_if_fail ((date_time == NULL) || IS_METADATA_DATE_TIME (date_time));
-#line 707 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 820 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0_ = date_time;
-#line 707 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 820 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp0_ != NULL) {
-#line 5466 "PhotoMetadata.c"
+#line 6379 "PhotoMetadata.c"
 		gchar** _tmp1_ = NULL;
 		gint _tmp1__length1 = 0;
 		MetadataDateTime* _tmp2_ = NULL;
 		PhotoMetadataSetOption _tmp3_ = 0;
-#line 708 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 821 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp1_ = photo_metadata_EXPOSURE_DATE_TIME_TAGS;
-#line 708 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 821 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp1__length1 = photo_metadata_EXPOSURE_DATE_TIME_TAGS_length1;
-#line 708 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 821 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp2_ = date_time;
-#line 708 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 821 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp3_ = option;
-#line 708 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 821 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		photo_metadata_set_all_date_time (self, _tmp1_, _tmp1__length1, _tmp2_, _tmp3_);
-#line 5481 "PhotoMetadata.c"
+#line 6394 "PhotoMetadata.c"
 	} else {
 		gchar** _tmp4_ = NULL;
 		gint _tmp4__length1 = 0;
-#line 710 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 823 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp4_ = photo_metadata_EXPOSURE_DATE_TIME_TAGS;
-#line 710 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 823 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp4__length1 = photo_metadata_EXPOSURE_DATE_TIME_TAGS_length1;
-#line 710 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 823 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		photo_metadata_remove_tags (self, _tmp4_, _tmp4__length1);
-#line 5491 "PhotoMetadata.c"
+#line 6404 "PhotoMetadata.c"
 	}
 }
 
@@ -5502,58 +6415,58 @@ MetadataDateTime* photo_metadata_get_digitized_date_time (PhotoMetadata* self) {
 	gchar** _tmp0_ = NULL;
 	gint _tmp0__length1 = 0;
 	MetadataDateTime* _tmp1_ = NULL;
-#line 718 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 831 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL);
-#line 719 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 832 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0_ = photo_metadata_DIGITIZED_DATE_TIME_TAGS;
-#line 719 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 832 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0__length1 = photo_metadata_DIGITIZED_DATE_TIME_TAGS_length1;
-#line 719 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 832 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp1_ = photo_metadata_get_first_date_time (self, _tmp0_, _tmp0__length1);
-#line 719 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 832 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	result = _tmp1_;
-#line 719 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 832 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 5513 "PhotoMetadata.c"
+#line 6426 "PhotoMetadata.c"
 }
 
 
 void photo_metadata_set_digitized_date_time (PhotoMetadata* self, MetadataDateTime* date_time, PhotoMetadataSetOption option) {
 	MetadataDateTime* _tmp0_ = NULL;
-#line 722 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 835 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_if_fail (IS_PHOTO_METADATA (self));
-#line 722 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 835 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_if_fail ((date_time == NULL) || IS_METADATA_DATE_TIME (date_time));
-#line 724 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 837 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0_ = date_time;
-#line 724 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 837 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp0_ != NULL) {
-#line 5527 "PhotoMetadata.c"
+#line 6440 "PhotoMetadata.c"
 		gchar** _tmp1_ = NULL;
 		gint _tmp1__length1 = 0;
 		MetadataDateTime* _tmp2_ = NULL;
 		PhotoMetadataSetOption _tmp3_ = 0;
-#line 725 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 838 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp1_ = photo_metadata_DIGITIZED_DATE_TIME_TAGS;
-#line 725 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 838 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp1__length1 = photo_metadata_DIGITIZED_DATE_TIME_TAGS_length1;
-#line 725 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 838 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp2_ = date_time;
-#line 725 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 838 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp3_ = option;
-#line 725 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 838 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		photo_metadata_set_all_date_time (self, _tmp1_, _tmp1__length1, _tmp2_, _tmp3_);
-#line 5542 "PhotoMetadata.c"
+#line 6455 "PhotoMetadata.c"
 	} else {
 		gchar** _tmp4_ = NULL;
 		gint _tmp4__length1 = 0;
-#line 727 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 840 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp4_ = photo_metadata_DIGITIZED_DATE_TIME_TAGS;
-#line 727 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 840 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp4__length1 = photo_metadata_DIGITIZED_DATE_TIME_TAGS_length1;
-#line 727 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 840 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		photo_metadata_remove_tags (self, _tmp4_, _tmp4__length1);
-#line 5552 "PhotoMetadata.c"
+#line 6465 "PhotoMetadata.c"
 	}
 }
 
@@ -5564,38 +6477,38 @@ static MetadataDateTime* photo_metadata_real_get_creation_date_time (MediaMetada
 	MetadataDateTime* creation = NULL;
 	MetadataDateTime* _tmp0_ = NULL;
 	MetadataDateTime* _tmp1_ = NULL;
-#line 730 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 843 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO_METADATA, PhotoMetadata);
-#line 731 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 844 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0_ = photo_metadata_get_exposure_date_time (self);
-#line 731 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 844 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	creation = _tmp0_;
-#line 732 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 845 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp1_ = creation;
-#line 732 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 845 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp1_ == NULL) {
-#line 5573 "PhotoMetadata.c"
+#line 6486 "PhotoMetadata.c"
 		MetadataDateTime* _tmp2_ = NULL;
-#line 733 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 846 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp2_ = photo_metadata_get_digitized_date_time (self);
-#line 733 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 846 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_metadata_date_time_unref0 (creation);
-#line 733 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 846 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		creation = _tmp2_;
-#line 5581 "PhotoMetadata.c"
+#line 6494 "PhotoMetadata.c"
 	}
-#line 735 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 848 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	result = creation;
-#line 735 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 848 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 5587 "PhotoMetadata.c"
+#line 6500 "PhotoMetadata.c"
 }
 
 
 static gpointer _dimensions_dup0 (gpointer self) {
-#line 766 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 879 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return self ? dimensions_dup (self) : NULL;
-#line 5594 "PhotoMetadata.c"
+#line 6507 "PhotoMetadata.c"
 }
 
 
@@ -5605,31 +6518,31 @@ Dimensions* photo_metadata_get_pixel_dimensions (PhotoMetadata* self) {
 	gint _tmp0__length1 = 0;
 	gchar** _tmp1_ = NULL;
 	gint _tmp1__length1 = 0;
-#line 752 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 865 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL);
-#line 754 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 867 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0_ = photo_metadata_WIDTH_TAGS;
-#line 754 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 867 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0__length1 = photo_metadata_WIDTH_TAGS_length1;
-#line 754 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 867 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp1_ = photo_metadata_HEIGHT_TAGS;
-#line 754 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 867 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp1__length1 = photo_metadata_HEIGHT_TAGS_length1;
-#line 754 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 867 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_vala_assert (_tmp0__length1 == _tmp1__length1, "WIDTH_TAGS.length == HEIGHT_TAGS.length");
-#line 5616 "PhotoMetadata.c"
+#line 6529 "PhotoMetadata.c"
 	{
 		gint ctr = 0;
-#line 755 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 868 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		ctr = 0;
-#line 5621 "PhotoMetadata.c"
+#line 6534 "PhotoMetadata.c"
 		{
 			gboolean _tmp2_ = FALSE;
-#line 755 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 868 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tmp2_ = TRUE;
-#line 755 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 868 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			while (TRUE) {
-#line 5628 "PhotoMetadata.c"
+#line 6541 "PhotoMetadata.c"
 				gint _tmp4_ = 0;
 				gchar** _tmp5_ = NULL;
 				gint _tmp5__length1 = 0;
@@ -5651,99 +6564,99 @@ Dimensions* photo_metadata_get_pixel_dimensions (PhotoMetadata* self) {
 				glong _tmp17_ = 0L;
 				Dimensions _tmp18_ = {0};
 				Dimensions* _tmp19_ = NULL;
-#line 755 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 868 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				if (!_tmp2_) {
-#line 5652 "PhotoMetadata.c"
+#line 6565 "PhotoMetadata.c"
 					gint _tmp3_ = 0;
-#line 755 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 868 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_tmp3_ = ctr;
-#line 755 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 868 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					ctr = _tmp3_ + 1;
-#line 5658 "PhotoMetadata.c"
+#line 6571 "PhotoMetadata.c"
 				}
-#line 755 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 868 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp2_ = FALSE;
-#line 755 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 868 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp4_ = ctr;
-#line 755 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 868 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp5_ = photo_metadata_WIDTH_TAGS;
-#line 755 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 868 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp5__length1 = photo_metadata_WIDTH_TAGS_length1;
-#line 755 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 868 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				if (!(_tmp4_ < _tmp5__length1)) {
-#line 755 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 868 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					break;
-#line 5672 "PhotoMetadata.c"
+#line 6585 "PhotoMetadata.c"
 				}
-#line 759 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 872 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp6_ = photo_metadata_WIDTH_TAGS;
-#line 759 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 872 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp6__length1 = photo_metadata_WIDTH_TAGS_length1;
-#line 759 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 872 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp7_ = ctr;
-#line 759 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 872 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp8_ = _tmp6_[_tmp7_];
-#line 759 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 872 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp10_ = photo_metadata_get_long (self, _tmp8_, &_tmp9_);
-#line 759 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 872 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				width = _tmp9_;
-#line 759 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 872 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				if (!_tmp10_) {
-#line 760 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 873 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					continue;
-#line 5690 "PhotoMetadata.c"
+#line 6603 "PhotoMetadata.c"
 				}
-#line 763 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 876 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp11_ = photo_metadata_HEIGHT_TAGS;
-#line 763 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 876 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp11__length1 = photo_metadata_HEIGHT_TAGS_length1;
-#line 763 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 876 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp12_ = ctr;
-#line 763 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 876 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp13_ = _tmp11_[_tmp12_];
-#line 763 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 876 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp15_ = photo_metadata_get_long (self, _tmp13_, &_tmp14_);
-#line 763 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 876 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				height = _tmp14_;
-#line 763 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 876 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				if (!_tmp15_) {
-#line 764 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 877 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					continue;
-#line 5708 "PhotoMetadata.c"
+#line 6621 "PhotoMetadata.c"
 				}
-#line 766 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 879 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp16_ = width;
-#line 766 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 879 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp17_ = height;
-#line 766 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 879 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				dimensions_init (&_tmp18_, (gint) _tmp16_, (gint) _tmp17_);
-#line 766 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 879 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp19_ = _dimensions_dup0 (&_tmp18_);
-#line 766 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 879 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				result = _tmp19_;
-#line 766 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 879 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				return result;
-#line 5722 "PhotoMetadata.c"
+#line 6635 "PhotoMetadata.c"
 			}
 		}
 	}
-#line 769 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 882 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	result = NULL;
-#line 769 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 882 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 5730 "PhotoMetadata.c"
+#line 6643 "PhotoMetadata.c"
 }
 
 
 void photo_metadata_set_pixel_dimensions (PhotoMetadata* self, Dimensions* dim, PhotoMetadataSetOption option) {
 	Dimensions* _tmp0_ = NULL;
-#line 772 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 885 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_if_fail (IS_PHOTO_METADATA (self));
-#line 773 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 886 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0_ = dim;
-#line 773 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 886 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp0_ != NULL) {
-#line 5742 "PhotoMetadata.c"
+#line 6655 "PhotoMetadata.c"
 		gchar** _tmp1_ = NULL;
 		gint _tmp1__length1 = 0;
 		Dimensions* _tmp2_ = NULL;
@@ -5754,49 +6667,49 @@ void photo_metadata_set_pixel_dimensions (PhotoMetadata* self, Dimensions* dim,
 		Dimensions* _tmp6_ = NULL;
 		gint _tmp7_ = 0;
 		PhotoMetadataSetOption _tmp8_ = 0;
-#line 774 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 887 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp1_ = photo_metadata_WIDTH_TAGS;
-#line 774 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 887 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp1__length1 = photo_metadata_WIDTH_TAGS_length1;
-#line 774 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 887 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp2_ = dim;
-#line 774 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 887 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp3_ = (*_tmp2_).width;
-#line 774 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 887 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp4_ = option;
-#line 774 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 887 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		photo_metadata_set_all_long (self, _tmp1_, _tmp1__length1, (glong) _tmp3_, _tmp4_);
-#line 775 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 888 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp5_ = photo_metadata_HEIGHT_TAGS;
-#line 775 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 888 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp5__length1 = photo_metadata_HEIGHT_TAGS_length1;
-#line 775 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 888 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp6_ = dim;
-#line 775 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 888 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp7_ = (*_tmp6_).height;
-#line 775 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 888 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp8_ = option;
-#line 775 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 888 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		photo_metadata_set_all_long (self, _tmp5_, _tmp5__length1, (glong) _tmp7_, _tmp8_);
-#line 5777 "PhotoMetadata.c"
+#line 6690 "PhotoMetadata.c"
 	} else {
 		gchar** _tmp9_ = NULL;
 		gint _tmp9__length1 = 0;
 		gchar** _tmp10_ = NULL;
 		gint _tmp10__length1 = 0;
-#line 777 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 890 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp9_ = photo_metadata_WIDTH_TAGS;
-#line 777 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 890 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp9__length1 = photo_metadata_WIDTH_TAGS_length1;
-#line 777 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 890 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		photo_metadata_remove_tags (self, _tmp9_, _tmp9__length1);
-#line 778 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 891 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp10_ = photo_metadata_HEIGHT_TAGS;
-#line 778 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 891 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp10__length1 = photo_metadata_HEIGHT_TAGS_length1;
-#line 778 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 891 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		photo_metadata_remove_tags (self, _tmp10_, _tmp10__length1);
-#line 5795 "PhotoMetadata.c"
+#line 6708 "PhotoMetadata.c"
 	}
 }
 
@@ -5820,7 +6733,7 @@ static gchar* string_strip (const gchar* self) {
 	result = _result_;
 #line 1210 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
-#line 5819 "PhotoMetadata.c"
+#line 6732 "PhotoMetadata.c"
 }
 
 
@@ -5840,7 +6753,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 5839 "PhotoMetadata.c"
+#line 6752 "PhotoMetadata.c"
 }
 
 
@@ -5863,226 +6776,226 @@ static gchar* photo_metadata_real_get_title (MediaMetadata* base) {
 	const gchar* _tmp21_ = NULL;
 	gboolean _tmp22_ = FALSE;
 	gchar* _tmp28_ = NULL;
-#line 811 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 925 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO_METADATA, PhotoMetadata);
-#line 819 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 933 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp1_ = photo_metadata_has_tag (self, PHOTO_METADATA_IPHOTO_TITLE_TAG);
-#line 819 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 933 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp1_) {
-#line 5868 "PhotoMetadata.c"
+#line 6781 "PhotoMetadata.c"
 		GeeList* _tmp2_ = NULL;
-#line 820 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 934 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp2_ = photo_metadata_get_string_multiple (self, PHOTO_METADATA_IPHOTO_TITLE_TAG);
-#line 820 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 934 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_g_object_unref0 (_tmp0_);
-#line 820 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 934 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp0_ = _tmp2_;
-#line 5876 "PhotoMetadata.c"
+#line 6789 "PhotoMetadata.c"
 	} else {
 		gchar** _tmp3_ = NULL;
 		gint _tmp3__length1 = 0;
 		GeeList* _tmp4_ = NULL;
-#line 821 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 935 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp3_ = photo_metadata_STANDARD_TITLE_TAGS;
-#line 821 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 935 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp3__length1 = photo_metadata_STANDARD_TITLE_TAGS_length1;
-#line 821 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 935 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp4_ = photo_metadata_get_first_string_multiple (self, _tmp3_, _tmp3__length1);
-#line 821 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 935 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_g_object_unref0 (_tmp0_);
-#line 821 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 935 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp0_ = _tmp4_;
-#line 5891 "PhotoMetadata.c"
+#line 6804 "PhotoMetadata.c"
 	}
-#line 819 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 933 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp5_ = _g_object_ref0 (_tmp0_);
-#line 819 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 933 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	titles = _tmp5_;
-#line 826 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 940 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp8_ = titles;
-#line 826 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 940 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp8_ != NULL) {
-#line 5901 "PhotoMetadata.c"
+#line 6814 "PhotoMetadata.c"
 		GeeList* _tmp9_ = NULL;
 		gint _tmp10_ = 0;
 		gint _tmp11_ = 0;
-#line 826 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 940 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp9_ = titles;
-#line 826 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 940 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp10_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 826 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 940 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp11_ = _tmp10_;
-#line 826 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 940 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp7_ = _tmp11_ > 0;
-#line 5913 "PhotoMetadata.c"
+#line 6826 "PhotoMetadata.c"
 	} else {
-#line 826 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 940 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp7_ = FALSE;
-#line 5917 "PhotoMetadata.c"
+#line 6830 "PhotoMetadata.c"
 	}
-#line 826 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 940 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp7_) {
-#line 5921 "PhotoMetadata.c"
+#line 6834 "PhotoMetadata.c"
 		GeeList* _tmp12_ = NULL;
 		gpointer _tmp13_ = NULL;
-#line 826 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 940 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp12_ = titles;
-#line 826 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 940 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp13_ = gee_list_get (_tmp12_, 0);
-#line 826 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 940 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_g_free0 (_tmp6_);
-#line 826 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 940 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp6_ = (gchar*) _tmp13_;
-#line 5932 "PhotoMetadata.c"
+#line 6845 "PhotoMetadata.c"
 	} else {
-#line 826 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 940 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_g_free0 (_tmp6_);
-#line 826 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 940 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp6_ = NULL;
-#line 5938 "PhotoMetadata.c"
+#line 6851 "PhotoMetadata.c"
 	}
-#line 826 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 940 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp14_ = g_strdup (_tmp6_);
-#line 826 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 940 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	title = _tmp14_;
-#line 829 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 943 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp15_ = title;
-#line 829 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 943 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp15_ != NULL) {
-#line 5948 "PhotoMetadata.c"
+#line 6861 "PhotoMetadata.c"
 		const gchar* _tmp16_ = NULL;
 		gchar* _tmp17_ = NULL;
-#line 830 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 944 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp16_ = title;
-#line 830 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 944 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp17_ = string_strip (_tmp16_);
-#line 830 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 944 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_g_free0 (title);
-#line 830 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 944 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		title = _tmp17_;
-#line 5959 "PhotoMetadata.c"
+#line 6872 "PhotoMetadata.c"
 	}
-#line 833 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 947 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp21_ = title;
-#line 833 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 947 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp22_ = is_string_empty (_tmp21_);
-#line 833 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 947 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (!_tmp22_) {
-#line 5967 "PhotoMetadata.c"
+#line 6880 "PhotoMetadata.c"
 		const gchar* _tmp23_ = NULL;
 		gboolean _tmp24_ = FALSE;
-#line 833 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 947 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp23_ = title;
-#line 833 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 947 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp24_ = string_contains (_tmp23_, "\n");
-#line 833 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 947 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp20_ = !_tmp24_;
-#line 5976 "PhotoMetadata.c"
+#line 6889 "PhotoMetadata.c"
 	} else {
-#line 833 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 947 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp20_ = FALSE;
-#line 5980 "PhotoMetadata.c"
+#line 6893 "PhotoMetadata.c"
 	}
-#line 833 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 947 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp20_) {
-#line 5984 "PhotoMetadata.c"
+#line 6897 "PhotoMetadata.c"
 		const gchar* _tmp25_ = NULL;
 		gboolean _tmp26_ = FALSE;
-#line 833 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 947 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp25_ = title;
-#line 833 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 947 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp26_ = string_contains (_tmp25_, "\r");
-#line 833 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 947 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp19_ = !_tmp26_;
-#line 5993 "PhotoMetadata.c"
+#line 6906 "PhotoMetadata.c"
 	} else {
-#line 833 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 947 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp19_ = FALSE;
-#line 5997 "PhotoMetadata.c"
+#line 6910 "PhotoMetadata.c"
 	}
-#line 833 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 947 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp19_) {
-#line 6001 "PhotoMetadata.c"
+#line 6914 "PhotoMetadata.c"
 		const gchar* _tmp27_ = NULL;
-#line 834 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 948 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp27_ = title;
-#line 834 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 948 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp18_ = _tmp27_;
-#line 6007 "PhotoMetadata.c"
+#line 6920 "PhotoMetadata.c"
 	} else {
-#line 834 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 948 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp18_ = NULL;
-#line 6011 "PhotoMetadata.c"
+#line 6924 "PhotoMetadata.c"
 	}
-#line 833 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 947 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp28_ = g_strdup (_tmp18_);
-#line 833 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 947 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	result = _tmp28_;
-#line 833 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 947 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_g_free0 (title);
-#line 833 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 947 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_g_free0 (_tmp6_);
-#line 833 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 947 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_g_object_unref0 (titles);
-#line 833 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 947 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_g_object_unref0 (_tmp0_);
-#line 833 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 947 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 6027 "PhotoMetadata.c"
+#line 6940 "PhotoMetadata.c"
 }
 
 
 void photo_metadata_set_title (PhotoMetadata* self, const gchar* title, PhotoMetadataSetOption option) {
 	const gchar* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
-#line 837 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 951 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_if_fail (IS_PHOTO_METADATA (self));
-#line 838 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 952 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0_ = title;
-#line 838 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 952 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp1_ = is_string_empty (_tmp0_);
-#line 838 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 952 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (!_tmp1_) {
-#line 6042 "PhotoMetadata.c"
+#line 6955 "PhotoMetadata.c"
 		gboolean _tmp2_ = FALSE;
-#line 839 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 953 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp2_ = photo_metadata_has_tag (self, PHOTO_METADATA_IPHOTO_TITLE_TAG);
-#line 839 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 953 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		if (_tmp2_) {
-#line 6048 "PhotoMetadata.c"
+#line 6961 "PhotoMetadata.c"
 			const gchar* _tmp3_ = NULL;
-#line 840 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 954 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tmp3_ = title;
-#line 840 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 954 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			photo_metadata_set_string (self, PHOTO_METADATA_IPHOTO_TITLE_TAG, _tmp3_, PHOTO_METADATA_PREPARE_STRING_OPTIONS);
-#line 6054 "PhotoMetadata.c"
+#line 6967 "PhotoMetadata.c"
 		} else {
 			gchar** _tmp4_ = NULL;
 			gint _tmp4__length1 = 0;
 			const gchar* _tmp5_ = NULL;
 			PhotoMetadataSetOption _tmp6_ = 0;
-#line 842 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 956 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tmp4_ = photo_metadata_STANDARD_TITLE_TAGS;
-#line 842 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 956 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tmp4__length1 = photo_metadata_STANDARD_TITLE_TAGS_length1;
-#line 842 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 956 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tmp5_ = title;
-#line 842 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 956 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tmp6_ = option;
-#line 842 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 956 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			photo_metadata_set_all_string (self, _tmp4_, _tmp4__length1, _tmp5_, _tmp6_);
-#line 6070 "PhotoMetadata.c"
+#line 6983 "PhotoMetadata.c"
 		}
 	} else {
 		gchar** _tmp7_ = NULL;
 		gint _tmp7__length1 = 0;
-#line 844 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 958 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp7_ = photo_metadata_STANDARD_TITLE_TAGS;
-#line 844 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 958 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp7__length1 = photo_metadata_STANDARD_TITLE_TAGS_length1;
-#line 844 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 958 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		photo_metadata_remove_tags (self, _tmp7_, _tmp7__length1);
-#line 6081 "PhotoMetadata.c"
+#line 6994 "PhotoMetadata.c"
 	}
 }
 
@@ -6090,41 +7003,62 @@ void photo_metadata_set_title (PhotoMetadata* self, const gchar* title, PhotoMet
 static gchar* photo_metadata_real_get_comment (MediaMetadata* base) {
 	PhotoMetadata * self;
 	gchar* result = NULL;
-	gchar* _tmp0_ = NULL;
-#line 848 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	gchar** _tmp0_ = NULL;
+	gint _tmp0__length1 = 0;
+	gchar* _tmp1_ = NULL;
+#line 967 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO_METADATA, PhotoMetadata);
-#line 849 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-	_tmp0_ = photo_metadata_get_string_interpreted (self, "Exif.Photo.UserComment", PREPARE_INPUT_TEXT_OPTIONS_DEFAULT & (~PREPARE_INPUT_TEXT_OPTIONS_STRIP_CRLF));
-#line 849 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-	result = _tmp0_;
-#line 849 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 968 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	_tmp0_ = photo_metadata_COMMENT_TAGS;
+#line 968 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	_tmp0__length1 = photo_metadata_COMMENT_TAGS_length1;
+#line 968 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	_tmp1_ = photo_metadata_get_first_string_interpreted (self, _tmp0_, _tmp0__length1);
+#line 968 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	result = _tmp1_;
+#line 968 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 6098 "PhotoMetadata.c"
+#line 7017 "PhotoMetadata.c"
 }
 
 
-void photo_metadata_set_comment (PhotoMetadata* self, const gchar* comment) {
+void photo_metadata_set_comment (PhotoMetadata* self, const gchar* comment, PhotoMetadataSetOption option) {
 	const gchar* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
-#line 852 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 971 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_if_fail (IS_PHOTO_METADATA (self));
-#line 853 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 973 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0_ = comment;
-#line 853 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 973 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp1_ = is_string_empty (_tmp0_);
-#line 853 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 973 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (!_tmp1_) {
-#line 6113 "PhotoMetadata.c"
-		const gchar* _tmp2_ = NULL;
-#line 854 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-		_tmp2_ = comment;
-#line 854 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-		photo_metadata_set_string (self, "Exif.Photo.UserComment", _tmp2_, PREPARE_INPUT_TEXT_OPTIONS_DEFAULT & (~PREPARE_INPUT_TEXT_OPTIONS_STRIP_CRLF));
-#line 6119 "PhotoMetadata.c"
+#line 7032 "PhotoMetadata.c"
+		gchar** _tmp2_ = NULL;
+		gint _tmp2__length1 = 0;
+		const gchar* _tmp3_ = NULL;
+		PhotoMetadataSetOption _tmp4_ = 0;
+#line 974 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+		_tmp2_ = photo_metadata_COMMENT_TAGS;
+#line 974 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+		_tmp2__length1 = photo_metadata_COMMENT_TAGS_length1;
+#line 974 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+		_tmp3_ = comment;
+#line 974 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+		_tmp4_ = option;
+#line 974 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+		photo_metadata_set_all_string (self, _tmp2_, _tmp2__length1, _tmp3_, _tmp4_);
+#line 7047 "PhotoMetadata.c"
 	} else {
-#line 856 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-		photo_metadata_remove_tag (self, "Exif.Photo.UserComment");
-#line 6123 "PhotoMetadata.c"
+		gchar** _tmp5_ = NULL;
+		gint _tmp5__length1 = 0;
+#line 976 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+		_tmp5_ = photo_metadata_COMMENT_TAGS;
+#line 976 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+		_tmp5__length1 = photo_metadata_COMMENT_TAGS_length1;
+#line 976 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+		photo_metadata_remove_tags (self, _tmp5_, _tmp5__length1);
+#line 7057 "PhotoMetadata.c"
 	}
 }
 
@@ -6138,110 +7072,110 @@ GeeSet* photo_metadata_get_keywords (PhotoMetadata* self, GCompareDataFunc compa
 	gboolean _tmp23_ = FALSE;
 	GeeSet* _tmp24_ = NULL;
 	GeeSet* _tmp29_ = NULL;
-#line 872 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 996 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL);
-#line 873 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 997 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	keywords = NULL;
-#line 874 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 998 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0_ = photo_metadata_KEYWORD_TAGS;
-#line 874 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 998 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0__length1 = photo_metadata_KEYWORD_TAGS_length1;
-#line 6145 "PhotoMetadata.c"
+#line 7079 "PhotoMetadata.c"
 	{
 		gchar** tag_collection = NULL;
 		gint tag_collection_length1 = 0;
 		gint _tag_collection_size_ = 0;
 		gint tag_it = 0;
-#line 874 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 998 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		tag_collection = _tmp0_;
-#line 874 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 998 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		tag_collection_length1 = _tmp0__length1;
-#line 874 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 998 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		for (tag_it = 0; tag_it < _tmp0__length1; tag_it = tag_it + 1) {
-#line 6157 "PhotoMetadata.c"
+#line 7091 "PhotoMetadata.c"
 			gchar* _tmp1_ = NULL;
 			gchar* tag = NULL;
-#line 874 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 998 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tmp1_ = g_strdup (tag_collection[tag_it]);
-#line 874 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 998 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			tag = _tmp1_;
-#line 6164 "PhotoMetadata.c"
+#line 7098 "PhotoMetadata.c"
 			{
 				GeeCollection* values = NULL;
 				const gchar* _tmp2_ = NULL;
 				GeeList* _tmp3_ = NULL;
 				gboolean _tmp4_ = FALSE;
 				GeeCollection* _tmp5_ = NULL;
-#line 875 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 999 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp2_ = tag;
-#line 875 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 999 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp3_ = photo_metadata_get_string_multiple (self, _tmp2_);
-#line 875 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 999 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				values = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 876 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1000 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp5_ = values;
-#line 876 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1000 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				if (_tmp5_ != NULL) {
-#line 6181 "PhotoMetadata.c"
+#line 7115 "PhotoMetadata.c"
 					GeeCollection* _tmp6_ = NULL;
 					gint _tmp7_ = 0;
 					gint _tmp8_ = 0;
-#line 876 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1000 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_tmp6_ = values;
-#line 876 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1000 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_tmp7_ = gee_collection_get_size (_tmp6_);
-#line 876 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1000 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_tmp8_ = _tmp7_;
-#line 876 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1000 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_tmp4_ = _tmp8_ > 0;
-#line 6193 "PhotoMetadata.c"
+#line 7127 "PhotoMetadata.c"
 				} else {
-#line 876 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1000 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_tmp4_ = FALSE;
-#line 6197 "PhotoMetadata.c"
+#line 7131 "PhotoMetadata.c"
 				}
-#line 876 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1000 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				if (_tmp4_) {
-#line 6201 "PhotoMetadata.c"
+#line 7135 "PhotoMetadata.c"
 					GeeSet* _tmp9_ = NULL;
-#line 877 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1001 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_tmp9_ = keywords;
-#line 877 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1001 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					if (_tmp9_ == NULL) {
-#line 6207 "PhotoMetadata.c"
+#line 7141 "PhotoMetadata.c"
 						GCompareDataFunc _tmp10_ = NULL;
 						void* _tmp10__target = NULL;
 						GDestroyNotify _tmp10__target_destroy_notify = NULL;
 						GeeSet* _tmp11_ = NULL;
-#line 878 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1002 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 						_tmp10_ = compare_func;
-#line 878 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1002 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 						_tmp10__target = compare_func_target;
-#line 878 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1002 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 						_tmp10__target_destroy_notify = compare_func_target_destroy_notify;
-#line 878 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1002 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 						compare_func_target_destroy_notify = NULL;
-#line 878 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1002 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 						_tmp11_ = photo_metadata_create_string_set (self, _tmp10_, _tmp10__target, _tmp10__target_destroy_notify);
-#line 878 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1002 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 						_g_object_unref0 (keywords);
-#line 878 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1002 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 						keywords = _tmp11_;
-#line 6226 "PhotoMetadata.c"
+#line 7160 "PhotoMetadata.c"
 					}
 					{
 						GeeIterator* _current_value_it = NULL;
 						GeeCollection* _tmp12_ = NULL;
 						GeeIterator* _tmp13_ = NULL;
-#line 880 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1004 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 						_tmp12_ = values;
-#line 880 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1004 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 						_tmp13_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 880 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1004 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 						_current_value_it = _tmp13_;
-#line 880 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1004 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 						while (TRUE) {
-#line 6240 "PhotoMetadata.c"
+#line 7174 "PhotoMetadata.c"
 							GeeIterator* _tmp14_ = NULL;
 							gboolean _tmp15_ = FALSE;
 							gchar* current_value = NULL;
@@ -6251,111 +7185,111 @@ GeeSet* photo_metadata_get_keywords (PhotoMetadata* self, GCompareDataFunc compa
 							const gchar* _tmp19_ = NULL;
 							gchar* _tmp20_ = NULL;
 							gchar* _tmp21_ = NULL;
-#line 880 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1004 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 							_tmp14_ = _current_value_it;
-#line 880 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1004 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 							_tmp15_ = gee_iterator_next (_tmp14_);
-#line 880 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1004 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 							if (!_tmp15_) {
-#line 880 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1004 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 								break;
-#line 6258 "PhotoMetadata.c"
+#line 7192 "PhotoMetadata.c"
 							}
-#line 880 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1004 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 							_tmp16_ = _current_value_it;
-#line 880 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1004 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 							_tmp17_ = gee_iterator_get (_tmp16_);
-#line 880 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1004 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 							current_value = (gchar*) _tmp17_;
-#line 881 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1005 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 							_tmp18_ = keywords;
-#line 881 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1005 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 							_tmp19_ = current_value;
-#line 881 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1005 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 							_tmp20_ = hierarchical_tag_utilities_make_flat_tag_safe (_tmp19_);
-#line 881 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1005 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 							_tmp21_ = _tmp20_;
-#line 881 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1005 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 							gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_COLLECTION, GeeCollection), _tmp21_);
-#line 881 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1005 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 							_g_free0 (_tmp21_);
-#line 880 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1004 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 							_g_free0 (current_value);
-#line 6280 "PhotoMetadata.c"
+#line 7214 "PhotoMetadata.c"
 						}
-#line 880 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1004 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 						_g_object_unref0 (_current_value_it);
-#line 6284 "PhotoMetadata.c"
+#line 7218 "PhotoMetadata.c"
 					}
 				}
-#line 874 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 998 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_g_object_unref0 (values);
-#line 874 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 998 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_g_free0 (tag);
-#line 6291 "PhotoMetadata.c"
+#line 7225 "PhotoMetadata.c"
 			}
 		}
 	}
-#line 885 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1009 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp24_ = keywords;
-#line 885 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1009 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp24_ != NULL) {
-#line 6299 "PhotoMetadata.c"
+#line 7233 "PhotoMetadata.c"
 		GeeSet* _tmp25_ = NULL;
 		gint _tmp26_ = 0;
 		gint _tmp27_ = 0;
-#line 885 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1009 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp25_ = keywords;
-#line 885 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1009 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp26_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 885 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1009 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp27_ = _tmp26_;
-#line 885 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1009 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp23_ = _tmp27_ > 0;
-#line 6311 "PhotoMetadata.c"
+#line 7245 "PhotoMetadata.c"
 	} else {
-#line 885 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1009 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp23_ = FALSE;
-#line 6315 "PhotoMetadata.c"
+#line 7249 "PhotoMetadata.c"
 	}
-#line 885 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1009 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp23_) {
-#line 6319 "PhotoMetadata.c"
+#line 7253 "PhotoMetadata.c"
 		GeeSet* _tmp28_ = NULL;
-#line 885 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1009 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp28_ = keywords;
-#line 885 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1009 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp22_ = _tmp28_;
-#line 6325 "PhotoMetadata.c"
+#line 7259 "PhotoMetadata.c"
 	} else {
-#line 885 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1009 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp22_ = NULL;
-#line 6329 "PhotoMetadata.c"
+#line 7263 "PhotoMetadata.c"
 	}
-#line 885 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1009 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp29_ = _g_object_ref0 (_tmp22_);
-#line 885 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1009 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	result = _tmp29_;
-#line 885 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1009 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_g_object_unref0 (keywords);
-#line 885 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1009 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	(compare_func_target_destroy_notify == NULL) ? NULL : (compare_func_target_destroy_notify (compare_func_target), NULL);
-#line 885 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1009 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	compare_func = NULL;
-#line 885 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1009 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	compare_func_target = NULL;
-#line 885 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1009 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	compare_func_target_destroy_notify = NULL;
-#line 885 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1009 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 6347 "PhotoMetadata.c"
+#line 7281 "PhotoMetadata.c"
 }
 
 
 static gpointer _hierarchical_keyword_field_ref0 (gpointer self) {
-#line 889 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1013 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return self ? hierarchical_keyword_field_ref (self) : NULL;
-#line 6354 "PhotoMetadata.c"
+#line 7288 "PhotoMetadata.c"
 }
 
 
@@ -6368,7 +7302,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 6367 "PhotoMetadata.c"
+#line 7301 "PhotoMetadata.c"
 	{
 		GRegex* regex = NULL;
 		const gchar* _tmp0_ = NULL;
@@ -6399,7 +7333,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
-#line 6398 "PhotoMetadata.c"
+#line 7332 "PhotoMetadata.c"
 				goto __catch25_g_regex_error;
 			}
 #line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -6408,7 +7342,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 6407 "PhotoMetadata.c"
+#line 7341 "PhotoMetadata.c"
 		}
 #line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp6_ = regex;
@@ -6424,7 +7358,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 			_g_regex_unref0 (regex);
 #line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
-#line 6423 "PhotoMetadata.c"
+#line 7357 "PhotoMetadata.c"
 				goto __catch25_g_regex_error;
 			}
 #line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -6435,7 +7369,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 6434 "PhotoMetadata.c"
+#line 7368 "PhotoMetadata.c"
 		}
 #line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp9_ = _tmp5_;
@@ -6449,7 +7383,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		_g_regex_unref0 (regex);
 #line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return result;
-#line 6448 "PhotoMetadata.c"
+#line 7382 "PhotoMetadata.c"
 	}
 	goto __finally25;
 	__catch25_g_regex_error:
@@ -6463,7 +7397,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		g_assert_not_reached ();
 #line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_g_error_free0 (e);
-#line 6462 "PhotoMetadata.c"
+#line 7396 "PhotoMetadata.c"
 	}
 	__finally25:
 #line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -6474,7 +7408,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 6473 "PhotoMetadata.c"
+#line 7407 "PhotoMetadata.c"
 	}
 }
 
@@ -6498,7 +7432,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 6497 "PhotoMetadata.c"
+#line 7431 "PhotoMetadata.c"
 		glong _tmp4_ = 0L;
 #line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp4_ = maxlen;
@@ -6506,7 +7440,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 6505 "PhotoMetadata.c"
+#line 7439 "PhotoMetadata.c"
 	} else {
 		gchar* _tmp5_ = NULL;
 		gchar* _tmp6_ = NULL;
@@ -6518,7 +7452,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 6517 "PhotoMetadata.c"
+#line 7451 "PhotoMetadata.c"
 	}
 }
 
@@ -6542,21 +7476,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 6541 "PhotoMetadata.c"
+#line 7475 "PhotoMetadata.c"
 		glong _tmp2_ = 0L;
 #line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp2_ = len;
 #line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp0_ = _tmp2_ >= ((glong) 0);
-#line 6547 "PhotoMetadata.c"
+#line 7481 "PhotoMetadata.c"
 	} else {
 #line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp0_ = FALSE;
-#line 6551 "PhotoMetadata.c"
+#line 7485 "PhotoMetadata.c"
 	}
 #line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp0_) {
-#line 6555 "PhotoMetadata.c"
+#line 7489 "PhotoMetadata.c"
 		glong _tmp3_ = 0L;
 		glong _tmp4_ = 0L;
 		glong _tmp5_ = 0L;
@@ -6568,7 +7502,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 6567 "PhotoMetadata.c"
+#line 7501 "PhotoMetadata.c"
 	} else {
 		gint _tmp6_ = 0;
 		gint _tmp7_ = 0;
@@ -6578,13 +7512,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 6577 "PhotoMetadata.c"
+#line 7511 "PhotoMetadata.c"
 	}
 #line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp8_ = offset;
 #line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp8_ < ((glong) 0)) {
-#line 6583 "PhotoMetadata.c"
+#line 7517 "PhotoMetadata.c"
 		glong _tmp9_ = 0L;
 		glong _tmp10_ = 0L;
 		glong _tmp11_ = 0L;
@@ -6598,7 +7532,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 6597 "PhotoMetadata.c"
+#line 7531 "PhotoMetadata.c"
 	} else {
 		glong _tmp12_ = 0L;
 		glong _tmp13_ = 0L;
@@ -6608,13 +7542,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 6607 "PhotoMetadata.c"
+#line 7541 "PhotoMetadata.c"
 	}
 #line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp14_ = len;
 #line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp14_ < ((glong) 0)) {
-#line 6613 "PhotoMetadata.c"
+#line 7547 "PhotoMetadata.c"
 		glong _tmp15_ = 0L;
 		glong _tmp16_ = 0L;
 #line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -6623,7 +7557,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 6622 "PhotoMetadata.c"
+#line 7556 "PhotoMetadata.c"
 	}
 #line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp17_ = offset;
@@ -6643,7 +7577,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 6642 "PhotoMetadata.c"
+#line 7576 "PhotoMetadata.c"
 }
 
 
@@ -6653,81 +7587,81 @@ static void photo_metadata_internal_set_hierarchical_keywords (PhotoMetadata* se
 	HierarchicalTagIndex* _tmp4_ = NULL;
 	HierarchicalKeywordField** _tmp5_ = NULL;
 	gint _tmp5__length1 = 0;
-#line 888 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1012 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_if_fail (IS_PHOTO_METADATA (self));
-#line 888 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1012 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_if_fail ((index == NULL) || IS_HIERARCHICAL_TAG_INDEX (index));
-#line 889 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1013 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0_ = photo_metadata_HIERARCHICAL_KEYWORD_TAGS;
-#line 889 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1013 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0__length1 = photo_metadata_HIERARCHICAL_KEYWORD_TAGS_length1;
-#line 6660 "PhotoMetadata.c"
+#line 7594 "PhotoMetadata.c"
 	{
 		HierarchicalKeywordField** current_field_collection = NULL;
 		gint current_field_collection_length1 = 0;
 		gint _current_field_collection_size_ = 0;
 		gint current_field_it = 0;
-#line 889 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1013 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		current_field_collection = _tmp0_;
-#line 889 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1013 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		current_field_collection_length1 = _tmp0__length1;
-#line 889 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1013 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		for (current_field_it = 0; current_field_it < _tmp0__length1; current_field_it = current_field_it + 1) {
-#line 6672 "PhotoMetadata.c"
+#line 7606 "PhotoMetadata.c"
 			HierarchicalKeywordField* _tmp1_ = NULL;
 			HierarchicalKeywordField* current_field = NULL;
-#line 889 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1013 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tmp1_ = _hierarchical_keyword_field_ref0 (current_field_collection[current_field_it]);
-#line 889 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1013 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			current_field = _tmp1_;
-#line 6679 "PhotoMetadata.c"
+#line 7613 "PhotoMetadata.c"
 			{
 				HierarchicalKeywordField* _tmp2_ = NULL;
 				const gchar* _tmp3_ = NULL;
-#line 890 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1014 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp2_ = current_field;
-#line 890 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1014 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp3_ = _tmp2_->field_name;
-#line 890 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1014 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				photo_metadata_remove_tag (self, _tmp3_);
-#line 889 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1013 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_hierarchical_keyword_field_unref0 (current_field);
-#line 6691 "PhotoMetadata.c"
+#line 7625 "PhotoMetadata.c"
 			}
 		}
 	}
-#line 892 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1016 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp4_ = index;
-#line 892 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1016 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp4_ == NULL) {
-#line 893 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1017 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		return;
-#line 6701 "PhotoMetadata.c"
+#line 7635 "PhotoMetadata.c"
 	}
-#line 895 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1019 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp5_ = photo_metadata_HIERARCHICAL_KEYWORD_TAGS;
-#line 895 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1019 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp5__length1 = photo_metadata_HIERARCHICAL_KEYWORD_TAGS_length1;
-#line 6707 "PhotoMetadata.c"
+#line 7641 "PhotoMetadata.c"
 	{
 		HierarchicalKeywordField** current_field_collection = NULL;
 		gint current_field_collection_length1 = 0;
 		gint _current_field_collection_size_ = 0;
 		gint current_field_it = 0;
-#line 895 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1019 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		current_field_collection = _tmp5_;
-#line 895 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1019 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		current_field_collection_length1 = _tmp5__length1;
-#line 895 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1019 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		for (current_field_it = 0; current_field_it < _tmp5__length1; current_field_it = current_field_it + 1) {
-#line 6719 "PhotoMetadata.c"
+#line 7653 "PhotoMetadata.c"
 			HierarchicalKeywordField* _tmp6_ = NULL;
 			HierarchicalKeywordField* current_field = NULL;
-#line 895 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1019 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tmp6_ = _hierarchical_keyword_field_ref0 (current_field_collection[current_field_it]);
-#line 895 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1019 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			current_field = _tmp6_;
-#line 6726 "PhotoMetadata.c"
+#line 7660 "PhotoMetadata.c"
 			{
 				HierarchicalKeywordField* _tmp7_ = NULL;
 				gboolean _tmp8_ = FALSE;
@@ -6736,23 +7670,23 @@ static void photo_metadata_internal_set_hierarchical_keywords (PhotoMetadata* se
 				HierarchicalKeywordField* _tmp29_ = NULL;
 				const gchar* _tmp30_ = NULL;
 				GeeSet* _tmp31_ = NULL;
-#line 896 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1020 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp7_ = current_field;
-#line 896 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1020 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp8_ = _tmp7_->is_writeable;
-#line 896 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1020 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				if (!_tmp8_) {
-#line 897 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1021 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_hierarchical_keyword_field_unref0 (current_field);
-#line 897 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1021 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					continue;
-#line 6745 "PhotoMetadata.c"
+#line 7679 "PhotoMetadata.c"
 				}
-#line 899 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1023 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp9_ = gee_tree_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, NULL, NULL, NULL);
-#line 899 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1023 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				writeable_set = G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_SET, GeeSet);
-#line 6751 "PhotoMetadata.c"
+#line 7685 "PhotoMetadata.c"
 				{
 					GeeIterator* _current_path_it = NULL;
 					HierarchicalTagIndex* _tmp10_ = NULL;
@@ -6760,23 +7694,23 @@ static void photo_metadata_internal_set_hierarchical_keywords (PhotoMetadata* se
 					GeeCollection* _tmp12_ = NULL;
 					GeeIterator* _tmp13_ = NULL;
 					GeeIterator* _tmp14_ = NULL;
-#line 901 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1025 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_tmp10_ = index;
-#line 901 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1025 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_tmp11_ = hierarchical_tag_index_get_all_paths (_tmp10_);
-#line 901 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1025 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_tmp12_ = _tmp11_;
-#line 901 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1025 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_tmp13_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 901 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1025 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_tmp14_ = _tmp13_;
-#line 901 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1025 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_g_object_unref0 (_tmp12_);
-#line 901 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1025 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_current_path_it = _tmp14_;
-#line 901 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1025 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					while (TRUE) {
-#line 6775 "PhotoMetadata.c"
+#line 7709 "PhotoMetadata.c"
 						GeeIterator* _tmp15_ = NULL;
 						gboolean _tmp16_ = FALSE;
 						gchar* current_path = NULL;
@@ -6791,80 +7725,80 @@ static void photo_metadata_internal_set_hierarchical_keywords (PhotoMetadata* se
 						gboolean _tmp24_ = FALSE;
 						GeeSet* _tmp27_ = NULL;
 						const gchar* _tmp28_ = NULL;
-#line 901 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1025 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 						_tmp15_ = _current_path_it;
-#line 901 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1025 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 						_tmp16_ = gee_iterator_next (_tmp15_);
-#line 901 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1025 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 						if (!_tmp16_) {
-#line 901 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1025 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 							break;
-#line 6798 "PhotoMetadata.c"
+#line 7732 "PhotoMetadata.c"
 						}
-#line 901 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1025 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 						_tmp17_ = _current_path_it;
-#line 901 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1025 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 						_tmp18_ = gee_iterator_get (_tmp17_);
-#line 901 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1025 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 						current_path = (gchar*) _tmp18_;
-#line 902 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1026 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 						_tmp19_ = current_path;
-#line 902 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1026 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 						_tmp20_ = current_field;
-#line 902 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1026 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 						_tmp21_ = _tmp20_->path_separator;
-#line 902 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1026 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 						_tmp22_ = string_replace (_tmp19_, TAG_PATH_SEPARATOR_STRING, _tmp21_);
-#line 902 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1026 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 						writeable_path = _tmp22_;
-#line 904 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1028 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 						_tmp23_ = current_field;
-#line 904 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1028 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 						_tmp24_ = _tmp23_->wants_leading_separator;
-#line 904 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1028 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 						if (!_tmp24_) {
-#line 6822 "PhotoMetadata.c"
+#line 7756 "PhotoMetadata.c"
 							const gchar* _tmp25_ = NULL;
 							gchar* _tmp26_ = NULL;
-#line 905 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1029 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 							_tmp25_ = writeable_path;
-#line 905 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1029 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 							_tmp26_ = string_substring (_tmp25_, (glong) 1, (glong) -1);
-#line 905 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1029 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 							_g_free0 (writeable_path);
-#line 905 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1029 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 							writeable_path = _tmp26_;
-#line 6833 "PhotoMetadata.c"
+#line 7767 "PhotoMetadata.c"
 						}
-#line 907 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1031 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 						_tmp27_ = writeable_set;
-#line 907 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1031 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 						_tmp28_ = writeable_path;
-#line 907 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1031 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 						gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, GEE_TYPE_COLLECTION, GeeCollection), _tmp28_);
-#line 901 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1025 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 						_g_free0 (writeable_path);
-#line 901 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1025 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 						_g_free0 (current_path);
-#line 6845 "PhotoMetadata.c"
+#line 7779 "PhotoMetadata.c"
 					}
-#line 901 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1025 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_g_object_unref0 (_current_path_it);
-#line 6849 "PhotoMetadata.c"
+#line 7783 "PhotoMetadata.c"
 				}
-#line 910 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1034 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp29_ = current_field;
-#line 910 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1034 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp30_ = _tmp29_->field_name;
-#line 910 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1034 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp31_ = writeable_set;
-#line 910 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1034 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				photo_metadata_set_string_multiple (self, _tmp30_, G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 895 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1019 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_g_object_unref0 (writeable_set);
-#line 895 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1019 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_hierarchical_keyword_field_unref0 (current_field);
-#line 6863 "PhotoMetadata.c"
+#line 7797 "PhotoMetadata.c"
 			}
 		}
 	}
@@ -6878,23 +7812,23 @@ void photo_metadata_set_keywords (PhotoMetadata* self, GeeCollection* keywords,
 	GeeTreeSet* _tmp1_ = NULL;
 	GeeCollection* _tmp2_ = NULL;
 	GeeCollection* _tmp28_ = NULL;
-#line 914 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1038 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_if_fail (IS_PHOTO_METADATA (self));
-#line 914 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1038 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_if_fail ((keywords == NULL) || GEE_IS_COLLECTION (keywords));
-#line 915 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1039 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0_ = hierarchical_tag_index_new ();
-#line 915 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1039 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	htag_index = _tmp0_;
-#line 916 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1040 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp1_ = gee_tree_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, NULL, NULL, NULL);
-#line 916 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1040 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	flat_keywords = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_SET, GeeSet);
-#line 918 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1042 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp2_ = keywords;
-#line 918 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1042 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp2_ != NULL) {
-#line 6893 "PhotoMetadata.c"
+#line 7827 "PhotoMetadata.c"
 		GeeSet* _tmp24_ = NULL;
 		HierarchicalTagIndex* _tmp25_ = NULL;
 		GeeCollection* _tmp26_ = NULL;
@@ -6903,15 +7837,15 @@ void photo_metadata_set_keywords (PhotoMetadata* self, GeeCollection* keywords,
 			GeeIterator* _keyword_it = NULL;
 			GeeCollection* _tmp3_ = NULL;
 			GeeIterator* _tmp4_ = NULL;
-#line 919 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1043 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tmp3_ = keywords;
-#line 919 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1043 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tmp4_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 919 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1043 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_keyword_it = _tmp4_;
-#line 919 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1043 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			while (TRUE) {
-#line 6910 "PhotoMetadata.c"
+#line 7844 "PhotoMetadata.c"
 				GeeIterator* _tmp5_ = NULL;
 				gboolean _tmp6_ = FALSE;
 				gchar* keyword = NULL;
@@ -6919,52 +7853,52 @@ void photo_metadata_set_keywords (PhotoMetadata* self, GeeCollection* keywords,
 				gpointer _tmp8_ = NULL;
 				const gchar* _tmp9_ = NULL;
 				gboolean _tmp10_ = FALSE;
-#line 919 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1043 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp5_ = _keyword_it;
-#line 919 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1043 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp6_ = gee_iterator_next (_tmp5_);
-#line 919 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1043 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				if (!_tmp6_) {
-#line 919 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1043 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					break;
-#line 6926 "PhotoMetadata.c"
+#line 7860 "PhotoMetadata.c"
 				}
-#line 919 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1043 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp7_ = _keyword_it;
-#line 919 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1043 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp8_ = gee_iterator_get (_tmp7_);
-#line 919 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1043 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				keyword = (gchar*) _tmp8_;
-#line 920 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1044 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp9_ = keyword;
-#line 920 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1044 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp10_ = g_str_has_prefix (_tmp9_, TAG_PATH_SEPARATOR_STRING);
-#line 920 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1044 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				if (_tmp10_) {
-#line 6940 "PhotoMetadata.c"
+#line 7874 "PhotoMetadata.c"
 					GeeCollection* path_components = NULL;
 					const gchar* _tmp11_ = NULL;
 					GeeList* _tmp12_ = NULL;
-#line 921 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1045 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_tmp11_ = keyword;
-#line 921 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1045 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_tmp12_ = hierarchical_tag_utilities_enumerate_path_components (_tmp11_);
-#line 921 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1045 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					path_components = G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 6950 "PhotoMetadata.c"
+#line 7884 "PhotoMetadata.c"
 					{
 						GeeIterator* _component_it = NULL;
 						GeeCollection* _tmp13_ = NULL;
 						GeeIterator* _tmp14_ = NULL;
-#line 923 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1047 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 						_tmp13_ = path_components;
-#line 923 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1047 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 						_tmp14_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 923 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1047 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 						_component_it = _tmp14_;
-#line 923 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1047 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 						while (TRUE) {
-#line 6963 "PhotoMetadata.c"
+#line 7897 "PhotoMetadata.c"
 							GeeIterator* _tmp15_ = NULL;
 							gboolean _tmp16_ = FALSE;
 							gchar* component = NULL;
@@ -6973,117 +7907,117 @@ void photo_metadata_set_keywords (PhotoMetadata* self, GeeCollection* keywords,
 							HierarchicalTagIndex* _tmp19_ = NULL;
 							const gchar* _tmp20_ = NULL;
 							const gchar* _tmp21_ = NULL;
-#line 923 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1047 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 							_tmp15_ = _component_it;
-#line 923 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1047 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 							_tmp16_ = gee_iterator_next (_tmp15_);
-#line 923 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1047 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 							if (!_tmp16_) {
-#line 923 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1047 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 								break;
-#line 6980 "PhotoMetadata.c"
+#line 7914 "PhotoMetadata.c"
 							}
-#line 923 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1047 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 							_tmp17_ = _component_it;
-#line 923 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1047 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 							_tmp18_ = gee_iterator_get (_tmp17_);
-#line 923 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1047 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 							component = (gchar*) _tmp18_;
-#line 924 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1048 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 							_tmp19_ = htag_index;
-#line 924 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1048 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 							_tmp20_ = component;
-#line 924 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1048 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 							_tmp21_ = keyword;
-#line 924 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1048 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 							hierarchical_tag_index_add_path (_tmp19_, _tmp20_, _tmp21_);
-#line 923 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1047 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 							_g_free0 (component);
-#line 6998 "PhotoMetadata.c"
+#line 7932 "PhotoMetadata.c"
 						}
-#line 923 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1047 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 						_g_object_unref0 (_component_it);
-#line 7002 "PhotoMetadata.c"
+#line 7936 "PhotoMetadata.c"
 					}
-#line 920 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1044 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_g_object_unref0 (path_components);
-#line 7006 "PhotoMetadata.c"
+#line 7940 "PhotoMetadata.c"
 				} else {
 					GeeSet* _tmp22_ = NULL;
 					const gchar* _tmp23_ = NULL;
-#line 926 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1050 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_tmp22_ = flat_keywords;
-#line 926 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1050 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_tmp23_ = keyword;
-#line 926 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1050 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, GEE_TYPE_COLLECTION, GeeCollection), _tmp23_);
-#line 7016 "PhotoMetadata.c"
+#line 7950 "PhotoMetadata.c"
 				}
-#line 919 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1043 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_g_free0 (keyword);
-#line 7020 "PhotoMetadata.c"
+#line 7954 "PhotoMetadata.c"
 			}
-#line 919 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1043 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_g_object_unref0 (_keyword_it);
-#line 7024 "PhotoMetadata.c"
+#line 7958 "PhotoMetadata.c"
 		}
-#line 930 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1054 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp24_ = flat_keywords;
-#line 930 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1054 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp25_ = htag_index;
-#line 930 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1054 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp26_ = hierarchical_tag_index_get_all_tags (_tmp25_);
-#line 930 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1054 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp27_ = _tmp26_;
-#line 930 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1054 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		gee_collection_add_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GEE_TYPE_COLLECTION, GeeCollection), _tmp27_);
-#line 930 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1054 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_g_object_unref0 (_tmp27_);
-#line 7038 "PhotoMetadata.c"
+#line 7972 "PhotoMetadata.c"
 	}
-#line 933 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1057 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp28_ = keywords;
-#line 933 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1057 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp28_ != NULL) {
-#line 7044 "PhotoMetadata.c"
+#line 7978 "PhotoMetadata.c"
 		gchar** _tmp29_ = NULL;
 		gint _tmp29__length1 = 0;
 		GeeSet* _tmp30_ = NULL;
 		PhotoMetadataSetOption _tmp31_ = 0;
 		HierarchicalTagIndex* _tmp32_ = NULL;
-#line 934 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1058 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp29_ = photo_metadata_KEYWORD_TAGS;
-#line 934 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1058 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp29__length1 = photo_metadata_KEYWORD_TAGS_length1;
-#line 934 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1058 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp30_ = flat_keywords;
-#line 934 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1058 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp31_ = option;
-#line 934 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1058 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		photo_metadata_set_all_string_multiple (self, _tmp29_, _tmp29__length1, G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, GEE_TYPE_COLLECTION, GeeCollection), _tmp31_);
-#line 935 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1059 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp32_ = htag_index;
-#line 935 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1059 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		photo_metadata_internal_set_hierarchical_keywords (self, _tmp32_);
-#line 7064 "PhotoMetadata.c"
+#line 7998 "PhotoMetadata.c"
 	} else {
 		gchar** _tmp33_ = NULL;
 		gint _tmp33__length1 = 0;
-#line 937 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1061 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp33_ = photo_metadata_KEYWORD_TAGS;
-#line 937 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1061 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp33__length1 = photo_metadata_KEYWORD_TAGS_length1;
-#line 937 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1061 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		photo_metadata_remove_tags (self, _tmp33_, _tmp33__length1);
-#line 938 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1062 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		photo_metadata_internal_set_hierarchical_keywords (self, NULL);
-#line 7076 "PhotoMetadata.c"
+#line 8010 "PhotoMetadata.c"
 	}
-#line 914 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1038 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_g_object_unref0 (flat_keywords);
-#line 914 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1038 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_hierarchical_tag_index_unref0 (htag_index);
-#line 7082 "PhotoMetadata.c"
+#line 8016 "PhotoMetadata.c"
 }
 
 
@@ -7091,32 +8025,32 @@ gboolean photo_metadata_has_hierarchical_keywords (PhotoMetadata* self) {
 	gboolean result = FALSE;
 	HierarchicalKeywordField** _tmp0_ = NULL;
 	gint _tmp0__length1 = 0;
-#line 942 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1066 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (IS_PHOTO_METADATA (self), FALSE);
-#line 943 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1067 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0_ = photo_metadata_HIERARCHICAL_KEYWORD_TAGS;
-#line 943 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1067 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0__length1 = photo_metadata_HIERARCHICAL_KEYWORD_TAGS_length1;
-#line 7096 "PhotoMetadata.c"
+#line 8030 "PhotoMetadata.c"
 	{
 		HierarchicalKeywordField** field_collection = NULL;
 		gint field_collection_length1 = 0;
 		gint _field_collection_size_ = 0;
 		gint field_it = 0;
-#line 943 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1067 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		field_collection = _tmp0_;
-#line 943 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1067 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		field_collection_length1 = _tmp0__length1;
-#line 943 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1067 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		for (field_it = 0; field_it < _tmp0__length1; field_it = field_it + 1) {
-#line 7108 "PhotoMetadata.c"
+#line 8042 "PhotoMetadata.c"
 			HierarchicalKeywordField* _tmp1_ = NULL;
 			HierarchicalKeywordField* field = NULL;
-#line 943 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1067 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tmp1_ = _hierarchical_keyword_field_ref0 (field_collection[field_it]);
-#line 943 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1067 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			field = _tmp1_;
-#line 7115 "PhotoMetadata.c"
+#line 8049 "PhotoMetadata.c"
 			{
 				GeeCollection* values = NULL;
 				HierarchicalKeywordField* _tmp2_ = NULL;
@@ -7124,61 +8058,61 @@ gboolean photo_metadata_has_hierarchical_keywords (PhotoMetadata* self) {
 				GeeList* _tmp4_ = NULL;
 				gboolean _tmp5_ = FALSE;
 				GeeCollection* _tmp6_ = NULL;
-#line 944 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1068 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp2_ = field;
-#line 944 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1068 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp3_ = _tmp2_->field_name;
-#line 944 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1068 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp4_ = photo_metadata_get_string_multiple (self, _tmp3_);
-#line 944 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1068 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				values = G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 946 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1070 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp6_ = values;
-#line 946 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1070 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				if (_tmp6_ != NULL) {
-#line 7135 "PhotoMetadata.c"
+#line 8069 "PhotoMetadata.c"
 					GeeCollection* _tmp7_ = NULL;
 					gint _tmp8_ = 0;
 					gint _tmp9_ = 0;
-#line 946 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1070 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_tmp7_ = values;
-#line 946 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1070 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_tmp8_ = gee_collection_get_size (_tmp7_);
-#line 946 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1070 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_tmp9_ = _tmp8_;
-#line 946 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1070 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_tmp5_ = _tmp9_ > 0;
-#line 7147 "PhotoMetadata.c"
+#line 8081 "PhotoMetadata.c"
 				} else {
-#line 946 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1070 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_tmp5_ = FALSE;
-#line 7151 "PhotoMetadata.c"
+#line 8085 "PhotoMetadata.c"
 				}
-#line 946 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1070 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				if (_tmp5_) {
-#line 947 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1071 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					result = TRUE;
-#line 947 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1071 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_g_object_unref0 (values);
-#line 947 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1071 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_hierarchical_keyword_field_unref0 (field);
-#line 947 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1071 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					return result;
-#line 7163 "PhotoMetadata.c"
+#line 8097 "PhotoMetadata.c"
 				}
-#line 943 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1067 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_g_object_unref0 (values);
-#line 943 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1067 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_hierarchical_keyword_field_unref0 (field);
-#line 7169 "PhotoMetadata.c"
+#line 8103 "PhotoMetadata.c"
 			}
 		}
 	}
-#line 950 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1074 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	result = FALSE;
-#line 950 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1074 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 7177 "PhotoMetadata.c"
+#line 8111 "PhotoMetadata.c"
 }
 
 
@@ -7189,40 +8123,41 @@ GeeSet* photo_metadata_get_hierarchical_keywords (PhotoMetadata* self) {
 	GeeSet* _tmp1_ = NULL;
 	HierarchicalKeywordField** _tmp2_ = NULL;
 	gint _tmp2__length1 = 0;
-#line 953 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	GError * _inner_error_ = NULL;
+#line 1077 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL);
-#line 954 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1078 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0_ = photo_metadata_has_hierarchical_keywords (self);
-#line 954 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1078 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_vala_assert (_tmp0_, "has_hierarchical_keywords()");
-#line 956 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1080 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp1_ = photo_metadata_create_string_set (self, NULL, NULL, NULL);
-#line 956 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1080 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	h_keywords = _tmp1_;
-#line 958 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1082 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp2_ = photo_metadata_HIERARCHICAL_KEYWORD_TAGS;
-#line 958 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1082 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp2__length1 = photo_metadata_HIERARCHICAL_KEYWORD_TAGS_length1;
-#line 7202 "PhotoMetadata.c"
+#line 8137 "PhotoMetadata.c"
 	{
 		HierarchicalKeywordField** field_collection = NULL;
 		gint field_collection_length1 = 0;
 		gint _field_collection_size_ = 0;
 		gint field_it = 0;
-#line 958 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1082 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		field_collection = _tmp2_;
-#line 958 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1082 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		field_collection_length1 = _tmp2__length1;
-#line 958 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1082 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		for (field_it = 0; field_it < _tmp2__length1; field_it = field_it + 1) {
-#line 7214 "PhotoMetadata.c"
+#line 8149 "PhotoMetadata.c"
 			HierarchicalKeywordField* _tmp3_ = NULL;
 			HierarchicalKeywordField* field = NULL;
-#line 958 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1082 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tmp3_ = _hierarchical_keyword_field_ref0 (field_collection[field_it]);
-#line 958 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1082 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			field = _tmp3_;
-#line 7221 "PhotoMetadata.c"
+#line 8156 "PhotoMetadata.c"
 			{
 				GeeCollection* values = NULL;
 				HierarchicalKeywordField* _tmp4_ = NULL;
@@ -7230,133 +8165,287 @@ GeeSet* photo_metadata_get_hierarchical_keywords (PhotoMetadata* self) {
 				GeeList* _tmp6_ = NULL;
 				gboolean _tmp7_ = FALSE;
 				GeeCollection* _tmp8_ = NULL;
-#line 959 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+				GeeArrayList* transformed_values = NULL;
+				GeeArrayList* _tmp12_ = NULL;
+#line 1083 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp4_ = field;
-#line 959 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1083 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp5_ = _tmp4_->field_name;
-#line 959 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1083 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp6_ = photo_metadata_get_string_multiple (self, _tmp5_);
-#line 959 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1083 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				values = G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 961 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1085 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp8_ = values;
-#line 961 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1085 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				if (_tmp8_ == NULL) {
-#line 961 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1085 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_tmp7_ = TRUE;
-#line 7243 "PhotoMetadata.c"
+#line 8180 "PhotoMetadata.c"
 				} else {
 					GeeCollection* _tmp9_ = NULL;
 					gint _tmp10_ = 0;
 					gint _tmp11_ = 0;
-#line 961 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1085 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_tmp9_ = values;
-#line 961 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1085 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_tmp10_ = gee_collection_get_size (_tmp9_);
-#line 961 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1085 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_tmp11_ = _tmp10_;
-#line 961 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1085 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_tmp7_ = _tmp11_ < 1;
-#line 7256 "PhotoMetadata.c"
+#line 8193 "PhotoMetadata.c"
 				}
-#line 961 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1085 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				if (_tmp7_) {
-#line 962 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1086 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_g_object_unref0 (values);
-#line 962 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1086 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_hierarchical_keyword_field_unref0 (field);
-#line 962 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1086 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					continue;
-#line 7266 "PhotoMetadata.c"
+#line 8203 "PhotoMetadata.c"
 				}
+#line 1088 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+				_tmp12_ = gee_array_list_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, NULL, NULL, NULL);
+#line 1088 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+				transformed_values = _tmp12_;
+#line 8209 "PhotoMetadata.c"
 				{
 					GeeIterator* _current_value_it = NULL;
-					GeeCollection* _tmp12_ = NULL;
-					GeeIterator* _tmp13_ = NULL;
-#line 964 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-					_tmp12_ = values;
-#line 964 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-					_tmp13_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 964 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-					_current_value_it = _tmp13_;
-#line 964 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+					GeeCollection* _tmp13_ = NULL;
+					GeeIterator* _tmp14_ = NULL;
+#line 1089 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+					_tmp13_ = values;
+#line 1089 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+					_tmp14_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_ITERABLE, GeeIterable));
+#line 1089 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+					_current_value_it = _tmp14_;
+#line 1089 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					while (TRUE) {
-#line 7280 "PhotoMetadata.c"
-						GeeIterator* _tmp14_ = NULL;
-						gboolean _tmp15_ = FALSE;
+#line 8222 "PhotoMetadata.c"
+						GeeIterator* _tmp15_ = NULL;
+						gboolean _tmp16_ = FALSE;
+						gchar* current_value = NULL;
+						GeeIterator* _tmp17_ = NULL;
+						gpointer _tmp18_ = NULL;
+#line 1089 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+						_tmp15_ = _current_value_it;
+#line 1089 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+						_tmp16_ = gee_iterator_next (_tmp15_);
+#line 1089 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+						if (!_tmp16_) {
+#line 1089 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+							break;
+#line 8236 "PhotoMetadata.c"
+						}
+#line 1089 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+						_tmp17_ = _current_value_it;
+#line 1089 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+						_tmp18_ = gee_iterator_get (_tmp17_);
+#line 1089 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+						current_value = (gchar*) _tmp18_;
+#line 8244 "PhotoMetadata.c"
+						{
+							GeeList* transformed = NULL;
+							HierarchicalKeywordField* _tmp19_ = NULL;
+							KeywordTransformer* _tmp20_ = NULL;
+							const gchar* _tmp21_ = NULL;
+							GeeList* _tmp22_ = NULL;
+							GeeArrayList* _tmp23_ = NULL;
+							GeeList* _tmp24_ = NULL;
+#line 1091 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+							_tmp19_ = field;
+#line 1091 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+							_tmp20_ = _tmp19_->transformer;
+#line 1091 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+							_tmp21_ = current_value;
+#line 1091 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+							_tmp22_ = keyword_transformer_transform (_tmp20_, _tmp21_, &_inner_error_);
+#line 1091 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+							transformed = _tmp22_;
+#line 1091 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+							if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 8265 "PhotoMetadata.c"
+								goto __catch26_g_error;
+							}
+#line 1092 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+							_tmp23_ = transformed_values;
+#line 1092 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+							_tmp24_ = transformed;
+#line 1092 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+							gee_array_list_add_all (_tmp23_, G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GEE_TYPE_COLLECTION, GeeCollection));
+#line 1090 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+							_g_object_unref0 (transformed);
+#line 8276 "PhotoMetadata.c"
+						}
+						goto __finally26;
+						__catch26_g_error:
+						{
+							GError* _error_ = NULL;
+							const gchar* _tmp25_ = NULL;
+							GError* _tmp26_ = NULL;
+							const gchar* _tmp27_ = NULL;
+#line 1090 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+							_error_ = _inner_error_;
+#line 1090 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+							_inner_error_ = NULL;
+#line 1094 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+							_tmp25_ = current_value;
+#line 1094 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+							_tmp26_ = _error_;
+#line 1094 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+							_tmp27_ = _tmp26_->message;
+#line 1094 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+							g_critical ("PhotoMetadata.vala:1094: Failed to transform tag value %s: %s", _tmp25_, _tmp27_);
+#line 1090 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+							_g_error_free0 (_error_);
+#line 8299 "PhotoMetadata.c"
+						}
+						__finally26:
+#line 1090 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+						if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 1090 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+							_g_free0 (current_value);
+#line 1090 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+							_g_object_unref0 (_current_value_it);
+#line 1090 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+							_g_object_unref0 (transformed_values);
+#line 1090 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+							_g_object_unref0 (values);
+#line 1090 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+							_hierarchical_keyword_field_unref0 (field);
+#line 1090 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+							_g_object_unref0 (h_keywords);
+#line 1090 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+							g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
+#line 1090 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+							g_clear_error (&_inner_error_);
+#line 1090 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+							return NULL;
+#line 8322 "PhotoMetadata.c"
+						}
+#line 1089 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+						_g_free0 (current_value);
+#line 8326 "PhotoMetadata.c"
+					}
+#line 1089 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+					_g_object_unref0 (_current_value_it);
+#line 8330 "PhotoMetadata.c"
+				}
+				{
+					GeeArrayList* _current_value_list = NULL;
+					GeeArrayList* _tmp28_ = NULL;
+					GeeArrayList* _tmp29_ = NULL;
+					gint _current_value_size = 0;
+					GeeArrayList* _tmp30_ = NULL;
+					gint _tmp31_ = 0;
+					gint _tmp32_ = 0;
+					gint _current_value_index = 0;
+#line 1100 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+					_tmp28_ = transformed_values;
+#line 1100 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+					_tmp29_ = _g_object_ref0 (_tmp28_);
+#line 1100 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+					_current_value_list = _tmp29_;
+#line 1100 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+					_tmp30_ = _current_value_list;
+#line 1100 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+					_tmp31_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, GEE_TYPE_COLLECTION, GeeCollection));
+#line 1100 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+					_tmp32_ = _tmp31_;
+#line 1100 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+					_current_value_size = _tmp32_;
+#line 1100 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+					_current_value_index = -1;
+#line 1100 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+					while (TRUE) {
+#line 8359 "PhotoMetadata.c"
+						gint _tmp33_ = 0;
+						gint _tmp34_ = 0;
+						gint _tmp35_ = 0;
 						gchar* current_value = NULL;
-						GeeIterator* _tmp16_ = NULL;
-						gpointer _tmp17_ = NULL;
+						GeeArrayList* _tmp36_ = NULL;
+						gint _tmp37_ = 0;
+						gpointer _tmp38_ = NULL;
 						gchar* canonicalized = NULL;
-						const gchar* _tmp18_ = NULL;
-						HierarchicalKeywordField* _tmp19_ = NULL;
-						const gchar* _tmp20_ = NULL;
-						gchar* _tmp21_ = NULL;
-						const gchar* _tmp22_ = NULL;
-#line 964 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-						_tmp14_ = _current_value_it;
-#line 964 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-						_tmp15_ = gee_iterator_next (_tmp14_);
-#line 964 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-						if (!_tmp15_) {
-#line 964 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+						const gchar* _tmp39_ = NULL;
+						HierarchicalKeywordField* _tmp40_ = NULL;
+						const gchar* _tmp41_ = NULL;
+						gchar* _tmp42_ = NULL;
+						const gchar* _tmp43_ = NULL;
+#line 1100 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+						_tmp33_ = _current_value_index;
+#line 1100 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+						_current_value_index = _tmp33_ + 1;
+#line 1100 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+						_tmp34_ = _current_value_index;
+#line 1100 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+						_tmp35_ = _current_value_size;
+#line 1100 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+						if (!(_tmp34_ < _tmp35_)) {
+#line 1100 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 							break;
-#line 7300 "PhotoMetadata.c"
+#line 8385 "PhotoMetadata.c"
 						}
-#line 964 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-						_tmp16_ = _current_value_it;
-#line 964 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-						_tmp17_ = gee_iterator_get (_tmp16_);
-#line 964 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-						current_value = (gchar*) _tmp17_;
-#line 965 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-						_tmp18_ = current_value;
-#line 965 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-						_tmp19_ = field;
-#line 965 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-						_tmp20_ = _tmp19_->path_separator;
-#line 965 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-						_tmp21_ = hierarchical_tag_utilities_canonicalize (_tmp18_, _tmp20_);
-#line 965 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-						canonicalized = _tmp21_;
-#line 968 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-						_tmp22_ = canonicalized;
-#line 968 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-						if (_tmp22_ != NULL) {
-#line 7322 "PhotoMetadata.c"
-							GeeSet* _tmp23_ = NULL;
-							const gchar* _tmp24_ = NULL;
-#line 969 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-							_tmp23_ = h_keywords;
-#line 969 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-							_tmp24_ = canonicalized;
-#line 969 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-							gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, GEE_TYPE_COLLECTION, GeeCollection), _tmp24_);
-#line 7331 "PhotoMetadata.c"
+#line 1100 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+						_tmp36_ = _current_value_list;
+#line 1100 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+						_tmp37_ = _current_value_index;
+#line 1100 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+						_tmp38_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp37_);
+#line 1100 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+						current_value = (gchar*) _tmp38_;
+#line 1101 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+						_tmp39_ = current_value;
+#line 1101 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+						_tmp40_ = field;
+#line 1101 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+						_tmp41_ = _tmp40_->path_separator;
+#line 1101 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+						_tmp42_ = hierarchical_tag_utilities_canonicalize (_tmp39_, _tmp41_);
+#line 1101 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+						canonicalized = _tmp42_;
+#line 1105 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+						_tmp43_ = canonicalized;
+#line 1105 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+						if (_tmp43_ != NULL) {
+#line 8409 "PhotoMetadata.c"
+							GeeSet* _tmp44_ = NULL;
+							const gchar* _tmp45_ = NULL;
+#line 1106 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+							_tmp44_ = h_keywords;
+#line 1106 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+							_tmp45_ = canonicalized;
+#line 1106 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+							gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp44_, GEE_TYPE_COLLECTION, GeeCollection), _tmp45_);
+#line 8418 "PhotoMetadata.c"
 						}
-#line 964 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1100 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 						_g_free0 (canonicalized);
-#line 964 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1100 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 						_g_free0 (current_value);
-#line 7337 "PhotoMetadata.c"
+#line 8424 "PhotoMetadata.c"
 					}
-#line 964 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-					_g_object_unref0 (_current_value_it);
-#line 7341 "PhotoMetadata.c"
+#line 1100 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+					_g_object_unref0 (_current_value_list);
+#line 8428 "PhotoMetadata.c"
 				}
-#line 958 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1082 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+				_g_object_unref0 (transformed_values);
+#line 1082 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_g_object_unref0 (values);
-#line 958 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1082 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_hierarchical_keyword_field_unref0 (field);
-#line 7347 "PhotoMetadata.c"
+#line 8436 "PhotoMetadata.c"
 			}
 		}
 	}
-#line 973 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1110 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	result = h_keywords;
-#line 973 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1110 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 7355 "PhotoMetadata.c"
+#line 8444 "PhotoMetadata.c"
 }
 
 
@@ -7364,17 +8453,17 @@ gboolean photo_metadata_has_orientation (PhotoMetadata* self) {
 	gboolean result = FALSE;
 	GExiv2Metadata* _tmp0_ = NULL;
 	GExiv2Orientation _tmp1_ = 0;
-#line 976 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1113 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (IS_PHOTO_METADATA (self), FALSE);
-#line 977 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1114 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0_ = self->priv->exiv2;
-#line 977 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1114 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp1_ = gexiv2_metadata_get_orientation (_tmp0_);
-#line 977 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1114 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	result = _tmp1_ == GEXIV2_ORIENTATION_UNSPECIFIED;
-#line 977 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1114 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 7373 "PhotoMetadata.c"
+#line 8462 "PhotoMetadata.c"
 }
 
 
@@ -7386,58 +8475,58 @@ Orientation photo_metadata_get_orientation (PhotoMetadata* self) {
 	gboolean _tmp2_ = FALSE;
 	gboolean _tmp3_ = FALSE;
 	GExiv2Orientation _tmp4_ = 0;
-#line 981 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1118 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (IS_PHOTO_METADATA (self), 0);
-#line 984 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1121 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0_ = self->priv->exiv2;
-#line 984 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1121 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp1_ = gexiv2_metadata_get_orientation (_tmp0_);
-#line 984 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1121 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	orientation = _tmp1_;
-#line 985 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1122 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp4_ = orientation;
-#line 985 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1122 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp4_ == GEXIV2_ORIENTATION_UNSPECIFIED) {
-#line 985 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1122 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp3_ = TRUE;
-#line 7399 "PhotoMetadata.c"
+#line 8488 "PhotoMetadata.c"
 	} else {
 		GExiv2Orientation _tmp5_ = 0;
-#line 985 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1122 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp5_ = orientation;
-#line 985 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1122 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp3_ = _tmp5_ < ORIENTATION_MIN;
-#line 7406 "PhotoMetadata.c"
+#line 8495 "PhotoMetadata.c"
 	}
-#line 985 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1122 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp3_) {
-#line 985 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1122 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp2_ = TRUE;
-#line 7412 "PhotoMetadata.c"
+#line 8501 "PhotoMetadata.c"
 	} else {
 		GExiv2Orientation _tmp6_ = 0;
-#line 986 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1123 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp6_ = orientation;
-#line 986 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1123 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp2_ = _tmp6_ > ORIENTATION_MAX;
-#line 7419 "PhotoMetadata.c"
+#line 8508 "PhotoMetadata.c"
 	}
-#line 985 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1122 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp2_) {
-#line 987 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1124 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		result = ORIENTATION_TOP_LEFT;
-#line 987 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1124 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		return result;
-#line 7427 "PhotoMetadata.c"
+#line 8516 "PhotoMetadata.c"
 	} else {
 		GExiv2Orientation _tmp7_ = 0;
-#line 989 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1126 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp7_ = orientation;
-#line 989 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1126 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		result = (Orientation) _tmp7_;
-#line 989 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1126 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		return result;
-#line 7436 "PhotoMetadata.c"
+#line 8525 "PhotoMetadata.c"
 	}
 }
 
@@ -7445,15 +8534,15 @@ Orientation photo_metadata_get_orientation (PhotoMetadata* self) {
 void photo_metadata_set_orientation (PhotoMetadata* self, Orientation orientation) {
 	GExiv2Metadata* _tmp0_ = NULL;
 	Orientation _tmp1_ = 0;
-#line 992 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1129 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_if_fail (IS_PHOTO_METADATA (self));
-#line 994 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1131 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0_ = self->priv->exiv2;
-#line 994 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1131 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp1_ = orientation;
-#line 994 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1131 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	gexiv2_metadata_set_orientation (_tmp0_, (GExiv2Orientation) _tmp1_);
-#line 7452 "PhotoMetadata.c"
+#line 8541 "PhotoMetadata.c"
 }
 
 
@@ -7471,127 +8560,127 @@ gboolean photo_metadata_get_gps (PhotoMetadata* self, gdouble* longitude, gchar*
 	gboolean _tmp4_ = FALSE;
 	gchar* _tmp5_ = NULL;
 	gchar* _tmp6_ = NULL;
-#line 997 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1134 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (IS_PHOTO_METADATA (self), FALSE);
-#line 999 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1136 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0_ = self->priv->exiv2;
-#line 999 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1136 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp4_ = gexiv2_metadata_get_gps_info (_tmp0_, &_tmp1_, &_tmp2_, &_tmp3_);
-#line 999 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1136 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_vala_longitude = _tmp1_;
-#line 999 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1136 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_vala_latitude = _tmp2_;
-#line 999 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1136 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_vala_altitude = _tmp3_;
-#line 999 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1136 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (!_tmp4_) {
-#line 1000 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_g_free0 (_vala_long_ref);
-#line 1000 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_vala_long_ref = NULL;
-#line 1001 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1138 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_g_free0 (_vala_lat_ref);
-#line 1001 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1138 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_vala_lat_ref = NULL;
-#line 1003 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1140 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		result = FALSE;
-#line 1003 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1140 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		if (longitude) {
-#line 1003 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1140 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			*longitude = _vala_longitude;
-#line 7498 "PhotoMetadata.c"
+#line 8587 "PhotoMetadata.c"
 		}
-#line 1003 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1140 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		if (long_ref) {
-#line 1003 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1140 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			*long_ref = _vala_long_ref;
-#line 7504 "PhotoMetadata.c"
+#line 8593 "PhotoMetadata.c"
 		} else {
-#line 1003 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1140 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_g_free0 (_vala_long_ref);
-#line 7508 "PhotoMetadata.c"
+#line 8597 "PhotoMetadata.c"
 		}
-#line 1003 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1140 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		if (latitude) {
-#line 1003 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1140 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			*latitude = _vala_latitude;
-#line 7514 "PhotoMetadata.c"
+#line 8603 "PhotoMetadata.c"
 		}
-#line 1003 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1140 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		if (lat_ref) {
-#line 1003 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1140 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			*lat_ref = _vala_lat_ref;
-#line 7520 "PhotoMetadata.c"
+#line 8609 "PhotoMetadata.c"
 		} else {
-#line 1003 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1140 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_g_free0 (_vala_lat_ref);
-#line 7524 "PhotoMetadata.c"
+#line 8613 "PhotoMetadata.c"
 		}
-#line 1003 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1140 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		if (altitude) {
-#line 1003 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1140 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			*altitude = _vala_altitude;
-#line 7530 "PhotoMetadata.c"
+#line 8619 "PhotoMetadata.c"
 		}
-#line 1003 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1140 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		return result;
-#line 7534 "PhotoMetadata.c"
+#line 8623 "PhotoMetadata.c"
 	}
-#line 1006 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1143 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp5_ = photo_metadata_get_string (self, "Exif.GPSInfo.GPSLongitudeRef", PHOTO_METADATA_PREPARE_STRING_OPTIONS);
-#line 1006 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1143 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_g_free0 (_vala_long_ref);
-#line 1006 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1143 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_vala_long_ref = _tmp5_;
-#line 1007 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1144 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp6_ = photo_metadata_get_string (self, "Exif.GPSInfo.GPSLatitudeRef", PHOTO_METADATA_PREPARE_STRING_OPTIONS);
-#line 1007 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1144 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_g_free0 (_vala_lat_ref);
-#line 1007 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1144 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_vala_lat_ref = _tmp6_;
-#line 1009 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1146 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	result = TRUE;
-#line 1009 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1146 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (longitude) {
-#line 1009 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1146 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		*longitude = _vala_longitude;
-#line 7554 "PhotoMetadata.c"
+#line 8643 "PhotoMetadata.c"
 	}
-#line 1009 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1146 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (long_ref) {
-#line 1009 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1146 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		*long_ref = _vala_long_ref;
-#line 7560 "PhotoMetadata.c"
+#line 8649 "PhotoMetadata.c"
 	} else {
-#line 1009 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1146 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_g_free0 (_vala_long_ref);
-#line 7564 "PhotoMetadata.c"
+#line 8653 "PhotoMetadata.c"
 	}
-#line 1009 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1146 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (latitude) {
-#line 1009 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1146 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		*latitude = _vala_latitude;
-#line 7570 "PhotoMetadata.c"
+#line 8659 "PhotoMetadata.c"
 	}
-#line 1009 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1146 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (lat_ref) {
-#line 1009 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1146 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		*lat_ref = _vala_lat_ref;
-#line 7576 "PhotoMetadata.c"
+#line 8665 "PhotoMetadata.c"
 	} else {
-#line 1009 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1146 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_g_free0 (_vala_lat_ref);
-#line 7580 "PhotoMetadata.c"
+#line 8669 "PhotoMetadata.c"
 	}
-#line 1009 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1146 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (altitude) {
-#line 1009 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1146 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		*altitude = _vala_altitude;
-#line 7586 "PhotoMetadata.c"
+#line 8675 "PhotoMetadata.c"
 	}
-#line 1009 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1146 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 7590 "PhotoMetadata.c"
+#line 8679 "PhotoMetadata.c"
 }
 
 
@@ -7600,23 +8689,23 @@ gboolean photo_metadata_get_exposure (PhotoMetadata* self, MetadataRational* exp
 	gboolean result = FALSE;
 	MetadataRational _tmp0_ = {0};
 	gboolean _tmp1_ = FALSE;
-#line 1012 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1149 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (IS_PHOTO_METADATA (self), FALSE);
-#line 1013 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1150 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp1_ = photo_metadata_get_rational (self, "Exif.Photo.ExposureTime", &_tmp0_);
-#line 1013 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1150 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_vala_exposure = _tmp0_;
-#line 1013 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1150 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	result = _tmp1_;
-#line 1013 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1150 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (exposure) {
-#line 1013 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1150 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		*exposure = _vala_exposure;
-#line 7611 "PhotoMetadata.c"
+#line 8700 "PhotoMetadata.c"
 	}
-#line 1013 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1150 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 7615 "PhotoMetadata.c"
+#line 8704 "PhotoMetadata.c"
 }
 
 
@@ -7627,37 +8716,37 @@ gchar* photo_metadata_get_exposure_string (PhotoMetadata* self) {
 	gboolean _tmp1_ = FALSE;
 	gboolean _tmp2_ = FALSE;
 	gchar* _tmp3_ = NULL;
-#line 1016 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1153 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL);
-#line 1018 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1155 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp1_ = photo_metadata_get_rational (self, "Exif.Photo.ExposureTime", &_tmp0_);
-#line 1018 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1155 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	exposure_time = _tmp0_;
-#line 1018 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1155 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (!_tmp1_) {
-#line 1019 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1156 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		result = NULL;
-#line 1019 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1156 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		return result;
-#line 7638 "PhotoMetadata.c"
+#line 8727 "PhotoMetadata.c"
 	}
-#line 1021 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp2_ = metadata_rational_is_valid (&exposure_time);
-#line 1021 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (!_tmp2_) {
-#line 1022 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1159 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		result = NULL;
-#line 1022 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1159 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		return result;
-#line 7648 "PhotoMetadata.c"
+#line 8737 "PhotoMetadata.c"
 	}
-#line 1024 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1161 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp3_ = photo_metadata_get_string_interpreted (self, "Exif.Photo.ExposureTime", PHOTO_METADATA_PREPARE_STRING_OPTIONS);
-#line 1024 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1161 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	result = _tmp3_;
-#line 1024 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1161 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 7656 "PhotoMetadata.c"
+#line 8745 "PhotoMetadata.c"
 }
 
 
@@ -7670,70 +8759,70 @@ gboolean photo_metadata_get_iso (PhotoMetadata* self, glong* iso) {
 	gboolean _tmp2_ = FALSE;
 	gboolean _tmp3_ = FALSE;
 	glong _tmp4_ = 0L;
-#line 1027 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1164 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (IS_PHOTO_METADATA (self), FALSE);
-#line 1028 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1165 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp1_ = photo_metadata_get_long (self, "Exif.Photo.ISOSpeedRatings", &_tmp0_);
-#line 1028 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1165 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_vala_iso = _tmp0_;
-#line 1028 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1165 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	fetched_ok = _tmp1_;
-#line 1030 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1167 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp2_ = fetched_ok;
-#line 1030 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1167 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp2_ == FALSE) {
-#line 1031 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1168 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		result = FALSE;
-#line 1031 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1168 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		if (iso) {
-#line 1031 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1168 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			*iso = _vala_iso;
-#line 7687 "PhotoMetadata.c"
+#line 8776 "PhotoMetadata.c"
 		}
-#line 1031 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1168 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		return result;
-#line 7691 "PhotoMetadata.c"
+#line 8780 "PhotoMetadata.c"
 	}
-#line 1035 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1172 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp4_ = _vala_iso;
-#line 1035 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1172 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp4_ < ((glong) 6)) {
-#line 1035 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1172 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp3_ = TRUE;
-#line 7699 "PhotoMetadata.c"
+#line 8788 "PhotoMetadata.c"
 	} else {
 		glong _tmp5_ = 0L;
-#line 1035 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1172 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp5_ = _vala_iso;
-#line 1035 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1172 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp3_ = _tmp5_ > ((glong) 409600);
-#line 7706 "PhotoMetadata.c"
+#line 8795 "PhotoMetadata.c"
 	}
-#line 1035 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1172 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp3_) {
-#line 1036 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1173 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		result = FALSE;
-#line 1036 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1173 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		if (iso) {
-#line 1036 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1173 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			*iso = _vala_iso;
-#line 7716 "PhotoMetadata.c"
+#line 8805 "PhotoMetadata.c"
 		}
-#line 1036 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1173 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		return result;
-#line 7720 "PhotoMetadata.c"
+#line 8809 "PhotoMetadata.c"
 	}
-#line 1038 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1175 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	result = TRUE;
-#line 1038 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1175 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (iso) {
-#line 1038 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1175 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		*iso = _vala_iso;
-#line 7728 "PhotoMetadata.c"
+#line 8817 "PhotoMetadata.c"
 	}
-#line 1038 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1175 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 7732 "PhotoMetadata.c"
+#line 8821 "PhotoMetadata.c"
 }
 
 
@@ -7743,27 +8832,27 @@ gchar* photo_metadata_get_iso_string (PhotoMetadata* self) {
 	glong _tmp0_ = 0L;
 	gboolean _tmp1_ = FALSE;
 	gchar* _tmp2_ = NULL;
-#line 1041 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1178 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL);
-#line 1043 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1180 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp1_ = photo_metadata_get_iso (self, &_tmp0_);
-#line 1043 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1180 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	iso = _tmp0_;
-#line 1043 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1180 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (!_tmp1_) {
-#line 1044 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1181 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		result = NULL;
-#line 1044 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1181 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		return result;
-#line 7754 "PhotoMetadata.c"
+#line 8843 "PhotoMetadata.c"
 	}
-#line 1046 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1183 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp2_ = photo_metadata_get_string_interpreted (self, "Exif.Photo.ISOSpeedRatings", PHOTO_METADATA_PREPARE_STRING_OPTIONS);
-#line 1046 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1183 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	result = _tmp2_;
-#line 1046 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1183 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 7762 "PhotoMetadata.c"
+#line 8851 "PhotoMetadata.c"
 }
 
 
@@ -7772,23 +8861,23 @@ gboolean photo_metadata_get_aperture (PhotoMetadata* self, MetadataRational* ape
 	gboolean result = FALSE;
 	MetadataRational _tmp0_ = {0};
 	gboolean _tmp1_ = FALSE;
-#line 1049 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1186 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (IS_PHOTO_METADATA (self), FALSE);
-#line 1050 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1187 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp1_ = photo_metadata_get_rational (self, "Exif.Photo.FNumber", &_tmp0_);
-#line 1050 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1187 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_vala_aperture = _tmp0_;
-#line 1050 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1187 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	result = _tmp1_;
-#line 1050 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1187 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (aperture) {
-#line 1050 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1187 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		*aperture = _vala_aperture;
-#line 7783 "PhotoMetadata.c"
+#line 8872 "PhotoMetadata.c"
 	}
-#line 1050 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1187 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 7787 "PhotoMetadata.c"
+#line 8876 "PhotoMetadata.c"
 }
 
 
@@ -7812,105 +8901,105 @@ gchar* photo_metadata_get_aperture_string (PhotoMetadata* self, gboolean pango_f
 	gchar* _tmp13_ = NULL;
 	gchar* _tmp14_ = NULL;
 	gchar* _tmp15_ = NULL;
-#line 1053 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1190 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL);
-#line 1055 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1192 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp1_ = photo_metadata_get_aperture (self, &_tmp0_);
-#line 1055 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1192 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	aperture = _tmp0_;
-#line 1055 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1192 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (!_tmp1_) {
-#line 1056 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1193 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		result = NULL;
-#line 1056 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1193 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		return result;
-#line 7823 "PhotoMetadata.c"
+#line 8912 "PhotoMetadata.c"
 	}
-#line 1058 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1195 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp2_ = aperture;
-#line 1058 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1195 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp3_ = _tmp2_.numerator;
-#line 1058 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1195 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp4_ = aperture;
-#line 1058 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1195 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp5_ = _tmp4_.denominator;
-#line 1058 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1195 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	aperture_value = ((gdouble) _tmp3_) / ((gdouble) _tmp5_);
-#line 1059 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1196 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp6_ = aperture_value;
-#line 1059 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1196 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	aperture_value = ((gint) (_tmp6_ * 10.0)) / 10.0;
-#line 1061 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1198 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp8_ = pango_formatted;
-#line 1061 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1198 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp8_) {
-#line 1061 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1198 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp7_ = "<i>f</i>/";
-#line 7845 "PhotoMetadata.c"
+#line 8934 "PhotoMetadata.c"
 	} else {
-#line 1061 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1198 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp7_ = "f/";
-#line 7849 "PhotoMetadata.c"
+#line 8938 "PhotoMetadata.c"
 	}
-#line 1062 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1199 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp10_ = aperture_value;
-#line 1062 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1199 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (fmod (_tmp10_, 1) == ((gdouble) 0)) {
-#line 1062 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1199 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp9_ = "%.0f";
-#line 7857 "PhotoMetadata.c"
+#line 8946 "PhotoMetadata.c"
 	} else {
-#line 1062 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1199 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp9_ = "%.1f";
-#line 7861 "PhotoMetadata.c"
+#line 8950 "PhotoMetadata.c"
 	}
-#line 1061 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1198 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp11_ = aperture_value;
-#line 1061 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1198 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp12_ = g_strdup_printf (_tmp9_, _tmp11_);
-#line 1061 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1198 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp13_ = _tmp12_;
-#line 1061 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1198 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp14_ = g_strconcat (_tmp7_, _tmp13_, NULL);
-#line 1061 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1198 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp15_ = _tmp14_;
-#line 1061 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1198 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_g_free0 (_tmp13_);
-#line 1061 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1198 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	result = _tmp15_;
-#line 1061 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1198 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 7879 "PhotoMetadata.c"
+#line 8968 "PhotoMetadata.c"
 }
 
 
 gchar* photo_metadata_get_camera_make (PhotoMetadata* self) {
 	gchar* result = NULL;
 	gchar* _tmp0_ = NULL;
-#line 1065 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1202 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL);
-#line 1066 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1203 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0_ = photo_metadata_get_string_interpreted (self, "Exif.Image.Make", PHOTO_METADATA_PREPARE_STRING_OPTIONS);
-#line 1066 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1203 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	result = _tmp0_;
-#line 1066 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1203 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 7894 "PhotoMetadata.c"
+#line 8983 "PhotoMetadata.c"
 }
 
 
 gchar* photo_metadata_get_camera_model (PhotoMetadata* self) {
 	gchar* result = NULL;
 	gchar* _tmp0_ = NULL;
-#line 1069 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1206 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL);
-#line 1070 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1207 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0_ = photo_metadata_get_string_interpreted (self, "Exif.Image.Model", PHOTO_METADATA_PREPARE_STRING_OPTIONS);
-#line 1070 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1207 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	result = _tmp0_;
-#line 1070 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1207 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 7909 "PhotoMetadata.c"
+#line 8998 "PhotoMetadata.c"
 }
 
 
@@ -7919,38 +9008,38 @@ gboolean photo_metadata_get_flash (PhotoMetadata* self, glong* flash) {
 	gboolean result = FALSE;
 	glong _tmp0_ = 0L;
 	gboolean _tmp1_ = FALSE;
-#line 1073 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1210 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (IS_PHOTO_METADATA (self), FALSE);
-#line 1075 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1212 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp1_ = photo_metadata_get_long (self, "Exif.Photo.Flash", &_tmp0_);
-#line 1075 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1212 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_vala_flash = _tmp0_;
-#line 1075 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1212 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	result = _tmp1_;
-#line 1075 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1212 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (flash) {
-#line 1075 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1212 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		*flash = _vala_flash;
-#line 7930 "PhotoMetadata.c"
+#line 9019 "PhotoMetadata.c"
 	}
-#line 1075 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1212 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 7934 "PhotoMetadata.c"
+#line 9023 "PhotoMetadata.c"
 }
 
 
 gchar* photo_metadata_get_flash_string (PhotoMetadata* self) {
 	gchar* result = NULL;
 	gchar* _tmp0_ = NULL;
-#line 1078 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1215 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL);
-#line 1080 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1217 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0_ = photo_metadata_get_string_interpreted (self, "Exif.Photo.Flash", PHOTO_METADATA_PREPARE_STRING_OPTIONS);
-#line 1080 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1217 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	result = _tmp0_;
-#line 1080 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1217 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 7949 "PhotoMetadata.c"
+#line 9038 "PhotoMetadata.c"
 }
 
 
@@ -7959,38 +9048,38 @@ gboolean photo_metadata_get_focal_length (PhotoMetadata* self, MetadataRational*
 	gboolean result = FALSE;
 	MetadataRational _tmp0_ = {0};
 	gboolean _tmp1_ = FALSE;
-#line 1083 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1220 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (IS_PHOTO_METADATA (self), FALSE);
-#line 1084 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1221 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp1_ = photo_metadata_get_rational (self, "Exif.Photo.FocalLength", &_tmp0_);
-#line 1084 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1221 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_vala_focal_length = _tmp0_;
-#line 1084 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1221 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	result = _tmp1_;
-#line 1084 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1221 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (focal_length) {
-#line 1084 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1221 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		*focal_length = _vala_focal_length;
-#line 7970 "PhotoMetadata.c"
+#line 9059 "PhotoMetadata.c"
 	}
-#line 1084 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1221 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 7974 "PhotoMetadata.c"
+#line 9063 "PhotoMetadata.c"
 }
 
 
 gchar* photo_metadata_get_focal_length_string (PhotoMetadata* self) {
 	gchar* result = NULL;
 	gchar* _tmp0_ = NULL;
-#line 1087 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1224 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL);
-#line 1088 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1225 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0_ = photo_metadata_get_string_interpreted (self, "Exif.Photo.FocalLength", PHOTO_METADATA_PREPARE_STRING_OPTIONS);
-#line 1088 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1225 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	result = _tmp0_;
-#line 1088 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1225 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 7989 "PhotoMetadata.c"
+#line 9078 "PhotoMetadata.c"
 }
 
 
@@ -7999,49 +9088,49 @@ gchar* photo_metadata_get_artist (PhotoMetadata* self) {
 	gchar** _tmp0_ = NULL;
 	gint _tmp0__length1 = 0;
 	gchar* _tmp1_ = NULL;
-#line 1096 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1234 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL);
-#line 1097 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1235 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0_ = photo_metadata_ARTIST_TAGS;
-#line 1097 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1235 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0__length1 = photo_metadata_ARTIST_TAGS_length1;
-#line 1097 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1235 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp1_ = photo_metadata_get_first_string_interpreted (self, _tmp0_, _tmp0__length1);
-#line 1097 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1235 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	result = _tmp1_;
-#line 1097 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1235 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 8010 "PhotoMetadata.c"
+#line 9099 "PhotoMetadata.c"
 }
 
 
 gchar* photo_metadata_get_copyright (PhotoMetadata* self) {
 	gchar* result = NULL;
 	gchar* _tmp0_ = NULL;
-#line 1100 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1238 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL);
-#line 1101 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1239 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0_ = photo_metadata_get_string_interpreted (self, "Exif.Image.Copyright", PHOTO_METADATA_PREPARE_STRING_OPTIONS);
-#line 1101 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1239 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	result = _tmp0_;
-#line 1101 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1239 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 8025 "PhotoMetadata.c"
+#line 9114 "PhotoMetadata.c"
 }
 
 
 gchar* photo_metadata_get_software (PhotoMetadata* self) {
 	gchar* result = NULL;
 	gchar* _tmp0_ = NULL;
-#line 1104 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1242 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL);
-#line 1105 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1243 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0_ = photo_metadata_get_string_interpreted (self, "Exif.Image.Software", PHOTO_METADATA_PREPARE_STRING_OPTIONS);
-#line 1105 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1243 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	result = _tmp0_;
-#line 1105 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1243 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 8040 "PhotoMetadata.c"
+#line 9129 "PhotoMetadata.c"
 }
 
 
@@ -8051,69 +9140,69 @@ void photo_metadata_set_software (PhotoMetadata* self, const gchar* software, co
 	gchar* _tmp2_ = NULL;
 	gchar* _tmp3_ = NULL;
 	gboolean _tmp4_ = FALSE;
-#line 1108 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1246 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_if_fail (IS_PHOTO_METADATA (self));
-#line 1108 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1246 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_if_fail (software != NULL);
-#line 1108 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1246 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_if_fail (version != NULL);
-#line 1110 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1248 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0_ = software;
-#line 1110 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1248 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp1_ = version;
-#line 1110 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1248 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp2_ = g_strdup_printf ("%s %s", _tmp0_, _tmp1_);
-#line 1110 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1248 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp3_ = _tmp2_;
-#line 1110 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1248 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	photo_metadata_set_string (self, "Exif.Image.Software", _tmp3_, PHOTO_METADATA_PREPARE_STRING_OPTIONS);
-#line 1110 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1248 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_g_free0 (_tmp3_);
-#line 1112 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1250 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp4_ = photo_metadata_has_iptc (self);
-#line 1112 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1250 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp4_) {
-#line 8072 "PhotoMetadata.c"
+#line 9161 "PhotoMetadata.c"
 		const gchar* _tmp5_ = NULL;
 		const gchar* _tmp6_ = NULL;
-#line 1113 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1251 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp5_ = software;
-#line 1113 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1251 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		photo_metadata_set_string (self, "Iptc.Application2.Program", _tmp5_, PHOTO_METADATA_PREPARE_STRING_OPTIONS);
-#line 1114 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1252 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp6_ = version;
-#line 1114 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1252 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		photo_metadata_set_string (self, "Iptc.Application2.ProgramVersion", _tmp6_, PHOTO_METADATA_PREPARE_STRING_OPTIONS);
-#line 8083 "PhotoMetadata.c"
+#line 9172 "PhotoMetadata.c"
 	}
 }
 
 
 void photo_metadata_remove_software (PhotoMetadata* self) {
-#line 1118 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1256 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_if_fail (IS_PHOTO_METADATA (self));
-#line 1119 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1257 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	photo_metadata_remove_tag (self, "Exif.Image.Software");
-#line 1120 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1258 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	photo_metadata_remove_tag (self, "Iptc.Application2.Program");
-#line 1121 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1259 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	photo_metadata_remove_tag (self, "Iptc.Application2.ProgramVersion");
-#line 8097 "PhotoMetadata.c"
+#line 9186 "PhotoMetadata.c"
 }
 
 
 gchar* photo_metadata_get_exposure_bias (PhotoMetadata* self) {
 	gchar* result = NULL;
 	gchar* _tmp0_ = NULL;
-#line 1124 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1262 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL);
-#line 1125 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1263 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0_ = photo_metadata_get_string_interpreted (self, "Exif.Photo.ExposureBiasValue", PHOTO_METADATA_PREPARE_STRING_OPTIONS);
-#line 1125 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1263 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	result = _tmp0_;
-#line 1125 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1263 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 8112 "PhotoMetadata.c"
+#line 9201 "PhotoMetadata.c"
 }
 
 
@@ -8130,134 +9219,134 @@ Rating photo_metadata_get_rating (PhotoMetadata* self) {
 	const gchar* _tmp8_ = NULL;
 	gint _tmp9_ = 0;
 	Rating _tmp18_ = 0;
-#line 1135 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1274 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (IS_PHOTO_METADATA (self), 0);
-#line 1136 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1275 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0_ = photo_metadata_RATING_TAGS;
-#line 1136 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1275 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0__length1 = photo_metadata_RATING_TAGS_length1;
-#line 1136 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1275 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp1_ = photo_metadata_get_first_string (self, _tmp0_, _tmp0__length1);
-#line 1136 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1275 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	rating_string = _tmp1_;
-#line 1137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1276 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp2_ = rating_string;
-#line 1137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1276 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp2_ != NULL) {
-#line 8143 "PhotoMetadata.c"
+#line 9232 "PhotoMetadata.c"
 		const gchar* _tmp3_ = NULL;
 		gint _tmp4_ = 0;
 		Rating _tmp5_ = 0;
-#line 1138 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1277 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp3_ = rating_string;
-#line 1138 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1277 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp4_ = atoi (_tmp3_);
-#line 1138 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1277 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp5_ = rating_unserialize (_tmp4_);
-#line 1138 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1277 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		result = _tmp5_;
-#line 1138 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1277 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_g_free0 (rating_string);
-#line 1138 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1277 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		return result;
-#line 8159 "PhotoMetadata.c"
+#line 9248 "PhotoMetadata.c"
 	}
-#line 1140 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1279 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp6_ = photo_metadata_get_string (self, "Exif.Image.RatingPercent", PHOTO_METADATA_PREPARE_STRING_OPTIONS);
-#line 1140 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1279 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_g_free0 (rating_string);
-#line 1140 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1279 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	rating_string = _tmp6_;
-#line 1141 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1280 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp7_ = rating_string;
-#line 1141 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1280 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp7_ == NULL) {
-#line 1142 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1281 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		result = RATING_UNRATED;
-#line 1142 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1281 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_g_free0 (rating_string);
-#line 1142 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1281 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		return result;
-#line 8177 "PhotoMetadata.c"
+#line 9266 "PhotoMetadata.c"
 	}
-#line 1145 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1284 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp8_ = rating_string;
-#line 1145 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1284 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp9_ = atoi (_tmp8_);
-#line 1145 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1284 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	int_percent_rating = _tmp9_;
-#line 8185 "PhotoMetadata.c"
+#line 9274 "PhotoMetadata.c"
 	{
 		gint i = 0;
-#line 1146 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1285 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		i = 5;
-#line 8190 "PhotoMetadata.c"
+#line 9279 "PhotoMetadata.c"
 		{
 			gboolean _tmp10_ = FALSE;
-#line 1146 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1285 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			_tmp10_ = TRUE;
-#line 1146 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1285 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 			while (TRUE) {
-#line 8197 "PhotoMetadata.c"
+#line 9286 "PhotoMetadata.c"
 				gint _tmp12_ = 0;
 				gint _tmp13_ = 0;
 				gint _tmp14_ = 0;
 				gint _tmp15_ = 0;
-#line 1146 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1285 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				if (!_tmp10_) {
-#line 8204 "PhotoMetadata.c"
+#line 9293 "PhotoMetadata.c"
 					gint _tmp11_ = 0;
-#line 1146 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1285 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_tmp11_ = i;
-#line 1146 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1285 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					i = _tmp11_ - 1;
-#line 8210 "PhotoMetadata.c"
+#line 9299 "PhotoMetadata.c"
 				}
-#line 1146 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1285 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp10_ = FALSE;
-#line 1146 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1285 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp12_ = i;
-#line 1146 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1285 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				if (!(_tmp12_ >= 0)) {
-#line 1146 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1285 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					break;
-#line 8220 "PhotoMetadata.c"
+#line 9309 "PhotoMetadata.c"
 				}
-#line 1147 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1286 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp13_ = int_percent_rating;
-#line 1147 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1286 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp14_ = i;
-#line 1147 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1286 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				_tmp15_ = RESOURCES_rating_thresholds[_tmp14_];
-#line 1147 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1286 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 				if (_tmp13_ >= _tmp15_) {
-#line 8230 "PhotoMetadata.c"
+#line 9319 "PhotoMetadata.c"
 					gint _tmp16_ = 0;
 					Rating _tmp17_ = 0;
-#line 1148 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1287 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_tmp16_ = i;
-#line 1148 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1287 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_tmp17_ = rating_unserialize (_tmp16_);
-#line 1148 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1287 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					result = _tmp17_;
-#line 1148 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1287 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					_g_free0 (rating_string);
-#line 1148 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1287 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 					return result;
-#line 8243 "PhotoMetadata.c"
+#line 9332 "PhotoMetadata.c"
 				}
 			}
 		}
 	}
-#line 1150 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1289 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp18_ = rating_unserialize (-1);
-#line 1150 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1289 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	result = _tmp18_;
-#line 1150 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1289 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_g_free0 (rating_string);
-#line 1150 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1289 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 8256 "PhotoMetadata.c"
+#line 9345 "PhotoMetadata.c"
 }
 
 
@@ -8272,79 +9361,79 @@ void photo_metadata_set_rating (PhotoMetadata* self, Rating rating) {
 	gchar* _tmp6_ = NULL;
 	gchar* _tmp7_ = NULL;
 	gint _tmp8_ = 0;
-#line 1158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1297 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_if_fail (IS_PHOTO_METADATA (self));
-#line 1159 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1298 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0_ = rating;
-#line 1159 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1298 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp1_ = rating_serialize (_tmp0_);
-#line 1159 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1298 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	int_rating = _tmp1_;
-#line 1160 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1299 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp2_ = int_rating;
-#line 1160 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1299 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp3_ = g_strdup_printf ("%i", _tmp2_);
-#line 1160 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1299 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp4_ = _tmp3_;
-#line 1160 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1299 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	photo_metadata_set_string (self, "Xmp.xmp.Rating", _tmp4_, PHOTO_METADATA_PREPARE_STRING_OPTIONS);
-#line 1160 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1299 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_g_free0 (_tmp4_);
-#line 1161 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1300 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp5_ = int_rating;
-#line 1161 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1300 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp6_ = g_strdup_printf ("%i", _tmp5_);
-#line 1161 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1300 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp7_ = _tmp6_;
-#line 1161 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1300 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	photo_metadata_set_string (self, "Exif.Image.Rating", _tmp7_, PHOTO_METADATA_PREPARE_STRING_OPTIONS);
-#line 1161 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1300 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_g_free0 (_tmp7_);
-#line 1163 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1302 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp8_ = int_rating;
-#line 1163 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1302 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (0 <= _tmp8_) {
-#line 8303 "PhotoMetadata.c"
+#line 9392 "PhotoMetadata.c"
 		gint _tmp9_ = 0;
 		gint _tmp10_ = 0;
 		gchar* _tmp11_ = NULL;
 		gchar* _tmp12_ = NULL;
-#line 1164 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1303 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp9_ = int_rating;
-#line 1164 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1303 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp10_ = RESOURCES_rating_thresholds[_tmp9_];
-#line 1164 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1303 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp11_ = g_strdup_printf ("%i", _tmp10_);
-#line 1164 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1303 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp12_ = _tmp11_;
-#line 1164 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1303 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		photo_metadata_set_string (self, "Exif.Image.RatingPercent", _tmp12_, PHOTO_METADATA_PREPARE_STRING_OPTIONS);
-#line 1164 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1303 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_g_free0 (_tmp12_);
-#line 8320 "PhotoMetadata.c"
+#line 9409 "PhotoMetadata.c"
 	} else {
 		gint _tmp13_ = 0;
 		gchar* _tmp14_ = NULL;
 		gchar* _tmp15_ = NULL;
-#line 1166 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1305 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp13_ = int_rating;
-#line 1166 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1305 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp14_ = g_strdup_printf ("%i", _tmp13_);
-#line 1166 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1305 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp15_ = _tmp14_;
-#line 1166 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1305 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		photo_metadata_set_string (self, "Exif.Image.RatingPercent", _tmp15_, PHOTO_METADATA_PREPARE_STRING_OPTIONS);
-#line 1166 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 1305 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_g_free0 (_tmp15_);
-#line 8335 "PhotoMetadata.c"
+#line 9424 "PhotoMetadata.c"
 	}
 }
 
 
 static gpointer _media_metadata_ref0 (gpointer self) {
-#line 123 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 235 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return self ? media_metadata_ref (self) : NULL;
-#line 8343 "PhotoMetadata.c"
+#line 9432 "PhotoMetadata.c"
 }
 
 
@@ -8365,67 +9454,67 @@ static PhotoMetadataInternalPhotoPreview* photo_metadata_internal_photo_preview_
 	PhotoMetadata* _tmp12_ = NULL;
 	PhotoMetadata* _tmp13_ = NULL;
 	guint _tmp14_ = 0U;
-#line 118 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 230 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (IS_PHOTO_METADATA (owner), NULL);
-#line 118 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 230 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (name != NULL, NULL);
-#line 118 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 230 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_return_val_if_fail (GEXIV2_IS_PREVIEW_PROPERTIES (props), NULL);
-#line 120 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 232 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0_ = name;
-#line 120 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 232 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp1_ = props;
-#line 120 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 232 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp2_ = gexiv2_preview_properties_get_width (_tmp1_);
-#line 120 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 232 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp3_ = props;
-#line 120 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 232 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp4_ = gexiv2_preview_properties_get_height (_tmp3_);
-#line 120 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 232 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	dimensions_init (&_tmp5_, (gint) _tmp2_, (gint) _tmp4_);
-#line 120 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 232 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp6_ = props;
-#line 120 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 232 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp7_ = gexiv2_preview_properties_get_size (_tmp6_);
-#line 120 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 232 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp8_ = props;
-#line 120 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 232 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp9_ = gexiv2_preview_properties_get_mime_type (_tmp8_);
-#line 120 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 232 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp10_ = props;
-#line 120 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 232 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp11_ = gexiv2_preview_properties_get_extension (_tmp10_);
-#line 120 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 232 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	self = (PhotoMetadataInternalPhotoPreview*) photo_preview_construct (object_type, _tmp0_, &_tmp5_, _tmp7_, _tmp9_, _tmp11_);
-#line 123 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 235 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp12_ = owner;
-#line 123 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 235 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp13_ = _media_metadata_ref0 (_tmp12_);
-#line 123 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 235 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_media_metadata_unref0 (self->owner);
-#line 123 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 235 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	self->owner = _tmp13_;
-#line 124 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 236 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp14_ = number;
-#line 124 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 236 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	self->number = _tmp14_;
-#line 118 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 230 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return self;
-#line 8410 "PhotoMetadata.c"
+#line 9499 "PhotoMetadata.c"
 }
 
 
 static PhotoMetadataInternalPhotoPreview* photo_metadata_internal_photo_preview_new (PhotoMetadata* owner, const gchar* name, guint number, GExiv2PreviewProperties* props) {
-#line 118 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 230 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return photo_metadata_internal_photo_preview_construct (PHOTO_METADATA_TYPE_INTERNAL_PHOTO_PREVIEW, owner, name, number, props);
-#line 8417 "PhotoMetadata.c"
+#line 9506 "PhotoMetadata.c"
 }
 
 
 static guint8* _vala_array_dup6 (guint8* self, int length) {
-#line 131 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 243 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return g_memdup (self, length * sizeof (guint8));
-#line 8424 "PhotoMetadata.c"
+#line 9513 "PhotoMetadata.c"
 }
 
 
@@ -8458,100 +9547,100 @@ static guint8* photo_metadata_internal_photo_preview_real_flatten (PhotoPreview*
 	gint _tmp18__length1 = 0;
 	guint8* _tmp19_ = NULL;
 	gint _tmp19__length1 = 0;
-#line 127 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 239 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PHOTO_METADATA_TYPE_INTERNAL_PHOTO_PREVIEW, PhotoMetadataInternalPhotoPreview);
-#line 128 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 240 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0_ = self->owner;
-#line 128 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 240 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp1_ = _tmp0_->priv->exiv2;
-#line 128 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 240 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp3_ = _tmp2_ = gexiv2_metadata_get_preview_properties (_tmp1_);
-#line 128 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 240 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	props = _tmp3_;
-#line 128 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 240 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	props_length1 = _vala_array_length (_tmp2_);
-#line 128 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 240 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_props_size_ = props_length1;
-#line 129 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 241 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp5_ = props;
-#line 129 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 241 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp5__length1 = props_length1;
-#line 129 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 241 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (_tmp5_ != NULL) {
-#line 8477 "PhotoMetadata.c"
+#line 9566 "PhotoMetadata.c"
 		GExiv2PreviewProperties** _tmp6_ = NULL;
 		gint _tmp6__length1 = 0;
 		guint _tmp7_ = 0U;
-#line 129 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 241 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp6_ = props;
-#line 129 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 241 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp6__length1 = props_length1;
-#line 129 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 241 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp7_ = self->number;
-#line 129 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 241 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp4_ = ((guint) _tmp6__length1) > _tmp7_;
-#line 8489 "PhotoMetadata.c"
+#line 9578 "PhotoMetadata.c"
 	} else {
-#line 129 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 241 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		_tmp4_ = FALSE;
-#line 8493 "PhotoMetadata.c"
+#line 9582 "PhotoMetadata.c"
 	}
-#line 129 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 241 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_vala_assert (_tmp4_, "props != null && props.length > number");
-#line 131 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 243 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp8_ = self->owner;
-#line 131 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 243 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp9_ = _tmp8_->priv->exiv2;
-#line 131 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 243 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp10_ = props;
-#line 131 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 243 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp10__length1 = props_length1;
-#line 131 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 243 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp11_ = self->number;
-#line 131 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 243 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp12_ = _tmp10_[_tmp11_];
-#line 131 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 243 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp13_ = gexiv2_metadata_get_preview_image (_tmp9_, _tmp12_);
-#line 131 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 243 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp14_ = _tmp13_;
-#line 131 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 243 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp16_ = gexiv2_preview_image_get_data (_tmp14_, &_tmp15_);
-#line 131 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 243 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp17_ = (_tmp16_ != NULL) ? _vala_array_dup6 (_tmp16_, _tmp15_) : ((gpointer) _tmp16_);
-#line 131 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 243 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp17__length1 = _tmp15_;
-#line 131 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 243 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp18_ = _tmp17_;
-#line 131 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 243 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp18__length1 = _tmp17__length1;
-#line 131 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 243 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_g_object_unref0 (_tmp14_);
-#line 131 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 243 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp19_ = _tmp18_;
-#line 131 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 243 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp19__length1 = _tmp18__length1;
-#line 131 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 243 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	if (result_length1) {
-#line 131 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 243 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 		*result_length1 = _tmp19__length1;
-#line 8533 "PhotoMetadata.c"
+#line 9622 "PhotoMetadata.c"
 	}
-#line 131 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 243 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	result = _tmp19_;
-#line 131 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 243 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	return result;
-#line 8539 "PhotoMetadata.c"
+#line 9628 "PhotoMetadata.c"
 }
 
 
 static void photo_metadata_internal_photo_preview_class_init (PhotoMetadataInternalPhotoPreviewClass * klass) {
-#line 114 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 226 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	photo_metadata_internal_photo_preview_parent_class = g_type_class_peek_parent (klass);
-#line 114 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 226 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	((PhotoPreviewClass *) klass)->finalize = photo_metadata_internal_photo_preview_finalize;
-#line 114 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 226 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	((PhotoPreviewClass *) klass)->flatten = photo_metadata_internal_photo_preview_real_flatten;
-#line 8550 "PhotoMetadata.c"
+#line 9639 "PhotoMetadata.c"
 }
 
 
@@ -8561,13 +9650,13 @@ static void photo_metadata_internal_photo_preview_instance_init (PhotoMetadataIn
 
 static void photo_metadata_internal_photo_preview_finalize (PhotoPreview* obj) {
 	PhotoMetadataInternalPhotoPreview * self;
-#line 114 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 226 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PHOTO_METADATA_TYPE_INTERNAL_PHOTO_PREVIEW, PhotoMetadataInternalPhotoPreview);
-#line 115 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 227 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_media_metadata_unref0 (self->owner);
-#line 114 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 226 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	PHOTO_PREVIEW_CLASS (photo_metadata_internal_photo_preview_parent_class)->finalize (obj);
-#line 8566 "PhotoMetadata.c"
+#line 9655 "PhotoMetadata.c"
 }
 
 
@@ -8587,293 +9676,375 @@ static void photo_metadata_class_init (PhotoMetadataClass * klass) {
 	gchar* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
 	gchar* _tmp2_ = NULL;
-	gchar** _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
+	gchar* _tmp3_ = NULL;
+	gchar** _tmp4_ = NULL;
 	gchar* _tmp5_ = NULL;
 	gchar* _tmp6_ = NULL;
 	gchar* _tmp7_ = NULL;
 	gchar* _tmp8_ = NULL;
 	gchar* _tmp9_ = NULL;
-	gchar** _tmp10_ = NULL;
-	gchar* _tmp11_ = NULL;
+	gchar* _tmp10_ = NULL;
+	gchar** _tmp11_ = NULL;
 	gchar* _tmp12_ = NULL;
-	gchar** _tmp13_ = NULL;
-	gchar* _tmp14_ = NULL;
+	gchar* _tmp13_ = NULL;
+	gchar** _tmp14_ = NULL;
 	gchar* _tmp15_ = NULL;
 	gchar* _tmp16_ = NULL;
 	gchar* _tmp17_ = NULL;
-	gchar** _tmp18_ = NULL;
-	gchar* _tmp19_ = NULL;
+	gchar* _tmp18_ = NULL;
+	gchar** _tmp19_ = NULL;
 	gchar* _tmp20_ = NULL;
 	gchar* _tmp21_ = NULL;
 	gchar* _tmp22_ = NULL;
-	gchar** _tmp23_ = NULL;
-	gchar* _tmp24_ = NULL;
+	gchar* _tmp23_ = NULL;
+	gchar** _tmp24_ = NULL;
 	gchar* _tmp25_ = NULL;
 	gchar* _tmp26_ = NULL;
 	gchar* _tmp27_ = NULL;
-	gchar** _tmp28_ = NULL;
+	gchar* _tmp28_ = NULL;
 	gchar* _tmp29_ = NULL;
-	gchar* _tmp30_ = NULL;
-	gchar** _tmp31_ = NULL;
-	HierarchicalKeywordField* _tmp32_ = NULL;
-	HierarchicalKeywordField* _tmp33_ = NULL;
-	HierarchicalKeywordField* _tmp34_ = NULL;
-	HierarchicalKeywordField** _tmp35_ = NULL;
+	gchar** _tmp30_ = NULL;
+	gchar* _tmp31_ = NULL;
+	gchar* _tmp32_ = NULL;
+	gchar** _tmp33_ = NULL;
+	gchar* _tmp34_ = NULL;
+	gchar* _tmp35_ = NULL;
 	gchar* _tmp36_ = NULL;
-	gchar* _tmp37_ = NULL;
-	gchar** _tmp38_ = NULL;
-	gchar* _tmp39_ = NULL;
-	gchar* _tmp40_ = NULL;
-	gchar* _tmp41_ = NULL;
-	gchar* _tmp42_ = NULL;
-	gchar** _tmp43_ = NULL;
-#line 99 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	gchar** _tmp37_ = NULL;
+	NullKeywordTransformer* _tmp38_ = NULL;
+	NullKeywordTransformer* _tmp39_ = NULL;
+	HierarchicalKeywordField* _tmp40_ = NULL;
+	NullKeywordTransformer* _tmp41_ = NULL;
+	NullKeywordTransformer* _tmp42_ = NULL;
+	HierarchicalKeywordField* _tmp43_ = NULL;
+	ACDSeeKeywordTransformer* _tmp44_ = NULL;
+	ACDSeeKeywordTransformer* _tmp45_ = NULL;
+	HierarchicalKeywordField* _tmp46_ = NULL;
+	NullKeywordTransformer* _tmp47_ = NULL;
+	NullKeywordTransformer* _tmp48_ = NULL;
+	HierarchicalKeywordField* _tmp49_ = NULL;
+	NullKeywordTransformer* _tmp50_ = NULL;
+	NullKeywordTransformer* _tmp51_ = NULL;
+	HierarchicalKeywordField* _tmp52_ = NULL;
+	HierarchicalKeywordField** _tmp53_ = NULL;
+	gchar* _tmp54_ = NULL;
+	gchar* _tmp55_ = NULL;
+	gchar* _tmp56_ = NULL;
+	gchar** _tmp57_ = NULL;
+	gchar* _tmp58_ = NULL;
+	gchar* _tmp59_ = NULL;
+	gchar* _tmp60_ = NULL;
+	gchar* _tmp61_ = NULL;
+	gchar* _tmp62_ = NULL;
+	gchar** _tmp63_ = NULL;
+#line 211 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	photo_metadata_parent_class = g_type_class_peek_parent (klass);
-#line 99 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 211 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	((MediaMetadataClass *) klass)->finalize = photo_metadata_finalize;
-#line 99 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 211 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	g_type_class_add_private (klass, sizeof (PhotoMetadataPrivate));
-#line 99 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 211 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	((MediaMetadataClass *) klass)->read_from_file = photo_metadata_real_read_from_file;
-#line 99 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 211 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	((MediaMetadataClass *) klass)->get_creation_date_time = photo_metadata_real_get_creation_date_time;
-#line 99 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 211 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	((MediaMetadataClass *) klass)->get_title = photo_metadata_real_get_title;
-#line 99 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 211 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	((MediaMetadataClass *) klass)->get_comment = photo_metadata_real_get_comment;
-#line 674 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 786 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0_ = g_strdup ("Exif.Image.DateTime");
-#line 674 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 786 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp1_ = g_strdup ("Xmp.tiff.DateTime");
-#line 674 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 786 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp2_ = g_strdup ("Xmp.xmp.ModifyDate");
-#line 674 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-	_tmp3_ = g_new0 (gchar*, 3 + 1);
-#line 674 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-	_tmp3_[0] = _tmp0_;
-#line 674 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-	_tmp3_[1] = _tmp1_;
-#line 674 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-	_tmp3_[2] = _tmp2_;
-#line 674 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-	photo_metadata_DATE_TIME_TAGS = _tmp3_;
-#line 674 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-	photo_metadata_DATE_TIME_TAGS_length1 = 3;
-#line 692 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-	_tmp4_ = g_strdup ("Exif.Photo.DateTimeOriginal");
-#line 692 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-	_tmp5_ = g_strdup ("Xmp.exif.DateTimeOriginal");
-#line 692 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-	_tmp6_ = g_strdup ("Xmp.xmp.CreateDate");
-#line 692 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-	_tmp7_ = g_strdup ("Exif.Photo.DateTimeDigitized");
-#line 692 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-	_tmp8_ = g_strdup ("Xmp.exif.DateTimeDigitized");
-#line 692 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-	_tmp9_ = g_strdup ("Exif.Image.DateTime");
-#line 692 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-	_tmp10_ = g_new0 (gchar*, 6 + 1);
-#line 692 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-	_tmp10_[0] = _tmp4_;
-#line 692 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-	_tmp10_[1] = _tmp5_;
-#line 692 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-	_tmp10_[2] = _tmp6_;
-#line 692 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-	_tmp10_[3] = _tmp7_;
-#line 692 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-	_tmp10_[4] = _tmp8_;
-#line 692 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-	_tmp10_[5] = _tmp9_;
-#line 692 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-	photo_metadata_EXPOSURE_DATE_TIME_TAGS = _tmp10_;
-#line 692 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 786 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	_tmp3_ = g_strdup ("Xmp.acdsee.datetime");
+#line 786 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	_tmp4_ = g_new0 (gchar*, 4 + 1);
+#line 786 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	_tmp4_[0] = _tmp0_;
+#line 786 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	_tmp4_[1] = _tmp1_;
+#line 786 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	_tmp4_[2] = _tmp2_;
+#line 786 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	_tmp4_[3] = _tmp3_;
+#line 786 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	photo_metadata_DATE_TIME_TAGS = _tmp4_;
+#line 786 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	photo_metadata_DATE_TIME_TAGS_length1 = 4;
+#line 805 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	_tmp5_ = g_strdup ("Exif.Photo.DateTimeOriginal");
+#line 805 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	_tmp6_ = g_strdup ("Xmp.exif.DateTimeOriginal");
+#line 805 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	_tmp7_ = g_strdup ("Xmp.xmp.CreateDate");
+#line 805 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	_tmp8_ = g_strdup ("Exif.Photo.DateTimeDigitized");
+#line 805 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	_tmp9_ = g_strdup ("Xmp.exif.DateTimeDigitized");
+#line 805 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	_tmp10_ = g_strdup ("Exif.Image.DateTime");
+#line 805 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	_tmp11_ = g_new0 (gchar*, 6 + 1);
+#line 805 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	_tmp11_[0] = _tmp5_;
+#line 805 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	_tmp11_[1] = _tmp6_;
+#line 805 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	_tmp11_[2] = _tmp7_;
+#line 805 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	_tmp11_[3] = _tmp8_;
+#line 805 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	_tmp11_[4] = _tmp9_;
+#line 805 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	_tmp11_[5] = _tmp10_;
+#line 805 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	photo_metadata_EXPOSURE_DATE_TIME_TAGS = _tmp11_;
+#line 805 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	photo_metadata_EXPOSURE_DATE_TIME_TAGS_length1 = 6;
-#line 713 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-	_tmp11_ = g_strdup ("Exif.Photo.DateTimeDigitized");
-#line 713 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-	_tmp12_ = g_strdup ("Xmp.exif.DateTimeDigitized");
-#line 713 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-	_tmp13_ = g_new0 (gchar*, 2 + 1);
-#line 713 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-	_tmp13_[0] = _tmp11_;
-#line 713 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-	_tmp13_[1] = _tmp12_;
-#line 713 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-	photo_metadata_DIGITIZED_DATE_TIME_TAGS = _tmp13_;
-#line 713 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 826 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	_tmp12_ = g_strdup ("Exif.Photo.DateTimeDigitized");
+#line 826 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	_tmp13_ = g_strdup ("Xmp.exif.DateTimeDigitized");
+#line 826 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	_tmp14_ = g_new0 (gchar*, 2 + 1);
+#line 826 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	_tmp14_[0] = _tmp12_;
+#line 826 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	_tmp14_[1] = _tmp13_;
+#line 826 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	photo_metadata_DIGITIZED_DATE_TIME_TAGS = _tmp14_;
+#line 826 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	photo_metadata_DIGITIZED_DATE_TIME_TAGS_length1 = 2;
-#line 738 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-	_tmp14_ = g_strdup ("Exif.Photo.PixelXDimension");
-#line 738 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-	_tmp15_ = g_strdup ("Xmp.exif.PixelXDimension");
-#line 738 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-	_tmp16_ = g_strdup ("Xmp.tiff.ImageWidth");
-#line 738 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-	_tmp17_ = g_strdup ("Xmp.exif.PixelXDimension");
-#line 738 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-	_tmp18_ = g_new0 (gchar*, 4 + 1);
-#line 738 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-	_tmp18_[0] = _tmp14_;
-#line 738 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-	_tmp18_[1] = _tmp15_;
-#line 738 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-	_tmp18_[2] = _tmp16_;
-#line 738 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-	_tmp18_[3] = _tmp17_;
-#line 738 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-	photo_metadata_WIDTH_TAGS = _tmp18_;
-#line 738 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 851 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	_tmp15_ = g_strdup ("Exif.Photo.PixelXDimension");
+#line 851 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	_tmp16_ = g_strdup ("Xmp.exif.PixelXDimension");
+#line 851 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	_tmp17_ = g_strdup ("Xmp.tiff.ImageWidth");
+#line 851 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	_tmp18_ = g_strdup ("Xmp.exif.PixelXDimension");
+#line 851 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	_tmp19_ = g_new0 (gchar*, 4 + 1);
+#line 851 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	_tmp19_[0] = _tmp15_;
+#line 851 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	_tmp19_[1] = _tmp16_;
+#line 851 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	_tmp19_[2] = _tmp17_;
+#line 851 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	_tmp19_[3] = _tmp18_;
+#line 851 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	photo_metadata_WIDTH_TAGS = _tmp19_;
+#line 851 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	photo_metadata_WIDTH_TAGS_length1 = 4;
-#line 745 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-	_tmp19_ = g_strdup ("Exif.Photo.PixelYDimension");
-#line 745 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-	_tmp20_ = g_strdup ("Xmp.exif.PixelYDimension");
-#line 745 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-	_tmp21_ = g_strdup ("Xmp.tiff.ImageHeight");
-#line 745 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-	_tmp22_ = g_strdup ("Xmp.exif.PixelYDimension");
-#line 745 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-	_tmp23_ = g_new0 (gchar*, 4 + 1);
-#line 745 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-	_tmp23_[0] = _tmp19_;
-#line 745 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-	_tmp23_[1] = _tmp20_;
-#line 745 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-	_tmp23_[2] = _tmp21_;
-#line 745 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-	_tmp23_[3] = _tmp22_;
-#line 745 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-	photo_metadata_HEIGHT_TAGS = _tmp23_;
-#line 745 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 858 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	_tmp20_ = g_strdup ("Exif.Photo.PixelYDimension");
+#line 858 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	_tmp21_ = g_strdup ("Xmp.exif.PixelYDimension");
+#line 858 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	_tmp22_ = g_strdup ("Xmp.tiff.ImageHeight");
+#line 858 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	_tmp23_ = g_strdup ("Xmp.exif.PixelYDimension");
+#line 858 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	_tmp24_ = g_new0 (gchar*, 4 + 1);
+#line 858 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	_tmp24_[0] = _tmp20_;
+#line 858 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	_tmp24_[1] = _tmp21_;
+#line 858 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	_tmp24_[2] = _tmp22_;
+#line 858 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	_tmp24_[3] = _tmp23_;
+#line 858 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	photo_metadata_HEIGHT_TAGS = _tmp24_;
+#line 858 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	photo_metadata_HEIGHT_TAGS_length1 = 4;
-#line 804 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-	_tmp24_ = g_strdup ("Iptc.Application2.Caption");
-#line 804 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-	_tmp25_ = g_strdup ("Xmp.dc.title");
-#line 804 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-	_tmp26_ = g_strdup ("Iptc.Application2.Headline");
-#line 804 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-	_tmp27_ = g_strdup ("Xmp.photoshop.Headline");
-#line 804 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-	_tmp28_ = g_new0 (gchar*, 4 + 1);
-#line 804 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-	_tmp28_[0] = _tmp24_;
-#line 804 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-	_tmp28_[1] = _tmp25_;
-#line 804 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-	_tmp28_[2] = _tmp26_;
-#line 804 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-	_tmp28_[3] = _tmp27_;
-#line 804 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-	photo_metadata_STANDARD_TITLE_TAGS = _tmp28_;
-#line 804 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-	photo_metadata_STANDARD_TITLE_TAGS_length1 = 4;
-#line 859 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-	_tmp29_ = g_strdup ("Xmp.dc.subject");
-#line 859 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-	_tmp30_ = g_strdup ("Iptc.Application2.Keywords");
-#line 859 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-	_tmp31_ = g_new0 (gchar*, 2 + 1);
-#line 859 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-	_tmp31_[0] = _tmp29_;
-#line 859 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-	_tmp31_[1] = _tmp30_;
-#line 859 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-	photo_metadata_KEYWORD_TAGS = _tmp31_;
-#line 859 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-	photo_metadata_KEYWORD_TAGS_length1 = 2;
-#line 864 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-	_tmp32_ = hierarchical_keyword_field_new ("Xmp.lr.hierarchicalSubject", "|", FALSE, FALSE);
-#line 864 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-	_tmp33_ = hierarchical_keyword_field_new ("Xmp.digiKam.TagsList", "/", FALSE, TRUE);
-#line 864 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-	_tmp34_ = hierarchical_keyword_field_new ("Xmp.MicrosoftPhoto.LastKeywordXMP", "/", FALSE, TRUE);
-#line 864 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-	_tmp35_ = g_new0 (HierarchicalKeywordField*, 3 + 1);
-#line 864 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-	_tmp35_[0] = _tmp32_;
-#line 864 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-	_tmp35_[1] = _tmp33_;
-#line 864 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-	_tmp35_[2] = _tmp34_;
-#line 864 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-	photo_metadata_HIERARCHICAL_KEYWORD_TAGS = _tmp35_;
-#line 864 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-	photo_metadata_HIERARCHICAL_KEYWORD_TAGS_length1 = 3;
-#line 1091 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-	_tmp36_ = g_strdup ("Exif.Image.Artist");
-#line 1091 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-	_tmp37_ = g_strdup ("Exif.Canon.OwnerName");
-#line 1091 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-	_tmp38_ = g_new0 (gchar*, 2 + 1);
-#line 1091 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-	_tmp38_[0] = _tmp36_;
-#line 1091 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-	_tmp38_[1] = _tmp37_;
-#line 1091 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-	photo_metadata_ARTIST_TAGS = _tmp38_;
-#line 1091 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-	photo_metadata_ARTIST_TAGS_length1 = 2;
-#line 1128 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-	_tmp39_ = g_strdup ("Xmp.xmp.Rating");
-#line 1128 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-	_tmp40_ = g_strdup ("Iptc.Application2.Urgency");
-#line 1128 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-	_tmp41_ = g_strdup ("Xmp.photoshop.Urgency");
-#line 1128 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-	_tmp42_ = g_strdup ("Exif.Image.Rating");
-#line 1128 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-	_tmp43_ = g_new0 (gchar*, 4 + 1);
-#line 1128 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-	_tmp43_[0] = _tmp39_;
-#line 1128 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-	_tmp43_[1] = _tmp40_;
-#line 1128 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-	_tmp43_[2] = _tmp41_;
-#line 1128 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-	_tmp43_[3] = _tmp42_;
-#line 1128 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-	photo_metadata_RATING_TAGS = _tmp43_;
-#line 1128 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
-	photo_metadata_RATING_TAGS_length1 = 4;
-#line 8837 "PhotoMetadata.c"
+#line 917 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	_tmp25_ = g_strdup ("Iptc.Application2.Caption");
+#line 917 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	_tmp26_ = g_strdup ("Xmp.dc.title");
+#line 917 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	_tmp27_ = g_strdup ("Iptc.Application2.Headline");
+#line 917 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	_tmp28_ = g_strdup ("Xmp.photoshop.Headline");
+#line 917 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	_tmp29_ = g_strdup ("Xmp.acdsee.caption");
+#line 917 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	_tmp30_ = g_new0 (gchar*, 5 + 1);
+#line 917 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	_tmp30_[0] = _tmp25_;
+#line 917 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	_tmp30_[1] = _tmp26_;
+#line 917 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	_tmp30_[2] = _tmp27_;
+#line 917 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	_tmp30_[3] = _tmp28_;
+#line 917 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	_tmp30_[4] = _tmp29_;
+#line 917 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	photo_metadata_STANDARD_TITLE_TAGS = _tmp30_;
+#line 917 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	photo_metadata_STANDARD_TITLE_TAGS_length1 = 5;
+#line 962 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	_tmp31_ = g_strdup ("Exif.Photo.UserComment");
+#line 962 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	_tmp32_ = g_strdup ("Xmp.acdsee.notes");
+#line 962 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	_tmp33_ = g_new0 (gchar*, 2 + 1);
+#line 962 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	_tmp33_[0] = _tmp31_;
+#line 962 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	_tmp33_[1] = _tmp32_;
+#line 962 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	photo_metadata_COMMENT_TAGS = _tmp33_;
+#line 962 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	photo_metadata_COMMENT_TAGS_length1 = 2;
+#line 979 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	_tmp34_ = g_strdup ("Xmp.dc.subject");
+#line 979 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	_tmp35_ = g_strdup ("Iptc.Application2.Keywords");
+#line 979 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	_tmp36_ = g_strdup ("Xmp.xmp.Label");
+#line 979 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	_tmp37_ = g_new0 (gchar*, 3 + 1);
+#line 979 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	_tmp37_[0] = _tmp34_;
+#line 979 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	_tmp37_[1] = _tmp35_;
+#line 979 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	_tmp37_[2] = _tmp36_;
+#line 979 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	photo_metadata_KEYWORD_TAGS = _tmp37_;
+#line 979 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	photo_metadata_KEYWORD_TAGS_length1 = 3;
+#line 985 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	_tmp38_ = null_keyword_transformer_new ();
+#line 985 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	_tmp39_ = _tmp38_;
+#line 985 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	_tmp40_ = hierarchical_keyword_field_new ("Xmp.lr.hierarchicalSubject", "|", FALSE, FALSE, G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, TYPE_KEYWORD_TRANSFORMER, KeywordTransformer));
+#line 985 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	_tmp41_ = null_keyword_transformer_new ();
+#line 985 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	_tmp42_ = _tmp41_;
+#line 985 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	_tmp43_ = hierarchical_keyword_field_new ("Xmp.acdsee.keywords", "|", FALSE, FALSE, G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, TYPE_KEYWORD_TRANSFORMER, KeywordTransformer));
+#line 985 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	_tmp44_ = acd_see_keyword_transformer_new ();
+#line 985 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	_tmp45_ = _tmp44_;
+#line 985 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	_tmp46_ = hierarchical_keyword_field_new ("Xmp.acdsee.categories", "|", FALSE, FALSE, G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, TYPE_KEYWORD_TRANSFORMER, KeywordTransformer));
+#line 985 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	_tmp47_ = null_keyword_transformer_new ();
+#line 985 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	_tmp48_ = _tmp47_;
+#line 985 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	_tmp49_ = hierarchical_keyword_field_new ("Xmp.digiKam.TagsList", "/", FALSE, TRUE, G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, TYPE_KEYWORD_TRANSFORMER, KeywordTransformer));
+#line 985 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	_tmp50_ = null_keyword_transformer_new ();
+#line 985 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	_tmp51_ = _tmp50_;
+#line 985 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	_tmp52_ = hierarchical_keyword_field_new ("Xmp.MicrosoftPhoto.LastKeywordXMP", "/", FALSE, TRUE, G_TYPE_CHECK_INSTANCE_CAST (_tmp51_, TYPE_KEYWORD_TRANSFORMER, KeywordTransformer));
+#line 985 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	_tmp53_ = g_new0 (HierarchicalKeywordField*, 5 + 1);
+#line 985 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	_tmp53_[0] = _tmp40_;
+#line 985 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	_tmp53_[1] = _tmp43_;
+#line 985 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	_tmp53_[2] = _tmp46_;
+#line 985 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	_tmp53_[3] = _tmp49_;
+#line 985 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	_tmp53_[4] = _tmp52_;
+#line 985 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	photo_metadata_HIERARCHICAL_KEYWORD_TAGS = _tmp53_;
+#line 985 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	photo_metadata_HIERARCHICAL_KEYWORD_TAGS_length1 = 5;
+#line 1228 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	_tmp54_ = g_strdup ("Exif.Image.Artist");
+#line 1228 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	_tmp55_ = g_strdup ("Exif.Canon.OwnerName");
+#line 1228 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	_tmp56_ = g_strdup ("Xmp.acdsee.author");
+#line 1228 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	_tmp57_ = g_new0 (gchar*, 3 + 1);
+#line 1228 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	_tmp57_[0] = _tmp54_;
+#line 1228 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	_tmp57_[1] = _tmp55_;
+#line 1228 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	_tmp57_[2] = _tmp56_;
+#line 1228 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	photo_metadata_ARTIST_TAGS = _tmp57_;
+#line 1228 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	photo_metadata_ARTIST_TAGS_length1 = 3;
+#line 1266 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	_tmp58_ = g_strdup ("Xmp.xmp.Rating");
+#line 1266 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	_tmp59_ = g_strdup ("Iptc.Application2.Urgency");
+#line 1266 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	_tmp60_ = g_strdup ("Xmp.photoshop.Urgency");
+#line 1266 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	_tmp61_ = g_strdup ("Exif.Image.Rating");
+#line 1266 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	_tmp62_ = g_strdup ("Xmp.acdsee.rating");
+#line 1266 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	_tmp63_ = g_new0 (gchar*, 5 + 1);
+#line 1266 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	_tmp63_[0] = _tmp58_;
+#line 1266 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	_tmp63_[1] = _tmp59_;
+#line 1266 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	_tmp63_[2] = _tmp60_;
+#line 1266 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	_tmp63_[3] = _tmp61_;
+#line 1266 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	_tmp63_[4] = _tmp62_;
+#line 1266 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	photo_metadata_RATING_TAGS = _tmp63_;
+#line 1266 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+	photo_metadata_RATING_TAGS_length1 = 5;
+#line 10008 "PhotoMetadata.c"
 }
 
 
 static void photo_metadata_instance_init (PhotoMetadata * self) {
 	GExiv2Metadata* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
-#line 99 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 211 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	self->priv = PHOTO_METADATA_GET_PRIVATE (self);
-#line 135 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 247 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp0_ = gexiv2_metadata_new ();
-#line 135 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 247 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	self->priv->exiv2 = _tmp0_;
-#line 136 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 248 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	self->priv->exif = NULL;
-#line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 249 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_tmp1_ = g_strdup ("<uninitialized>");
-#line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 249 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	self->priv->source_name = _tmp1_;
-#line 8856 "PhotoMetadata.c"
+#line 10027 "PhotoMetadata.c"
 }
 
 
 static void photo_metadata_finalize (MediaMetadata* obj) {
 	PhotoMetadata * self;
-#line 99 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 211 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PHOTO_METADATA, PhotoMetadata);
-#line 135 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 247 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_g_object_unref0 (self->priv->exiv2);
-#line 136 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 248 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_exif_data_unref0 (self->priv->exif);
-#line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 249 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	_g_free0 (self->priv->source_name);
-#line 99 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+#line 211 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
 	MEDIA_METADATA_CLASS (photo_metadata_parent_class)->finalize (obj);
-#line 8872 "PhotoMetadata.c"
+#line 10043 "PhotoMetadata.c"
 }
 
 
diff --git a/src/photos/PhotoMetadata.vala b/src/photos/PhotoMetadata.vala
index a410499..814ea6b 100644
--- a/src/photos/PhotoMetadata.vala
+++ b/src/photos/PhotoMetadata.vala
@@ -28,18 +28,130 @@ public enum MetadataDomain {
     IPTC
 }
 
+public abstract class KeywordTransformer {
+    public abstract Gee.List<string> transform (string input) throws Error;
+}
+
+public class NullKeywordTransformer : KeywordTransformer {
+    public override Gee.List<string> transform (string input) throws Error {
+        var result = new Gee.ArrayList<string> ();
+        result.add (input);
+
+        return result;
+    }
+}
+
+/* Transforms ACDSEE's pseudo-XML category format into Lightroom format
+ * <Categories>
+ * <Category Assigned=\"1\">Alben
+ *   <Category Assigned=\"1\">Flowers</Category>
+ * </Category>
+ * <Category Assigned=\"1\">Orte</Category>
+ * <Category Assigned=\"1\">Verschiedenes</Category>
+ * </Categories>
+ *
+ * Will be transformed to a list of Alben, Alben|Flowers, Orte, Verschiedenes
+ */
+public class ACDSeeKeywordTransformer : KeywordTransformer {
+    private MarkupParser parser;
+    private Error error;
+    private Gee.ArrayQueue<string> stack;
+    private Gee.ArrayList<string> result;
+    private bool assigned;
+
+    public ACDSeeKeywordTransformer() {
+        this.parser = MarkupParser ();
+        this.parser.start_element = this.on_start;
+        this.parser.end_element = this.on_end;
+        this.parser.text = this.on_text;
+        this.parser.error = this.on_error;
+        this.result = new Gee.ArrayList<string> ();
+        this.stack = new Gee.ArrayQueue<string> ();
+    }
+
+    public override Gee.List<string> transform (string input) throws Error {
+        var ctx = new MarkupParseContext (this.parser, 0, this, null);
+
+        ctx.parse (input, input.length);
+
+        return result;
+    }
+
+    private void on_start (MarkupParseContext ctx,
+                           string name,
+                           [CCode (array_null_terminated = true,
+                                   array_length = false)]
+                           string[] attribute_names,
+                           [CCode (array_null_terminated = true,
+                                   array_length = false)]
+                           string[] attribute_values) throws MarkupError {
+        this.assigned = false;
+        if (name == "Categories") {
+            return;
+        }
+
+        if (name != "Category") {
+            return;
+        }
+
+        Workaround.markup_collect_attributes (name,
+                                              attribute_names,
+                                              attribute_values,
+                                              Markup.CollectType.BOOLEAN,
+                                              "Assigned", out assigned);
+    }
+
+    private void on_end (MarkupParseContext ctx, string name)
+                         throws MarkupError {
+        if (name == "Category") {
+            this.stack.poll_tail ();
+        }
+    }
+
+    private void on_text (MarkupParseContext ctx, string text)
+                          throws MarkupError {
+        if (text == "") {
+            return;
+        }
+
+        this.stack.offer_tail (text);
+        if (this.assigned) {
+            var builder = new StringBuilder ();
+            foreach (var f in this.stack) {
+                builder.append_printf ("%s|", f);
+            }
+            if (builder.len > 0) {
+                builder.truncate (builder.len - 1);
+            }
+            this.result.add (builder.str);
+        }
+    }
+
+    private void on_error (MarkupParseContext ctx, Error error) {
+        this.error = error;
+    }
+}
+
+
+
 public class HierarchicalKeywordField {
     public string field_name;
     public string path_separator;
     public bool wants_leading_separator;
     public bool is_writeable;
-    
-    public HierarchicalKeywordField(string field_name, string path_separator,
-        bool wants_leading_separator, bool is_writeable) {
+    public KeywordTransformer transformer;
+
+    public HierarchicalKeywordField(string field_name,
+                                    string path_separator,
+                                    bool wants_leading_separator,
+                                    bool is_writeable,
+                                    KeywordTransformer transformer =
+                                        new NullKeywordTransformer ()) {
         this.field_name = field_name;
         this.path_separator = path_separator;
         this.wants_leading_separator = wants_leading_separator;
         this.is_writeable = is_writeable;
+        this.transformer = transformer;
     }
 }
 
@@ -674,7 +786,8 @@ public class PhotoMetadata : MediaMetadata {
     private static string[] DATE_TIME_TAGS = {
         "Exif.Image.DateTime",
         "Xmp.tiff.DateTime",
-        "Xmp.xmp.ModifyDate"
+        "Xmp.xmp.ModifyDate",
+        "Xmp.acdsee.datetime"
     };
     
     public MetadataDateTime? get_modification_date_time() {
@@ -805,7 +918,8 @@ public class PhotoMetadata : MediaMetadata {
         "Iptc.Application2.Caption",
         "Xmp.dc.title",
         "Iptc.Application2.Headline",
-        "Xmp.photoshop.Headline"
+        "Xmp.photoshop.Headline",
+        "Xmp.acdsee.caption"
     };
     
     public override string? get_title() {
@@ -844,27 +958,37 @@ public class PhotoMetadata : MediaMetadata {
             remove_tags(STANDARD_TITLE_TAGS);
         }
     }
+
+    private static string[] COMMENT_TAGS = {
+        "Exif.Photo.UserComment",
+        "Xmp.acdsee.notes"
+    };
     
     public override string? get_comment() {
-        return get_string_interpreted("Exif.Photo.UserComment", PrepareInputTextOptions.DEFAULT & ~PrepareInputTextOptions.STRIP_CRLF);
+        return get_first_string_interpreted (COMMENT_TAGS);
     }
     
-    public void set_comment(string? comment) {
+    public void set_comment(string? comment,
+                            SetOption option = SetOption.ALL_DOMAINS) {
         if (!is_string_empty(comment))
-            set_string("Exif.Photo.UserComment", comment, PrepareInputTextOptions.DEFAULT & ~PrepareInputTextOptions.STRIP_CRLF);
+            set_all_string(COMMENT_TAGS, comment, option);
         else
-            remove_tag("Exif.Photo.UserComment");
+            remove_tags(COMMENT_TAGS);
     }
     
     private static string[] KEYWORD_TAGS = {
         "Xmp.dc.subject",
-        "Iptc.Application2.Keywords"
+        "Iptc.Application2.Keywords",
+        "Xmp.xmp.Label"
     };
     
     private static HierarchicalKeywordField[] HIERARCHICAL_KEYWORD_TAGS = {
         // Xmp.lr.hierarchicalSubject should be writeable but isn't due to this bug
         // in libexiv2: http://dev.exiv2.org/issues/784
         new HierarchicalKeywordField("Xmp.lr.hierarchicalSubject", "|", false, false),
+        new HierarchicalKeywordField("Xmp.acdsee.keywords", "|", false, false),
+        new HierarchicalKeywordField("Xmp.acdsee.categories", "|", false, false,
+                                     new ACDSeeKeywordTransformer ()),
         new HierarchicalKeywordField("Xmp.digiKam.TagsList", "/", false, true),
         new HierarchicalKeywordField("Xmp.MicrosoftPhoto.LastKeywordXMP", "/", false, true)
     };
@@ -960,9 +1084,22 @@ public class PhotoMetadata : MediaMetadata {
             
             if (values == null || values.size < 1)
                 continue;
+
+            var transformed_values = new Gee.ArrayList<string> ();
+            foreach (var current_value in values) {
+                try {
+                    var transformed = field.transformer.transform (current_value);
+                    transformed_values.add_all (transformed);
+                } catch (Error error) {
+                    critical ("Failed to transform tag value %s: %s",
+                              current_value,
+                              error.message);
+                }
+            }
             
-            foreach (string current_value in values) {
-                string? canonicalized = HierarchicalTagUtilities.canonicalize(current_value,
+            foreach (var current_value in transformed_values) {
+                string? canonicalized =
+                    HierarchicalTagUtilities.canonicalize(current_value,
                     field.path_separator);
 
                 if (canonicalized != null)
@@ -1090,7 +1227,8 @@ public class PhotoMetadata : MediaMetadata {
     
     private static string[] ARTIST_TAGS = {
         "Exif.Image.Artist",
-        "Exif.Canon.OwnerName" // Custom tag used by Canon DSLR cameras
+        "Exif.Canon.OwnerName", // Custom tag used by Canon DSLR cameras
+        "Xmp.acdsee.author" // Custom tag used by ACDSEE software
     };
     
     public string? get_artist() {
@@ -1129,7 +1267,8 @@ public class PhotoMetadata : MediaMetadata {
         "Xmp.xmp.Rating",
         "Iptc.Application2.Urgency",
         "Xmp.photoshop.Urgency",
-        "Exif.Image.Rating"
+        "Exif.Image.Rating",
+        "Xmp.acdsee.rating",
     };
     
     public Rating get_rating() {
diff --git a/src/photos/RawSupport.c b/src/photos/RawSupport.c
index 14d1fbe..ae5875d 100644
--- a/src/photos/RawSupport.c
+++ b/src/photos/RawSupport.c
@@ -1745,7 +1745,7 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base,
 #line 176 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			if (_inner_error_->domain == GRAW_EXCEPTION) {
 #line 1748 "RawSupport.c"
-				goto __catch29_graw_exception;
+				goto __catch30_graw_exception;
 			}
 #line 176 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			_graw_processor_unref0 (processor);
@@ -1768,7 +1768,7 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base,
 #line 177 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			if (_inner_error_->domain == GRAW_EXCEPTION) {
 #line 1771 "RawSupport.c"
-				goto __catch29_graw_exception;
+				goto __catch30_graw_exception;
 			}
 #line 177 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			_graw_processor_unref0 (processor);
@@ -1791,7 +1791,7 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base,
 #line 178 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			if (_inner_error_->domain == GRAW_EXCEPTION) {
 #line 1794 "RawSupport.c"
-				goto __catch29_graw_exception;
+				goto __catch30_graw_exception;
 			}
 #line 178 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			_graw_processor_unref0 (processor);
@@ -1806,8 +1806,8 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base,
 #line 1807 "RawSupport.c"
 		}
 	}
-	goto __finally29;
-	__catch29_graw_exception:
+	goto __finally30;
+	__catch30_graw_exception:
 	{
 		GError* exception = NULL;
 		GError* _tmp11_ = NULL;
@@ -1848,9 +1848,9 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base,
 #line 183 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_g_error_free0 (exception);
 #line 1851 "RawSupport.c"
-		goto __finally29;
+		goto __finally30;
 	}
-	__finally29:
+	__finally30:
 #line 175 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 175 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
@@ -1921,7 +1921,7 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base,
 #line 193 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1924 "RawSupport.c"
-			goto __catch30_g_error;
+			goto __catch31_g_error;
 		}
 #line 193 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_tmp32_ = detected;
@@ -1937,8 +1937,8 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base,
 		_media_metadata_unref0 (_tmp29_);
 #line 1939 "RawSupport.c"
 	}
-	goto __finally30;
-	__catch30_g_error:
+	goto __finally31;
+	__catch31_g_error:
 	{
 		GError* err = NULL;
 #line 192 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
@@ -1949,7 +1949,7 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base,
 		_g_error_free0 (err);
 #line 1951 "RawSupport.c"
 	}
-	__finally30:
+	__finally31:
 #line 192 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 192 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
diff --git a/src/plugins/ManifestWidget.c b/src/plugins/ManifestWidget.c
index fdc843c..486c98c 100644
--- a/src/plugins/ManifestWidget.c
+++ b/src/plugins/ManifestWidget.c
@@ -1430,7 +1430,7 @@ PluginsManifestListView* plugins_manifest_list_view_construct (GType object_type
 #line 180 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 						if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1433 "ManifestWidget.c"
-							goto __catch33_g_error;
+							goto __catch34_g_error;
 						}
 #line 180 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 						_tmp53_ = _tmp50_;
@@ -1444,8 +1444,8 @@ PluginsManifestListView* plugins_manifest_list_view_construct (GType object_type
 						_g_object_unref0 (_tmp50_);
 #line 1446 "ManifestWidget.c"
 					}
-					goto __finally33;
-					__catch33_g_error:
+					goto __finally34;
+					__catch34_g_error:
 					{
 						GError* err = NULL;
 						PluginsExtensionPoint* _tmp54_ = NULL;
@@ -1473,7 +1473,7 @@ PluginsManifestListView* plugins_manifest_list_view_construct (GType object_type
 						_g_error_free0 (err);
 #line 1475 "ManifestWidget.c"
 					}
-					__finally33:
+					__finally34:
 #line 179 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 					if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 179 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
diff --git a/src/plugins/Plugins.c b/src/plugins/Plugins.c
index 4928cf4..f5c638c 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 __catch31_g_error;
+						goto __catch32_g_error;
 					}
 				}
-				goto __finally31;
-				__catch31_g_error:
+				goto __finally32;
+				__catch32_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"
 				}
-				__finally31:
+				__finally32:
 #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"
@@ -3691,7 +3691,7 @@ void plugins_search_for_plugins (GFile* dir, GError** error) {
 #line 316 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	_tmp2_ = _tmp1_;
 #line 316 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
-	g_debug ("Plugins.vala:316: Searching %s for plugins ...", _tmp2_);
+	g_debug ("Plugins.vala:316: Searching %s for plugins…", _tmp2_);
 #line 316 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 	_g_free0 (_tmp2_);
 #line 320 "/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 __catch32_g_error;
+							goto __catch33_g_error;
 						}
 					}
-					goto __finally32;
-					__catch32_g_error:
+					goto __finally33;
+					__catch33_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"
 					}
-					__finally32:
+					__finally33:
 #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/Plugins.vala b/src/plugins/Plugins.vala
index 0e03f67..5f6613c 100644
--- a/src/plugins/Plugins.vala
+++ b/src/plugins/Plugins.vala
@@ -313,7 +313,7 @@ private bool is_shared_library(File file) {
 }
 
 private void search_for_plugins(File dir) throws Error {
-    debug("Searching %s for plugins ...", dir.get_path());
+    debug("Searching %s for plugins…", dir.get_path());
     
     // build a set of module names sans file extension ... this is to deal with the question of
     // .so vs. .la existing in the same directory (and letting GModule deal with the problem)
diff --git a/src/publishing/APIGlue.c b/src/publishing/APIGlue.c
index bce21cd..92b9412 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 __catch35_g_error;
+			goto __catch36_g_error;
 		}
 	}
-	goto __finally35;
-	__catch35_g_error:
+	goto __finally36;
+	__catch36_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"
 	}
-	__finally35:
+	__finally36:
 #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 __catch36_g_error;
+				goto __catch37_g_error;
 			}
 		}
-		goto __finally36;
-		__catch36_g_error:
+		goto __finally37;
+		__catch37_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 __finally36;
+			goto __finally37;
 		}
-		__finally36:
+		__finally37:
 #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 __catch37_g_error;
+					goto __catch38_g_error;
 				}
 			}
-			goto __finally37;
-			__catch37_g_error:
+			goto __finally38;
+			__catch38_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 __finally37;
+				goto __finally38;
 			}
-			__finally37:
+			__finally38:
 #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 dd04855..6e24dc1 100644
--- a/src/publishing/PublishingPluginHost.c
+++ b/src/publishing/PublishingPluginHost.c
@@ -618,7 +618,7 @@ static void spit_publishing_concrete_publishing_host_real_post_error (SpitPublis
 #line 80 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SPIT_PUBLISHING_TYPE_CONCRETE_PUBLISHING_HOST, SpitPublishingConcretePublishingHost);
 #line 81 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
-	_tmp0_ = _ ("Publishing to %s can't continue because an error occurred:");
+	_tmp0_ = _ ("Publishing to %s can’t continue because an error occurred:");
 #line 81 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 	_tmp1_ = self->priv->active_publisher;
 #line 81 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
@@ -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 __catch34_spit_publishing_publishing_error;
+							goto __catch35_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 __finally34;
-				__catch34_spit_publishing_publishing_error:
+				goto __finally35;
+				__catch35_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"
 				}
-				__finally34:
+				__finally35:
 #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/publishing/PublishingPluginHost.vala b/src/publishing/PublishingPluginHost.vala
index fed3802..ca935ab 100644
--- a/src/publishing/PublishingPluginHost.vala
+++ b/src/publishing/PublishingPluginHost.vala
@@ -78,7 +78,7 @@ public class ConcretePublishingHost : Plugins.StandardHostInterface,
     }
     
     public void post_error(Error err) {
-        string msg = _("Publishing to %s can't continue because an error occurred:").printf(
+        string msg = _("Publishing to %s can’t continue because an error occurred:").printf(
             active_publisher.get_service().get_pluggable_name());
         msg += GLib.Markup.printf_escaped("\n\n<i>%s</i>\n\n", err.message);
         msg += _("To try publishing to another service, select one from the above menu.");
diff --git a/src/publishing/PublishingUI.c b/src/publishing/PublishingUI.c
index 53471cd..a057694 100644
--- a/src/publishing/PublishingUI.c
+++ b/src/publishing/PublishingUI.c
@@ -1213,7 +1213,7 @@ PublishingUIAccountFetchWaitPane* publishing_ui_account_fetch_wait_pane_construc
 	PublishingUIAccountFetchWaitPane * self = NULL;
 	const gchar* _tmp0_ = NULL;
 #line 122 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	_tmp0_ = _ ("Fetching account information...");
+	_tmp0_ = _ ("Fetching account information…");
 #line 122 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	self = (PublishingUIAccountFetchWaitPane*) publishing_ui_static_message_pane_construct (object_type, _tmp0_, FALSE);
 #line 121 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
@@ -1256,7 +1256,7 @@ PublishingUILoginWaitPane* publishing_ui_login_wait_pane_construct (GType object
 	PublishingUILoginWaitPane * self = NULL;
 	const gchar* _tmp0_ = NULL;
 #line 128 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
-	_tmp0_ = _ ("Logging in...");
+	_tmp0_ = _ ("Logging in…");
 #line 128 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
 	self = (PublishingUILoginWaitPane*) publishing_ui_static_message_pane_construct (object_type, _tmp0_, FALSE);
 #line 127 "/home/jens/Source/shotwell/src/publishing/PublishingUI.vala"
diff --git a/src/publishing/PublishingUI.vala b/src/publishing/PublishingUI.vala
index f1e4ce6..c0c3a34 100644
--- a/src/publishing/PublishingUI.vala
+++ b/src/publishing/PublishingUI.vala
@@ -119,13 +119,13 @@ public class SuccessPane : StaticMessagePane {
 
 public class AccountFetchWaitPane : StaticMessagePane {
     public AccountFetchWaitPane() {
-        base(_("Fetching account information..."));
+        base(_("Fetching account information…"));
     }
 }
 
 public class LoginWaitPane : StaticMessagePane {
     public LoginWaitPane() {
-        base(_("Logging in..."));
+        base(_("Logging in…"));
     }
 }
 
diff --git a/src/searches/Branch.c b/src/searches/Branch.c
index 2e6e87f..7a2a970 100644
--- a/src/searches/Branch.c
+++ b/src/searches/Branch.c
@@ -1087,7 +1087,7 @@ static void searches_header_setup_context_menu (SearchesHeader* self) {
 #line 76 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	new_search = _tmp2_;
 #line 77 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	_tmp3_ = _ ("Ne_w Saved Search...");
+	_tmp3_ = _ ("Ne_w Saved Search…");
 #line 77 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	new_search.label = _tmp3_;
 #line 78 "/home/jens/Source/shotwell/src/searches/Branch.vala"
@@ -1130,11 +1130,11 @@ static void searches_header_setup_context_menu (SearchesHeader* self) {
 #line 85 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1133 "Branch.c"
-			goto __catch73_g_error;
+			goto __catch74_g_error;
 		}
 	}
-	goto __finally73;
-	__catch73_g_error:
+	goto __finally74;
+	__catch74_g_error:
 	{
 		GError* err = NULL;
 		gchar* _tmp12_ = NULL;
@@ -1179,7 +1179,7 @@ static void searches_header_setup_context_menu (SearchesHeader* self) {
 		_g_error_free0 (err);
 #line 1181 "Branch.c"
 	}
-	__finally73:
+	__finally74:
 #line 84 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 84 "/home/jens/Source/shotwell/src/searches/Branch.vala"
diff --git a/src/searches/Branch.vala b/src/searches/Branch.vala
index b8ed334..0c86733 100644
--- a/src/searches/Branch.vala
+++ b/src/searches/Branch.vala
@@ -74,7 +74,7 @@ public class Searches.Header : Sidebar.Header, Sidebar.Contextable {
         Gtk.ActionEntry[] actions = new Gtk.ActionEntry[0];
         
         Gtk.ActionEntry new_search = { "CommonNewSearch", null, TRANSLATABLE, null, null, on_new_search };
-        new_search.label = _("Ne_w Saved Search...");
+        new_search.label = _("Ne_w Saved Search…");
         actions += new_search;
         
         group.add_actions(actions, this);
diff --git a/src/searches/SavedSearchPage.c b/src/searches/SavedSearchPage.c
index b55e498..2b40a55 100644
--- a/src/searches/SavedSearchPage.c
+++ b/src/searches/SavedSearchPage.c
@@ -825,8 +825,8 @@ SavedSearchDialog* saved_search_dialog_construct_edit_existing (GType object_typ
 void saved_search_dialog_show (SavedSearchDialog* self);
 static void saved_search_page_real_update_actions (Page* base, gint selected_count, gint count);
 void page_set_action_details (Page* self, const gchar* name, const gchar* label, const gchar* tooltip, gboolean sensitive);
-#define RESOURCES_RENAME_SEARCH_MENU _ ("Re_name...")
-#define RESOURCES_EDIT_SEARCH_MENU _ ("_Edit...")
+#define RESOURCES_RENAME_SEARCH_MENU _ ("Re_name…")
+#define RESOURCES_EDIT_SEARCH_MENU _ ("_Edit…")
 #define RESOURCES_DELETE_SEARCH_MENU _ ("_Delete")
 void page_update_actions (Page* self, gint selected_count, gint count);
 static void saved_search_page_finalize (GObject* obj);
diff --git a/src/searches/SearchBoolean.c b/src/searches/SearchBoolean.c
index 0490d60..4918ae1 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 __catch74_database_error;
+				goto __catch75_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 __finally74;
-	__catch74_database_error:
+	goto __finally75;
+	__catch75_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"
 	}
-	__finally74:
+	__finally75:
 #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 __catch75_database_error;
+				goto __catch76_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 __finally75;
-	__catch75_database_error:
+	goto __finally76;
+	__catch76_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"
 	}
-	__finally75:
+	__finally76:
 #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 __catch76_database_error;
+				goto __catch77_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 __finally76;
-	__catch76_database_error:
+	goto __finally77;
+	__catch77_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"
 	}
-	__finally76:
+	__finally77:
 #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 __catch77_database_error;
+				goto __catch78_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 __finally77;
-	__catch77_database_error:
+	goto __finally78;
+	__catch78_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"
 	}
-	__finally77:
+	__finally78:
 #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 __catch78_database_error;
+				goto __catch79_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 __finally78;
-	__catch78_database_error:
+	goto __finally79;
+	__catch79_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"
 	}
-	__finally78:
+	__finally79:
 #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 c18f988..d3725be 100644
--- a/src/sidebar/Tree.c
+++ b/src/sidebar/Tree.c
@@ -1291,7 +1291,7 @@ static void sidebar_tree_setup_default_context_menu (SidebarTree* self) {
 #line 198 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	new_search = _tmp2_;
 #line 199 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp3_ = _ ("Ne_w Saved Search...");
+	_tmp3_ = _ ("Ne_w Saved Search…");
 #line 199 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	new_search.label = _tmp3_;
 #line 200 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -1317,7 +1317,7 @@ static void sidebar_tree_setup_default_context_menu (SidebarTree* self) {
 #line 202 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	new_tag = _tmp6_;
 #line 203 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	_tmp7_ = _ ("New _Tag...");
+	_tmp7_ = _ ("New _Tag…");
 #line 203 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	new_tag.label = _tmp7_;
 #line 204 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -1360,11 +1360,11 @@ static void sidebar_tree_setup_default_context_menu (SidebarTree* self) {
 #line 211 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1363 "Tree.c"
-			goto __catch48_g_error;
+			goto __catch49_g_error;
 		}
 	}
-	goto __finally48;
-	__catch48_g_error:
+	goto __finally49;
+	__catch49_g_error:
 	{
 		GError* err = NULL;
 		gchar* _tmp16_ = NULL;
@@ -1409,7 +1409,7 @@ static void sidebar_tree_setup_default_context_menu (SidebarTree* self) {
 		_g_error_free0 (err);
 #line 1411 "Tree.c"
 	}
-	__finally48:
+	__finally49:
 #line 210 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 210 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
diff --git a/src/sidebar/Tree.vala b/src/sidebar/Tree.vala
index f32f87f..0fd9144 100644
--- a/src/sidebar/Tree.vala
+++ b/src/sidebar/Tree.vala
@@ -196,11 +196,11 @@ public class Sidebar.Tree : Gtk.TreeView {
         Gtk.ActionEntry[] actions = new Gtk.ActionEntry[0];
         
         Gtk.ActionEntry new_search = { "CommonNewSearch", null, TRANSLATABLE, null, null, on_new_search };
-        new_search.label = _("Ne_w Saved Search...");
+        new_search.label = _("Ne_w Saved Search…");
         actions += new_search;
 
         Gtk.ActionEntry new_tag = { "CommonNewTag", null, TRANSLATABLE, null, null, on_new_tag };
-        new_tag.label = _("New _Tag...");
+        new_tag.label = _("New _Tag…");
         actions += new_tag;
         
         group.add_actions(actions, this);
diff --git a/src/tags/Branch.c b/src/tags/Branch.c
index 20ba882..a36626e 100644
--- a/src/tags/Branch.c
+++ b/src/tags/Branch.c
@@ -1810,11 +1810,11 @@ static void tags_header_setup_context_menu (TagsHeader* self) {
 #line 148 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1813 "Branch.c"
-			goto __catch51_g_error;
+			goto __catch52_g_error;
 		}
 	}
-	goto __finally51;
-	__catch51_g_error:
+	goto __finally52;
+	__catch52_g_error:
 	{
 		GError* err = NULL;
 		gchar* _tmp11_ = NULL;
@@ -1859,7 +1859,7 @@ static void tags_header_setup_context_menu (TagsHeader* self) {
 		_g_error_free0 (err);
 #line 1861 "Branch.c"
 	}
-	__finally51:
+	__finally52:
 #line 147 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 147 "/home/jens/Source/shotwell/src/tags/Branch.vala"
@@ -2454,7 +2454,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 2457 "Branch.c"
-				goto __catch52_g_regex_error;
+				goto __catch53_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);
@@ -2479,7 +2479,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 2482 "Branch.c"
-				goto __catch52_g_regex_error;
+				goto __catch53_g_regex_error;
 			}
 #line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			_g_regex_unref0 (regex);
@@ -2505,8 +2505,8 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		return result;
 #line 2507 "Branch.c"
 	}
-	goto __finally52;
-	__catch52_g_regex_error:
+	goto __finally53;
+	__catch53_g_regex_error:
 	{
 		GError* e = NULL;
 #line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -2519,7 +2519,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		_g_error_free0 (e);
 #line 2521 "Branch.c"
 	}
-	__finally52:
+	__finally53:
 #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/tags/HierarchicalTagUtilities.c b/src/tags/HierarchicalTagUtilities.c
index 1f9b2de..bc4b608 100644
--- a/src/tags/HierarchicalTagUtilities.c
+++ b/src/tags/HierarchicalTagUtilities.c
@@ -252,7 +252,7 @@ gchar* hierarchical_tag_utilities_flat_to_hierarchical (const gchar* name) {
 /**
      * converts a hierarchical tag path 'path' (e.g., "/Animals") to a flat tag name
      * (e.g., "Animals"); if 'path' is already a flat tag name, 'path' is returned untouched; note
-     * that 'path' must be a top-level path (i.e., "/Animals" not "/Animals/Mammals/...") with
+     * that 'path' must be a top-level path (i.e., "/Animals" not "/Animals/Mammals/…") with
      * only one path component; invoking this method with a 'path' argument other than a top-level
      * path will cause an assertion failure.
      */
@@ -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 __catch53_g_regex_error;
+				goto __catch54_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 __catch53_g_regex_error;
+				goto __catch54_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 __finally53;
-	__catch53_g_regex_error:
+	goto __finally54;
+	__catch54_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"
 	}
-	__finally53:
+	__finally54:
 #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/tags/HierarchicalTagUtilities.vala b/src/tags/HierarchicalTagUtilities.vala
index bbb556b..3fca3ca 100644
--- a/src/tags/HierarchicalTagUtilities.vala
+++ b/src/tags/HierarchicalTagUtilities.vala
@@ -21,7 +21,7 @@ class HierarchicalTagUtilities {
     /**
      * converts a hierarchical tag path 'path' (e.g., "/Animals") to a flat tag name
      * (e.g., "Animals"); if 'path' is already a flat tag name, 'path' is returned untouched; note
-     * that 'path' must be a top-level path (i.e., "/Animals" not "/Animals/Mammals/...") with
+     * that 'path' must be a top-level path (i.e., "/Animals" not "/Animals/Mammals/…") with
      * only one path component; invoking this method with a 'path' argument other than a top-level
      * path will cause an assertion failure.
      */
diff --git a/src/tags/TagPage.c b/src/tags/TagPage.c
index c2cb74f..54af84d 100644
--- a/src/tags/TagPage.c
+++ b/src/tags/TagPage.c
@@ -691,7 +691,7 @@ static void _tag_page_on_remove_tag_from_photos_gtk_action_callback (GtkAction*
 static void _vala_array_add136 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
 #define RESOURCES_DELETE_TAG_SIDEBAR_MENU _ ("_Delete")
 static void _vala_array_add137 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
-#define RESOURCES_RENAME_TAG_SIDEBAR_MENU _ ("_Rename...")
+#define RESOURCES_RENAME_TAG_SIDEBAR_MENU _ ("_Rename…")
 static void _vala_array_add138 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value);
 #define RESOURCES_NEW_CHILD_TAG_SIDEBAR_MENU _ ("_New")
 static void tag_page_on_new_child_tag_sidebar (TagPage* self);
diff --git a/src/util/image.c b/src/util/image.c
index 36c03ad..ab08347 100644
--- a/src/util/image.c
+++ b/src/util/image.c
@@ -160,23 +160,22 @@ const gchar* fallback_image_missing[103] = {"48 48 54 1 ", "  c #6A6D67", ". c #
 
 gboolean is_color_parsable (const gchar* spec) {
 	gboolean result = FALSE;
-	GdkColor color = {0};
+	GdkRGBA color = {0};
 	const gchar* _tmp0_ = NULL;
-	GdkColor _tmp1_ = {0};
-	gboolean _tmp2_ = FALSE;
+	gboolean _tmp1_ = FALSE;
 #line 117 "/home/jens/Source/shotwell/src/util/image.vala"
 	g_return_val_if_fail (spec != NULL, FALSE);
+#line 118 "/home/jens/Source/shotwell/src/util/image.vala"
+	memset (&color, 0, sizeof (GdkRGBA));
 #line 119 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp0_ = spec;
 #line 119 "/home/jens/Source/shotwell/src/util/image.vala"
-	_tmp2_ = gdk_color_parse (_tmp0_, &_tmp1_);
-#line 119 "/home/jens/Source/shotwell/src/util/image.vala"
-	color = _tmp1_;
+	_tmp1_ = gdk_rgba_parse (&color, _tmp0_);
 #line 119 "/home/jens/Source/shotwell/src/util/image.vala"
-	result = _tmp2_;
+	result = _tmp1_;
 #line 119 "/home/jens/Source/shotwell/src/util/image.vala"
 	return result;
-#line 180 "image.c"
+#line 179 "image.c"
 }
 
 
@@ -193,7 +192,7 @@ void parse_color (const gchar* spec, GdkRGBA* result) {
 	*result = _tmp1_;
 #line 123 "/home/jens/Source/shotwell/src/util/image.vala"
 	return;
-#line 197 "image.c"
+#line 196 "image.c"
 }
 
 
@@ -211,19 +210,19 @@ void fetch_color (const gchar* spec, GdkRGBA* result) {
 	_tmp1_ = gdk_rgba_parse (&rgba, _tmp0_);
 #line 128 "/home/jens/Source/shotwell/src/util/image.vala"
 	if (!_tmp1_) {
-#line 215 "image.c"
+#line 214 "image.c"
 		const gchar* _tmp2_ = NULL;
 #line 129 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp2_ = spec;
 #line 129 "/home/jens/Source/shotwell/src/util/image.vala"
 		g_error ("image.vala:129: Can't parse color %s", _tmp2_);
-#line 221 "image.c"
+#line 220 "image.c"
 	}
 #line 131 "/home/jens/Source/shotwell/src/util/image.vala"
 	*result = rgba;
 #line 131 "/home/jens/Source/shotwell/src/util/image.vala"
 	return;
-#line 227 "image.c"
+#line 226 "image.c"
 }
 
 
@@ -270,14 +269,14 @@ void set_source_color_from_string (cairo_t* ctx, const gchar* spec) {
 	_tmp10_ = _tmp9_.alpha;
 #line 136 "/home/jens/Source/shotwell/src/util/image.vala"
 	cairo_set_source_rgba (_tmp2_, _tmp4_, _tmp6_, _tmp8_, _tmp10_);
-#line 274 "image.c"
+#line 273 "image.c"
 }
 
 
 static gpointer _g_object_ref0 (gpointer self) {
 #line 147 "/home/jens/Source/shotwell/src/util/image.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 281 "image.c"
+#line 280 "image.c"
 }
 
 
@@ -287,7 +286,7 @@ GdkPixbuf* get_placeholder_pixbuf (void) {
 	GError * _inner_error_ = NULL;
 #line 144 "/home/jens/Source/shotwell/src/util/image.vala"
 	pixbuf = NULL;
-#line 291 "image.c"
+#line 290 "image.c"
 	{
 		GtkIconTheme* icon_theme = NULL;
 		GtkIconTheme* _tmp0_ = NULL;
@@ -309,7 +308,7 @@ GdkPixbuf* get_placeholder_pixbuf (void) {
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 148 "/home/jens/Source/shotwell/src/util/image.vala"
 			_g_object_unref0 (icon_theme);
-#line 313 "image.c"
+#line 312 "image.c"
 			goto __catch4_g_error;
 		}
 #line 148 "/home/jens/Source/shotwell/src/util/image.vala"
@@ -324,7 +323,7 @@ GdkPixbuf* get_placeholder_pixbuf (void) {
 		_g_object_unref0 (_tmp2_);
 #line 146 "/home/jens/Source/shotwell/src/util/image.vala"
 		_g_object_unref0 (icon_theme);
-#line 328 "image.c"
+#line 327 "image.c"
 	}
 	goto __finally4;
 	__catch4_g_error:
@@ -351,7 +350,7 @@ GdkPixbuf* get_placeholder_pixbuf (void) {
 		g_warning ("image.vala:152: Could not load icon from theme: %s", _tmp7_);
 #line 146 "/home/jens/Source/shotwell/src/util/image.vala"
 		_g_error_free0 (_error_);
-#line 355 "image.c"
+#line 354 "image.c"
 	}
 	__finally4:
 #line 146 "/home/jens/Source/shotwell/src/util/image.vala"
@@ -364,13 +363,13 @@ GdkPixbuf* get_placeholder_pixbuf (void) {
 		g_clear_error (&_inner_error_);
 #line 146 "/home/jens/Source/shotwell/src/util/image.vala"
 		return NULL;
-#line 368 "image.c"
+#line 367 "image.c"
 	}
 #line 155 "/home/jens/Source/shotwell/src/util/image.vala"
 	result = pixbuf;
 #line 155 "/home/jens/Source/shotwell/src/util/image.vala"
 	return result;
-#line 374 "image.c"
+#line 373 "image.c"
 }
 
 
@@ -422,7 +421,7 @@ GdkPixbuf* scale_pixbuf (GdkPixbuf* pixbuf, gint scale, GdkInterpType interp, gb
 	_tmp9_ = _tmp8_.width;
 #line 161 "/home/jens/Source/shotwell/src/util/image.vala"
 	if (_tmp7_ == _tmp9_) {
-#line 426 "image.c"
+#line 425 "image.c"
 		Dimensions _tmp10_ = {0};
 		gint _tmp11_ = 0;
 		Dimensions _tmp12_ = {0};
@@ -437,15 +436,15 @@ GdkPixbuf* scale_pixbuf (GdkPixbuf* pixbuf, gint scale, GdkInterpType interp, gb
 		_tmp13_ = _tmp12_.height;
 #line 161 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp5_ = _tmp11_ == _tmp13_;
-#line 441 "image.c"
+#line 440 "image.c"
 	} else {
 #line 161 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp5_ = FALSE;
-#line 445 "image.c"
+#line 444 "image.c"
 	}
 #line 161 "/home/jens/Source/shotwell/src/util/image.vala"
 	if (_tmp5_) {
-#line 449 "image.c"
+#line 448 "image.c"
 		GdkPixbuf* _tmp14_ = NULL;
 		GdkPixbuf* _tmp15_ = NULL;
 #line 162 "/home/jens/Source/shotwell/src/util/image.vala"
@@ -456,7 +455,7 @@ GdkPixbuf* scale_pixbuf (GdkPixbuf* pixbuf, gint scale, GdkInterpType interp, gb
 		result = _tmp15_;
 #line 162 "/home/jens/Source/shotwell/src/util/image.vala"
 		return result;
-#line 460 "image.c"
+#line 459 "image.c"
 	}
 #line 165 "/home/jens/Source/shotwell/src/util/image.vala"
 	dimensions_with_min (&scaled, MIN_SCALED_WIDTH, MIN_SCALED_HEIGHT, &_tmp16_);
@@ -480,7 +479,7 @@ GdkPixbuf* scale_pixbuf (GdkPixbuf* pixbuf, gint scale, GdkInterpType interp, gb
 	result = _tmp23_;
 #line 167 "/home/jens/Source/shotwell/src/util/image.vala"
 	return result;
-#line 484 "image.c"
+#line 483 "image.c"
 }
 
 
@@ -522,7 +521,7 @@ GdkPixbuf* resize_pixbuf (GdkPixbuf* pixbuf, Dimensions* resized, GdkInterpType
 	_tmp6_ = _tmp5_.width;
 #line 172 "/home/jens/Source/shotwell/src/util/image.vala"
 	if (_tmp4_ == _tmp6_) {
-#line 526 "image.c"
+#line 525 "image.c"
 		Dimensions _tmp7_ = {0};
 		gint _tmp8_ = 0;
 		Dimensions _tmp9_ = {0};
@@ -537,15 +536,15 @@ GdkPixbuf* resize_pixbuf (GdkPixbuf* pixbuf, Dimensions* resized, GdkInterpType
 		_tmp10_ = _tmp9_.height;
 #line 172 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp2_ = _tmp8_ == _tmp10_;
-#line 541 "image.c"
+#line 540 "image.c"
 	} else {
 #line 172 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp2_ = FALSE;
-#line 545 "image.c"
+#line 544 "image.c"
 	}
 #line 172 "/home/jens/Source/shotwell/src/util/image.vala"
 	if (_tmp2_) {
-#line 549 "image.c"
+#line 548 "image.c"
 		GdkPixbuf* _tmp11_ = NULL;
 		GdkPixbuf* _tmp12_ = NULL;
 #line 173 "/home/jens/Source/shotwell/src/util/image.vala"
@@ -556,7 +555,7 @@ GdkPixbuf* resize_pixbuf (GdkPixbuf* pixbuf, Dimensions* resized, GdkInterpType
 		result = _tmp12_;
 #line 173 "/home/jens/Source/shotwell/src/util/image.vala"
 		return result;
-#line 560 "image.c"
+#line 559 "image.c"
 	}
 #line 176 "/home/jens/Source/shotwell/src/util/image.vala"
 	dimensions_with_min (resized, MIN_SCALED_WIDTH, MIN_SCALED_HEIGHT, &_tmp13_);
@@ -580,7 +579,7 @@ GdkPixbuf* resize_pixbuf (GdkPixbuf* pixbuf, Dimensions* resized, GdkInterpType
 	result = _tmp20_;
 #line 178 "/home/jens/Source/shotwell/src/util/image.vala"
 	return result;
-#line 584 "image.c"
+#line 583 "image.c"
 }
 
 
@@ -610,7 +609,7 @@ void draw_rounded_corners_filled (cairo_t* ctx, Dimensions* dim, GdkPoint* origi
 	_tmp4_ = ctx;
 #line 186 "/home/jens/Source/shotwell/src/util/image.vala"
 	cairo_paint (_tmp4_);
-#line 614 "image.c"
+#line 613 "image.c"
 }
 
 
@@ -716,7 +715,7 @@ void context_rounded_corners (cairo_t* cx, Dimensions* dim, GdkPoint* origin, gd
 	_tmp21_ = cx;
 #line 209 "/home/jens/Source/shotwell/src/util/image.vala"
 	cairo_clip (_tmp21_);
-#line 720 "image.c"
+#line 719 "image.c"
 }
 
 
@@ -735,7 +734,7 @@ inline guchar shift_color_byte (gint b, gint shift) {
 	result = (guchar) _tmp2_;
 #line 213 "/home/jens/Source/shotwell/src/util/image.vala"
 	return result;
-#line 739 "image.c"
+#line 738 "image.c"
 }
 
 
@@ -774,17 +773,17 @@ void shift_colors (GdkPixbuf* pixbuf, gint red, gint green, gint blue, gint alph
 	_tmp1_ = red;
 #line 217 "/home/jens/Source/shotwell/src/util/image.vala"
 	if (_tmp1_ >= -255) {
-#line 778 "image.c"
+#line 777 "image.c"
 		gint _tmp2_ = 0;
 #line 217 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp2_ = red;
 #line 217 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp0_ = _tmp2_ <= 255;
-#line 784 "image.c"
+#line 783 "image.c"
 	} else {
 #line 217 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp0_ = FALSE;
-#line 788 "image.c"
+#line 787 "image.c"
 	}
 #line 217 "/home/jens/Source/shotwell/src/util/image.vala"
 	_vala_assert (_tmp0_, "red >= -255 && red <= 255");
@@ -792,17 +791,17 @@ void shift_colors (GdkPixbuf* pixbuf, gint red, gint green, gint blue, gint alph
 	_tmp4_ = green;
 #line 218 "/home/jens/Source/shotwell/src/util/image.vala"
 	if (_tmp4_ >= -255) {
-#line 796 "image.c"
+#line 795 "image.c"
 		gint _tmp5_ = 0;
 #line 218 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp5_ = green;
 #line 218 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp3_ = _tmp5_ <= 255;
-#line 802 "image.c"
+#line 801 "image.c"
 	} else {
 #line 218 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp3_ = FALSE;
-#line 806 "image.c"
+#line 805 "image.c"
 	}
 #line 218 "/home/jens/Source/shotwell/src/util/image.vala"
 	_vala_assert (_tmp3_, "green >= -255 && green <= 255");
@@ -810,17 +809,17 @@ void shift_colors (GdkPixbuf* pixbuf, gint red, gint green, gint blue, gint alph
 	_tmp7_ = blue;
 #line 219 "/home/jens/Source/shotwell/src/util/image.vala"
 	if (_tmp7_ >= -255) {
-#line 814 "image.c"
+#line 813 "image.c"
 		gint _tmp8_ = 0;
 #line 219 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp8_ = blue;
 #line 219 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp6_ = _tmp8_ <= 255;
-#line 820 "image.c"
+#line 819 "image.c"
 	} else {
 #line 219 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp6_ = FALSE;
-#line 824 "image.c"
+#line 823 "image.c"
 	}
 #line 219 "/home/jens/Source/shotwell/src/util/image.vala"
 	_vala_assert (_tmp6_, "blue >= -255 && blue <= 255");
@@ -828,17 +827,17 @@ void shift_colors (GdkPixbuf* pixbuf, gint red, gint green, gint blue, gint alph
 	_tmp10_ = alpha;
 #line 220 "/home/jens/Source/shotwell/src/util/image.vala"
 	if (_tmp10_ >= -255) {
-#line 832 "image.c"
+#line 831 "image.c"
 		gint _tmp11_ = 0;
 #line 220 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp11_ = alpha;
 #line 220 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp9_ = _tmp11_ <= 255;
-#line 838 "image.c"
+#line 837 "image.c"
 	} else {
 #line 220 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp9_ = FALSE;
-#line 842 "image.c"
+#line 841 "image.c"
 	}
 #line 220 "/home/jens/Source/shotwell/src/util/image.vala"
 	_vala_assert (_tmp9_, "alpha >= -255 && alpha <= 255");
@@ -888,19 +887,19 @@ void shift_colors (GdkPixbuf* pixbuf, gint red, gint green, gint blue, gint alph
 	_tmp26_ = gdk_pixbuf_get_bits_per_sample (_tmp25_);
 #line 230 "/home/jens/Source/shotwell/src/util/image.vala"
 	_vala_assert (_tmp26_ == 8, "pixbuf.get_bits_per_sample() == 8");
-#line 892 "image.c"
+#line 891 "image.c"
 	{
 		gint y = 0;
 #line 232 "/home/jens/Source/shotwell/src/util/image.vala"
 		y = 0;
-#line 897 "image.c"
+#line 896 "image.c"
 		{
 			gboolean _tmp27_ = FALSE;
 #line 232 "/home/jens/Source/shotwell/src/util/image.vala"
 			_tmp27_ = TRUE;
 #line 232 "/home/jens/Source/shotwell/src/util/image.vala"
 			while (TRUE) {
-#line 904 "image.c"
+#line 903 "image.c"
 				gint _tmp29_ = 0;
 				gint _tmp30_ = 0;
 				gint y_offset = 0;
@@ -908,13 +907,13 @@ void shift_colors (GdkPixbuf* pixbuf, gint red, gint green, gint blue, gint alph
 				gint _tmp32_ = 0;
 #line 232 "/home/jens/Source/shotwell/src/util/image.vala"
 				if (!_tmp27_) {
-#line 912 "image.c"
+#line 911 "image.c"
 					gint _tmp28_ = 0;
 #line 232 "/home/jens/Source/shotwell/src/util/image.vala"
 					_tmp28_ = y;
 #line 232 "/home/jens/Source/shotwell/src/util/image.vala"
 					y = _tmp28_ + 1;
-#line 918 "image.c"
+#line 917 "image.c"
 				}
 #line 232 "/home/jens/Source/shotwell/src/util/image.vala"
 				_tmp27_ = FALSE;
@@ -926,7 +925,7 @@ void shift_colors (GdkPixbuf* pixbuf, gint red, gint green, gint blue, gint alph
 				if (!(_tmp29_ < _tmp30_)) {
 #line 232 "/home/jens/Source/shotwell/src/util/image.vala"
 					break;
-#line 930 "image.c"
+#line 929 "image.c"
 				}
 #line 233 "/home/jens/Source/shotwell/src/util/image.vala"
 				_tmp31_ = y;
@@ -934,19 +933,19 @@ void shift_colors (GdkPixbuf* pixbuf, gint red, gint green, gint blue, gint alph
 				_tmp32_ = rowstride;
 #line 233 "/home/jens/Source/shotwell/src/util/image.vala"
 				y_offset = _tmp31_ * _tmp32_;
-#line 938 "image.c"
+#line 937 "image.c"
 				{
 					gint x = 0;
 #line 235 "/home/jens/Source/shotwell/src/util/image.vala"
 					x = 0;
-#line 943 "image.c"
+#line 942 "image.c"
 					{
 						gboolean _tmp33_ = FALSE;
 #line 235 "/home/jens/Source/shotwell/src/util/image.vala"
 						_tmp33_ = TRUE;
 #line 235 "/home/jens/Source/shotwell/src/util/image.vala"
 						while (TRUE) {
-#line 950 "image.c"
+#line 949 "image.c"
 							gint _tmp35_ = 0;
 							gint _tmp36_ = 0;
 							gint offset = 0;
@@ -960,13 +959,13 @@ void shift_colors (GdkPixbuf* pixbuf, gint red, gint green, gint blue, gint alph
 							gint _tmp68_ = 0;
 #line 235 "/home/jens/Source/shotwell/src/util/image.vala"
 							if (!_tmp33_) {
-#line 964 "image.c"
+#line 963 "image.c"
 								gint _tmp34_ = 0;
 #line 235 "/home/jens/Source/shotwell/src/util/image.vala"
 								_tmp34_ = x;
 #line 235 "/home/jens/Source/shotwell/src/util/image.vala"
 								x = _tmp34_ + 1;
-#line 970 "image.c"
+#line 969 "image.c"
 							}
 #line 235 "/home/jens/Source/shotwell/src/util/image.vala"
 							_tmp33_ = FALSE;
@@ -978,7 +977,7 @@ void shift_colors (GdkPixbuf* pixbuf, gint red, gint green, gint blue, gint alph
 							if (!(_tmp35_ < _tmp36_)) {
 #line 235 "/home/jens/Source/shotwell/src/util/image.vala"
 								break;
-#line 982 "image.c"
+#line 981 "image.c"
 							}
 #line 236 "/home/jens/Source/shotwell/src/util/image.vala"
 							_tmp37_ = y_offset;
@@ -992,7 +991,7 @@ void shift_colors (GdkPixbuf* pixbuf, gint red, gint green, gint blue, gint alph
 							_tmp40_ = red;
 #line 238 "/home/jens/Source/shotwell/src/util/image.vala"
 							if (_tmp40_ != 0) {
-#line 996 "image.c"
+#line 995 "image.c"
 								guchar* _tmp41_ = NULL;
 								gint _tmp42_ = 0;
 								guchar* _tmp43_ = NULL;
@@ -1019,13 +1018,13 @@ void shift_colors (GdkPixbuf* pixbuf, gint red, gint green, gint blue, gint alph
 								_tmp41_[_tmp42_] = _tmp47_;
 #line 239 "/home/jens/Source/shotwell/src/util/image.vala"
 								_tmp48_ = _tmp41_[_tmp42_];
-#line 1023 "image.c"
+#line 1022 "image.c"
 							}
 #line 241 "/home/jens/Source/shotwell/src/util/image.vala"
 							_tmp49_ = green;
 #line 241 "/home/jens/Source/shotwell/src/util/image.vala"
 							if (_tmp49_ != 0) {
-#line 1029 "image.c"
+#line 1028 "image.c"
 								guchar* _tmp50_ = NULL;
 								gint _tmp51_ = 0;
 								guchar* _tmp52_ = NULL;
@@ -1052,13 +1051,13 @@ void shift_colors (GdkPixbuf* pixbuf, gint red, gint green, gint blue, gint alph
 								_tmp50_[_tmp51_ + 1] = _tmp56_;
 #line 242 "/home/jens/Source/shotwell/src/util/image.vala"
 								_tmp57_ = _tmp50_[_tmp51_ + 1];
-#line 1056 "image.c"
+#line 1055 "image.c"
 							}
 #line 244 "/home/jens/Source/shotwell/src/util/image.vala"
 							_tmp58_ = blue;
 #line 244 "/home/jens/Source/shotwell/src/util/image.vala"
 							if (_tmp58_ != 0) {
-#line 1062 "image.c"
+#line 1061 "image.c"
 								guchar* _tmp59_ = NULL;
 								gint _tmp60_ = 0;
 								guchar* _tmp61_ = NULL;
@@ -1085,27 +1084,27 @@ void shift_colors (GdkPixbuf* pixbuf, gint red, gint green, gint blue, gint alph
 								_tmp59_[_tmp60_ + 2] = _tmp65_;
 #line 245 "/home/jens/Source/shotwell/src/util/image.vala"
 								_tmp66_ = _tmp59_[_tmp60_ + 2];
-#line 1089 "image.c"
+#line 1088 "image.c"
 							}
 #line 247 "/home/jens/Source/shotwell/src/util/image.vala"
 							_tmp68_ = alpha;
 #line 247 "/home/jens/Source/shotwell/src/util/image.vala"
 							if (_tmp68_ != 0) {
-#line 1095 "image.c"
+#line 1094 "image.c"
 								gint _tmp69_ = 0;
 #line 247 "/home/jens/Source/shotwell/src/util/image.vala"
 								_tmp69_ = channels;
 #line 247 "/home/jens/Source/shotwell/src/util/image.vala"
 								_tmp67_ = _tmp69_ >= 4;
-#line 1101 "image.c"
+#line 1100 "image.c"
 							} else {
 #line 247 "/home/jens/Source/shotwell/src/util/image.vala"
 								_tmp67_ = FALSE;
-#line 1105 "image.c"
+#line 1104 "image.c"
 							}
 #line 247 "/home/jens/Source/shotwell/src/util/image.vala"
 							if (_tmp67_) {
-#line 1109 "image.c"
+#line 1108 "image.c"
 								guchar* _tmp70_ = NULL;
 								gint _tmp71_ = 0;
 								guchar* _tmp72_ = NULL;
@@ -1132,7 +1131,7 @@ void shift_colors (GdkPixbuf* pixbuf, gint red, gint green, gint blue, gint alph
 								_tmp70_[_tmp71_ + 3] = _tmp76_;
 #line 248 "/home/jens/Source/shotwell/src/util/image.vala"
 								_tmp77_ = _tmp70_[_tmp71_ + 3];
-#line 1136 "image.c"
+#line 1135 "image.c"
 							}
 						}
 					}
@@ -1174,7 +1173,7 @@ void dim_pixbuf (GdkPixbuf* pixbuf) {
 	_pixel_transformation_unref0 (sat);
 #line 253 "/home/jens/Source/shotwell/src/util/image.vala"
 	_pixel_transformer_unref0 (transformer);
-#line 1178 "image.c"
+#line 1177 "image.c"
 }
 
 
@@ -1196,7 +1195,7 @@ gboolean coord_in_rectangle (gint x, gint y, GdkRectangle* rect) {
 	_tmp5_ = _tmp4_.x;
 #line 262 "/home/jens/Source/shotwell/src/util/image.vala"
 	if (_tmp3_ >= _tmp5_) {
-#line 1200 "image.c"
+#line 1199 "image.c"
 		gint _tmp6_ = 0;
 		GdkRectangle _tmp7_ = {0};
 		gint _tmp8_ = 0;
@@ -1214,15 +1213,15 @@ gboolean coord_in_rectangle (gint x, gint y, GdkRectangle* rect) {
 		_tmp10_ = _tmp9_.width;
 #line 262 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp2_ = _tmp6_ < (_tmp8_ + _tmp10_);
-#line 1218 "image.c"
+#line 1217 "image.c"
 	} else {
 #line 262 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp2_ = FALSE;
-#line 1222 "image.c"
+#line 1221 "image.c"
 	}
 #line 262 "/home/jens/Source/shotwell/src/util/image.vala"
 	if (_tmp2_) {
-#line 1226 "image.c"
+#line 1225 "image.c"
 		gint _tmp11_ = 0;
 		GdkRectangle _tmp12_ = {0};
 		gint _tmp13_ = 0;
@@ -1234,15 +1233,15 @@ gboolean coord_in_rectangle (gint x, gint y, GdkRectangle* rect) {
 		_tmp13_ = _tmp12_.y;
 #line 262 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp1_ = _tmp11_ >= _tmp13_;
-#line 1238 "image.c"
+#line 1237 "image.c"
 	} else {
 #line 262 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp1_ = FALSE;
-#line 1242 "image.c"
+#line 1241 "image.c"
 	}
 #line 262 "/home/jens/Source/shotwell/src/util/image.vala"
 	if (_tmp1_) {
-#line 1246 "image.c"
+#line 1245 "image.c"
 		gint _tmp14_ = 0;
 		GdkRectangle _tmp15_ = {0};
 		gint _tmp16_ = 0;
@@ -1260,17 +1259,17 @@ gboolean coord_in_rectangle (gint x, gint y, GdkRectangle* rect) {
 		_tmp18_ = _tmp17_.height;
 #line 262 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp0_ = _tmp14_ <= (_tmp16_ + _tmp18_);
-#line 1264 "image.c"
+#line 1263 "image.c"
 	} else {
 #line 262 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp0_ = FALSE;
-#line 1268 "image.c"
+#line 1267 "image.c"
 	}
 #line 262 "/home/jens/Source/shotwell/src/util/image.vala"
 	result = _tmp0_;
 #line 262 "/home/jens/Source/shotwell/src/util/image.vala"
 	return result;
-#line 1274 "image.c"
+#line 1273 "image.c"
 }
 
 
@@ -1297,7 +1296,7 @@ gboolean rectangles_equal (GdkRectangle* a, GdkRectangle* b) {
 	_tmp6_ = _tmp5_.x;
 #line 266 "/home/jens/Source/shotwell/src/util/image.vala"
 	if (_tmp4_ == _tmp6_) {
-#line 1301 "image.c"
+#line 1300 "image.c"
 		GdkRectangle _tmp7_ = {0};
 		gint _tmp8_ = 0;
 		GdkRectangle _tmp9_ = {0};
@@ -1312,15 +1311,15 @@ gboolean rectangles_equal (GdkRectangle* a, GdkRectangle* b) {
 		_tmp10_ = _tmp9_.y;
 #line 266 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp2_ = _tmp8_ == _tmp10_;
-#line 1316 "image.c"
+#line 1315 "image.c"
 	} else {
 #line 266 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp2_ = FALSE;
-#line 1320 "image.c"
+#line 1319 "image.c"
 	}
 #line 266 "/home/jens/Source/shotwell/src/util/image.vala"
 	if (_tmp2_) {
-#line 1324 "image.c"
+#line 1323 "image.c"
 		GdkRectangle _tmp11_ = {0};
 		gint _tmp12_ = 0;
 		GdkRectangle _tmp13_ = {0};
@@ -1335,15 +1334,15 @@ gboolean rectangles_equal (GdkRectangle* a, GdkRectangle* b) {
 		_tmp14_ = _tmp13_.width;
 #line 266 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp1_ = _tmp12_ == _tmp14_;
-#line 1339 "image.c"
+#line 1338 "image.c"
 	} else {
 #line 266 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp1_ = FALSE;
-#line 1343 "image.c"
+#line 1342 "image.c"
 	}
 #line 266 "/home/jens/Source/shotwell/src/util/image.vala"
 	if (_tmp1_) {
-#line 1347 "image.c"
+#line 1346 "image.c"
 		GdkRectangle _tmp15_ = {0};
 		gint _tmp16_ = 0;
 		GdkRectangle _tmp17_ = {0};
@@ -1358,17 +1357,17 @@ gboolean rectangles_equal (GdkRectangle* a, GdkRectangle* b) {
 		_tmp18_ = _tmp17_.height;
 #line 266 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp0_ = _tmp16_ == _tmp18_;
-#line 1362 "image.c"
+#line 1361 "image.c"
 	} else {
 #line 266 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp0_ = FALSE;
-#line 1366 "image.c"
+#line 1365 "image.c"
 	}
 #line 266 "/home/jens/Source/shotwell/src/util/image.vala"
 	result = _tmp0_;
 #line 266 "/home/jens/Source/shotwell/src/util/image.vala"
 	return result;
-#line 1372 "image.c"
+#line 1371 "image.c"
 }
 
 
@@ -1407,7 +1406,7 @@ gchar* rectangle_to_string (GdkRectangle* rect) {
 	result = _tmp8_;
 #line 270 "/home/jens/Source/shotwell/src/util/image.vala"
 	return result;
-#line 1411 "image.c"
+#line 1410 "image.c"
 }
 
 
@@ -1491,7 +1490,7 @@ void clamp_rectangle (GdkRectangle* original, Dimensions* max, GdkRectangle* res
 	*result = rect;
 #line 280 "/home/jens/Source/shotwell/src/util/image.vala"
 	return;
-#line 1495 "image.c"
+#line 1494 "image.c"
 }
 
 
@@ -1530,7 +1529,7 @@ void scale_point (GdkPoint* p, gdouble factor, GdkPoint* result) {
 	*result = _result_;
 #line 288 "/home/jens/Source/shotwell/src/util/image.vala"
 	return;
-#line 1534 "image.c"
+#line 1533 "image.c"
 }
 
 
@@ -1577,7 +1576,7 @@ void add_points (GdkPoint* p1, GdkPoint* p2, GdkPoint* result) {
 	*result = _result_;
 #line 296 "/home/jens/Source/shotwell/src/util/image.vala"
 	return;
-#line 1581 "image.c"
+#line 1580 "image.c"
 }
 
 
@@ -1624,7 +1623,7 @@ void subtract_points (GdkPoint* p1, GdkPoint* p2, GdkPoint* result) {
 	*result = _result_;
 #line 304 "/home/jens/Source/shotwell/src/util/image.vala"
 	return;
-#line 1628 "image.c"
+#line 1627 "image.c"
 }
 
 
@@ -1643,19 +1642,19 @@ void fix_cairo_pixbuf (GdkPixbuf* pixbuf) {
 	_tmp2_ = _tmp1_;
 #line 309 "/home/jens/Source/shotwell/src/util/image.vala"
 	gdk_pixels = _tmp2_;
-#line 1647 "image.c"
+#line 1646 "image.c"
 	{
 		gint j = 0;
 #line 310 "/home/jens/Source/shotwell/src/util/image.vala"
 		j = 0;
-#line 1652 "image.c"
+#line 1651 "image.c"
 		{
 			gboolean _tmp3_ = FALSE;
 #line 310 "/home/jens/Source/shotwell/src/util/image.vala"
 			_tmp3_ = TRUE;
 #line 310 "/home/jens/Source/shotwell/src/util/image.vala"
 			while (TRUE) {
-#line 1659 "image.c"
+#line 1658 "image.c"
 				gint _tmp5_ = 0;
 				GdkPixbuf* _tmp6_ = NULL;
 				gint _tmp7_ = 0;
@@ -1673,13 +1672,13 @@ void fix_cairo_pixbuf (GdkPixbuf* pixbuf) {
 				gint _tmp29_ = 0;
 #line 310 "/home/jens/Source/shotwell/src/util/image.vala"
 				if (!_tmp3_) {
-#line 1677 "image.c"
+#line 1676 "image.c"
 					gint _tmp4_ = 0;
 #line 310 "/home/jens/Source/shotwell/src/util/image.vala"
 					_tmp4_ = j;
 #line 310 "/home/jens/Source/shotwell/src/util/image.vala"
 					j = _tmp4_ + 1;
-#line 1683 "image.c"
+#line 1682 "image.c"
 				}
 #line 310 "/home/jens/Source/shotwell/src/util/image.vala"
 				_tmp3_ = FALSE;
@@ -1695,7 +1694,7 @@ void fix_cairo_pixbuf (GdkPixbuf* pixbuf) {
 				if (!(_tmp5_ < _tmp8_)) {
 #line 310 "/home/jens/Source/shotwell/src/util/image.vala"
 					break;
-#line 1699 "image.c"
+#line 1698 "image.c"
 				}
 #line 311 "/home/jens/Source/shotwell/src/util/image.vala"
 				_tmp9_ = gdk_pixels;
@@ -1713,7 +1712,7 @@ void fix_cairo_pixbuf (GdkPixbuf* pixbuf) {
 				end = _tmp10_ + (4 * _tmp13_);
 #line 314 "/home/jens/Source/shotwell/src/util/image.vala"
 				while (TRUE) {
-#line 1717 "image.c"
+#line 1716 "image.c"
 					guchar* _tmp14_ = NULL;
 					guchar* _tmp15_ = NULL;
 					guchar tmp = '\0';
@@ -1735,7 +1734,7 @@ void fix_cairo_pixbuf (GdkPixbuf* pixbuf) {
 					if (!(_tmp14_ < _tmp15_)) {
 #line 314 "/home/jens/Source/shotwell/src/util/image.vala"
 						break;
-#line 1739 "image.c"
+#line 1738 "image.c"
 					}
 #line 315 "/home/jens/Source/shotwell/src/util/image.vala"
 					_tmp16_ = p;
@@ -1765,7 +1764,7 @@ void fix_cairo_pixbuf (GdkPixbuf* pixbuf) {
 					_tmp25_ = p;
 #line 325 "/home/jens/Source/shotwell/src/util/image.vala"
 					p = _tmp25_ + 4;
-#line 1769 "image.c"
+#line 1768 "image.c"
 				}
 #line 328 "/home/jens/Source/shotwell/src/util/image.vala"
 				_tmp26_ = gdk_pixels;
@@ -1777,7 +1776,7 @@ void fix_cairo_pixbuf (GdkPixbuf* pixbuf) {
 				_tmp29_ = _tmp28_;
 #line 328 "/home/jens/Source/shotwell/src/util/image.vala"
 				gdk_pixels = _tmp26_ + _tmp29_;
-#line 1781 "image.c"
+#line 1780 "image.c"
 			}
 		}
 	}
@@ -1857,13 +1856,13 @@ void compute_arb_rotated_size (gdouble src_width, gdouble src_height, gdouble an
 	if (dest_width) {
 #line 342 "/home/jens/Source/shotwell/src/util/image.vala"
 		*dest_width = _vala_dest_width;
-#line 1861 "image.c"
+#line 1860 "image.c"
 	}
 #line 342 "/home/jens/Source/shotwell/src/util/image.vala"
 	if (dest_height) {
 #line 342 "/home/jens/Source/shotwell/src/util/image.vala"
 		*dest_height = _vala_dest_height;
-#line 1867 "image.c"
+#line 1866 "image.c"
 	}
 }
 
@@ -1953,7 +1952,7 @@ GdkPixbuf* rotate_arb (GdkPixbuf* source_pixbuf, gdouble angle) {
 	_tmp0_ = angle;
 #line 361 "/home/jens/Source/shotwell/src/util/image.vala"
 	if (_tmp0_ == 0.0) {
-#line 1957 "image.c"
+#line 1956 "image.c"
 		GdkPixbuf* _tmp1_ = NULL;
 		GdkPixbuf* _tmp2_ = NULL;
 #line 362 "/home/jens/Source/shotwell/src/util/image.vala"
@@ -1964,7 +1963,7 @@ GdkPixbuf* rotate_arb (GdkPixbuf* source_pixbuf, gdouble angle) {
 		result = _tmp2_;
 #line 362 "/home/jens/Source/shotwell/src/util/image.vala"
 		return result;
-#line 1968 "image.c"
+#line 1967 "image.c"
 	}
 #line 369 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp3_ = source_pixbuf;
@@ -2008,11 +2007,11 @@ GdkPixbuf* rotate_arb (GdkPixbuf* source_pixbuf, gdouble angle) {
 	if (_tmp20_) {
 #line 377 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp17_ = CAIRO_FORMAT_ARGB32;
-#line 2012 "image.c"
+#line 2011 "image.c"
 	} else {
 #line 377 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp17_ = CAIRO_FORMAT_RGB24;
-#line 2016 "image.c"
+#line 2015 "image.c"
 	}
 #line 375 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp21_ = dest_pixbuf;
@@ -2140,7 +2139,7 @@ GdkPixbuf* rotate_arb (GdkPixbuf* source_pixbuf, gdouble angle) {
 	_cairo_surface_destroy0 (surface);
 #line 398 "/home/jens/Source/shotwell/src/util/image.vala"
 	return result;
-#line 2144 "image.c"
+#line 2143 "image.c"
 }
 
 
@@ -2189,7 +2188,7 @@ void rotate_point_arb (GdkPoint* source_point, gint img_w, gint img_h, gdouble a
 	_tmp0_ = angle;
 #line 417 "/home/jens/Source/shotwell/src/util/image.vala"
 	if (_tmp0_ == 0.0) {
-#line 2193 "image.c"
+#line 2192 "image.c"
 		GdkPoint _tmp1_ = {0};
 #line 419 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp1_ = *source_point;
@@ -2197,7 +2196,7 @@ void rotate_point_arb (GdkPoint* source_point, gint img_w, gint img_h, gdouble a
 		*result = _tmp1_;
 #line 419 "/home/jens/Source/shotwell/src/util/image.vala"
 		return;
-#line 2201 "image.c"
+#line 2200 "image.c"
 	}
 #line 424 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp2_ = img_w;
@@ -2235,13 +2234,13 @@ void rotate_point_arb (GdkPoint* source_point, gint img_w, gint img_h, gdouble a
 	_tmp13_ = invert;
 #line 430 "/home/jens/Source/shotwell/src/util/image.vala"
 	if (_tmp13_) {
-#line 2239 "image.c"
+#line 2238 "image.c"
 		cairo_status_t _tmp14_ = 0;
 #line 431 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp14_ = cairo_matrix_invert (&matrix);
 #line 431 "/home/jens/Source/shotwell/src/util/image.vala"
 		_vala_assert (_tmp14_ == CAIRO_STATUS_SUCCESS, "matrix.invert() == Cairo.Status.SUCCESS");
-#line 2245 "image.c"
+#line 2244 "image.c"
 	}
 #line 433 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp15_ = *source_point;
@@ -2269,7 +2268,7 @@ void rotate_point_arb (GdkPoint* source_point, gint img_w, gint img_h, gdouble a
 	*result = _tmp21_;
 #line 437 "/home/jens/Source/shotwell/src/util/image.vala"
 	return;
-#line 2273 "image.c"
+#line 2272 "image.c"
 }
 
 
@@ -2308,7 +2307,7 @@ void derotate_point_arb (GdkPoint* source_point, gint img_w, gint img_h, gdouble
 	*result = _tmp4_;
 #line 454 "/home/jens/Source/shotwell/src/util/image.vala"
 	return;
-#line 2312 "image.c"
+#line 2311 "image.c"
 }
 
 
@@ -2512,7 +2511,7 @@ void clamp_inside_rotated_image (Box* src, gint img_w, gint img_h, gdouble angle
 	_tmp43_ = top;
 #line 471 "/home/jens/Source/shotwell/src/util/image.vala"
 	if (_tmp43_ < 0) {
-#line 2516 "image.c"
+#line 2515 "image.c"
 		gint _tmp44_ = 0;
 		gdouble _tmp45_ = 0.0;
 		gdouble _tmp46_ = 0.0;
@@ -2524,7 +2523,7 @@ void clamp_inside_rotated_image (Box* src, gint img_w, gint img_h, gdouble angle
 		_tmp46_ = cos (_tmp45_);
 #line 472 "/home/jens/Source/shotwell/src/util/image.vala"
 		top_offset = (gint) ((0 - _tmp44_) * _tmp46_);
-#line 2528 "image.c"
+#line 2527 "image.c"
 	}
 #line 474 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp47_ = bottom_left;
@@ -2544,7 +2543,7 @@ void clamp_inside_rotated_image (Box* src, gint img_w, gint img_h, gdouble angle
 	_tmp53_ = img_h;
 #line 475 "/home/jens/Source/shotwell/src/util/image.vala"
 	if (_tmp52_ > _tmp53_) {
-#line 2548 "image.c"
+#line 2547 "image.c"
 		gint _tmp54_ = 0;
 		gint _tmp55_ = 0;
 		gdouble _tmp56_ = 0.0;
@@ -2559,7 +2558,7 @@ void clamp_inside_rotated_image (Box* src, gint img_w, gint img_h, gdouble angle
 		_tmp57_ = cos (_tmp56_);
 #line 476 "/home/jens/Source/shotwell/src/util/image.vala"
 		bottom_offset = (gint) ((_tmp54_ - _tmp55_) * _tmp57_);
-#line 2563 "image.c"
+#line 2562 "image.c"
 	}
 #line 478 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp58_ = top_left;
@@ -2577,7 +2576,7 @@ void clamp_inside_rotated_image (Box* src, gint img_w, gint img_h, gdouble angle
 	_tmp63_ = left;
 #line 479 "/home/jens/Source/shotwell/src/util/image.vala"
 	if (_tmp63_ < 0) {
-#line 2581 "image.c"
+#line 2580 "image.c"
 		gint _tmp64_ = 0;
 		gdouble _tmp65_ = 0.0;
 		gdouble _tmp66_ = 0.0;
@@ -2589,7 +2588,7 @@ void clamp_inside_rotated_image (Box* src, gint img_w, gint img_h, gdouble angle
 		_tmp66_ = cos (_tmp65_);
 #line 480 "/home/jens/Source/shotwell/src/util/image.vala"
 		left_offset = (gint) ((0 - _tmp64_) * _tmp66_);
-#line 2593 "image.c"
+#line 2592 "image.c"
 	}
 #line 482 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp67_ = top_right;
@@ -2609,7 +2608,7 @@ void clamp_inside_rotated_image (Box* src, gint img_w, gint img_h, gdouble angle
 	_tmp73_ = img_w;
 #line 483 "/home/jens/Source/shotwell/src/util/image.vala"
 	if (_tmp72_ > _tmp73_) {
-#line 2613 "image.c"
+#line 2612 "image.c"
 		gint _tmp74_ = 0;
 		gint _tmp75_ = 0;
 		gdouble _tmp76_ = 0.0;
@@ -2624,13 +2623,13 @@ void clamp_inside_rotated_image (Box* src, gint img_w, gint img_h, gdouble angle
 		_tmp77_ = cos (_tmp76_);
 #line 484 "/home/jens/Source/shotwell/src/util/image.vala"
 		right_offset = (gint) ((_tmp74_ - _tmp75_) * _tmp77_);
-#line 2628 "image.c"
+#line 2627 "image.c"
 	}
 #line 486 "/home/jens/Source/shotwell/src/util/image.vala"
 	_tmp79_ = preserve_geom;
 #line 486 "/home/jens/Source/shotwell/src/util/image.vala"
 	if (_tmp79_) {
-#line 2634 "image.c"
+#line 2633 "image.c"
 		gint _tmp80_ = 0;
 		gint _tmp81_ = 0;
 		gint _tmp82_ = 0;
@@ -2648,7 +2647,7 @@ void clamp_inside_rotated_image (Box* src, gint img_w, gint img_h, gdouble angle
 		box_get_offset (src, _tmp80_ + _tmp81_, _tmp82_ + _tmp83_, &_tmp84_);
 #line 486 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp78_ = _tmp84_;
-#line 2652 "image.c"
+#line 2651 "image.c"
 	} else {
 		Box _tmp85_ = {0};
 		gint _tmp86_ = 0;
@@ -2688,13 +2687,13 @@ void clamp_inside_rotated_image (Box* src, gint img_w, gint img_h, gdouble angle
 		_tmp96_ = bottom_offset;
 #line 487 "/home/jens/Source/shotwell/src/util/image.vala"
 		box_init (&_tmp78_, _tmp86_ + _tmp87_, _tmp89_ + _tmp90_, _tmp92_ + _tmp93_, _tmp95_ + _tmp96_);
-#line 2692 "image.c"
+#line 2691 "image.c"
 	}
 #line 486 "/home/jens/Source/shotwell/src/util/image.vala"
 	*result = _tmp78_;
 #line 486 "/home/jens/Source/shotwell/src/util/image.vala"
 	return;
-#line 2698 "image.c"
+#line 2697 "image.c"
 }
 
 
diff --git a/src/util/image.vala b/src/util/image.vala
index 92e276a..db872df 100644
--- a/src/util/image.vala
+++ b/src/util/image.vala
@@ -115,8 +115,8 @@ private const string fallback_image_missing[] = {
 };
 
 bool is_color_parsable(string spec) {
-    Gdk.Color color;
-    return Gdk.Color.parse(spec, out color);
+    var color = Gdk.RGBA ();
+    return color.parse(spec);
 }
 
 Gdk.RGBA parse_color(string spec) {